Migrate Lifecycle Runtime Compose to Multiplatform [331769623]

Fixed

Feature Request

Status Update

No update yet.

Description

mg...@google.com

created issue #1

Mar 28, 2024 02:19PM

Migrate lifecycle-runtime-compose to Multiplatform. The supported multiplatform targets should match what is supported by Compose (e.g., :compose:runtime:runtime).

Comments

mg...@google.com <mg...@google.com> Mar 28, 2024 02:19PM

Accepted by mg...@google.com.

ap...@google.com <ap...@google.com> #2Mar 29, 2024 12:58PM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit c60f33e229e31ab328ef6b59dab63b264954831c
Author: Alexandre Elias <aelias@google.com>
Date: Fri Jul 10 16:23:09 2020

Semantics no-op cleanups

Partly in response to lmr's broad code review, I did a pass of
superficial API/implementation cleanup. The main changes are:

- I changed each Boolean SemanticsProperty where false is equivalent to
not being present to take "Unit" instead. This is conceptually
clearer: it avoids questions like "can I cancel out a semantics from a
merged child by setting it to false?" Because "property = Unit" looks
weird, I also changed the style of these to "property()".

- I moved the Semantics id generator closer to where it's used, in
SemanticsModifierCore. I made it internal and an AtomicInt.
(Note that integer ids are heavily used in the Android
AccessibilityNodeInfo APIs so I can't simply remove them entirely.)

- I deleted dead code. Some examples include SemanticsHintOverrides,
a public API not connected to anything, and SemanticsPropertyKey
merge() open method which is never called. (In both cases I have
a different plan in mind for accessibility.)

Fixes: 145951226
Fixes: 145955412
Test: existing tests
Relnote: "Single-value semantics properties now use a calling style.
For example, 'semantics { hidden = true }' is now written as:
'semantics { hidden() }'."

Change-Id: Ic1afd12ea22c926babc9662f1804d80b33aa0cfc

M ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/LayoutNodeModifierBenchmark.kt
M ui/ui-core/api/0.1.0-dev15.txt
M ui/ui-core/api/current.txt
M ui/ui-core/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-core/api/public_plus_experimental_current.txt
M ui/ui-core/api/restricted_0.1.0-dev15.txt
M ui/ui-core/api/restricted_current.txt
M ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/graphics/vector/VectorTest.kt
M ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/semantics/SemanticsTests.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidActuals.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeView.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeViewAccessibilityDelegateCompat.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidPopup.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Expect.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsConfiguration.kt
D ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsHintOverrides.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsModifier.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsNode.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsOwner.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsWrapper.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/semantics/SemanticsProperties.kt
M ui/ui-foundation/api/0.1.0-dev15.txt
M ui/ui-foundation/api/current.txt
M ui/ui-foundation/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-foundation/api/public_plus_experimental_current.txt
M ui/ui-foundation/api/restricted_0.1.0-dev15.txt
M ui/ui-foundation/api/restricted_current.txt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Clickable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Dialog.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Scroller.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/Selectable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/Toggleable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/semantics/FoundationSemanticsProperties.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ButtonTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/CardTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/CheckboxScreenshotTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/RadioButtonScreenshotTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ScaffoldTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/SnackbarTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/SurfaceTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ripple/RippleIndicationTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/TextFieldScreenshotTest.kt
M ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt
M ui/ui-material/src/main/java/androidx/ui/material/TextFieldImpl.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/AssertsTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/CallSemanticsActionTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/FindersTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/PrintToStringTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/ScrollToTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/TextActionsTest.kt
M ui/ui-test/src/main/java/androidx/ui/test/Actions.kt
M ui/ui-test/src/main/java/androidx/ui/test/Filters.kt
M ui/ui-text/api/0.1.0-dev15.txt
M ui/ui-text/api/current.txt
M ui/ui-text/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-text/api/public_plus_experimental_current.txt
M ui/ui-text/api/restricted_0.1.0-dev15.txt
M ui/ui-text/api/restricted_current.txt
M ui/ui-text/src/commonMain/kotlin/androidx/ui/text/CoreTextField.kt
M ui/ui-text/src/commonMain/kotlin/androidx/ui/text/TextSemanticsProperties.kt

https://android-review.googlesource.com/1360099

ap...@google.com <ap...@google.com> #3Mar 29, 2024 12:58PM

Project: platform/frameworks/support
Branch: androidx-main

commit 195d70fcd1b8d7dea6820e1795584e29e7535c84
Author: Marcello Galhardo <mgalhardo@google.com>
Date: Thu Mar 28 11:14:40 2024

Add `lifecycle-runtime-ktx` in `lifecycle-runtime-compose`

* Constraints do not apply to project dependencies, causing `wear:compose:demos` to fail due to a transitive dependency on an older ``-ktx` library. This results in duplicate definitions.
* Workaround: Added a direct dependency on `lifecycle-runtime-ktx`. Although this artifact is empty, it ensures that upgrading `lifecycle-runtime-compose` also updates `lifecycle-runtime-ktx` in cases where our constraints fail (e.g., internally in AndroidX when using project dependencies).

Test: `./gradlew :wear:compose:integration-tests:demos:dataBindingMergeDependencyArtifactsDebugAndroidTest`
Test: `./gradlew :compose:ui:ui-test:compileDebugKotlinAndroid`
Bug: 331769623
Change-Id: I8e79f3d5a7b6586dac65ae4c7d3868d9518ee585

M lifecycle/lifecycle-runtime-compose/build.gradle

https://android-review.googlesource.com/3017204

ap...@google.com <ap...@google.com> #4Mar 29, 2024 03:55PM

Project: platform/frameworks/support
Branch: androidx-main

commit 49455ad0e53fd704ca5a3c56d5b621f666d3d7b9
Author: Marcello Galhardo <mgalhardo@google.com>
Date: Fri Mar 29 14:38:40 2024

Fix corrupt serialized resolution result in `compose-ui`

* `compose-ui` has a transitive dependency on `lifecycle-livedata-core`, and converting `lifecycle-runtime-compose` to KMP triggered a Gradle bug (

https://github.com/gradle/gradle/issues/14220).
* Directly adding `lifecycle-livedata-core` as `compileOnly` to `androidMain` allowed us to workaround the issue.

Test: `./gradlew :compose:ui:ui:compileCommonMainKotlinMetadata -Pandroidx.constraints=true`
Bug: 331769623
Change-Id: I463276189cf90cfca8efc46bb29ecbb64010e09e

M compose/ui/ui/build.gradle

https://android-review.googlesource.com/3020183

ap...@google.com <ap...@google.com> #5Mar 29, 2024 06:10PM

Project: platform/frameworks/support
Branch: androidx-main

commit e48e6e2ce836e4e76a4bb6abe912520282fccf75
Author: Marcello Galhardo <mgalhardo@google.com>
Date: Fri Mar 29 17:03:31 2024

Add `lifecycle-runtime-ktx` in `lifecycle-runtime-compose`

* Constraints do not apply to project dependencies, causing `wear:compose:demos` to fail due to a transitive dependency on an older ``-ktx` library. This results in duplicate definitions.
* Workaround: Added a direct dependency on `lifecycle-runtime-ktx`. Although this artifact is empty, it ensures that upgrading `lifecycle-runtime-compose` also updates `lifecycle-runtime-ktx` in cases where our constraints fail (e.g., internally in AndroidX when using project dependencies).

Test: `./gradlew :wear:compose:integration-tests:demos:dataBindingMergeDependencyArtifactsDebugAndroidTest`
Test: `./gradlew :compose:ui:ui-test:compileDebugKotlinAndroid`
Bug: 331769623
Change-Id: I5599212b8a2dbd83189886a2435068b7b4aa5e1c

M lifecycle/lifecycle-runtime-compose/build.gradle

https://android-review.googlesource.com/3020185

ap...@google.com <ap...@google.com> #6Mar 29, 2024 06:10PM

Project: platform/frameworks/support
Branch: androidx-main

commit 54cd4ca56376ad93a8001d520000418cb8c63142
Author: Marcello Galhardo <mgalhardo@google.com>
Date: Fri Mar 29 16:37:58 2024

Fix corrupt serialized resolution result in `compose-ui`

* `compose-ui` has a transitive dependency on `lifecycle-viewmodel-savedstate`, and converting `lifecycle-runtime-compose` to KMP triggered a Gradle bug (

https://github.com/gradle/gradle/issues/14220). Adding the `livedata` dependency directly works around the issue.
* Directly adding `lifecycle-viewmodel-savedstate` as `compileOnly` to `androidMain` allowed us to workaround the issue.

Test: `./gradlew :compose:ui:ui:compileCommonMainKotlinMetadata -Pandroidx.constraints=true`
Bug: 331769623
Change-Id: Ic4f81fe2737b3d61fd9b4cb02a8b940e3a0d4caf

M compose/ui/ui/build.gradle

https://android-review.googlesource.com/3020064

ap...@google.com <ap...@google.com> #7Mar 29, 2024 06:10PM

Project: platform/frameworks/support
Branch: androidx-main

commit 91927fb2609683bcd11db90d4b5bf77ebbb6cf5a
Author: Marcello Galhardo <mgalhardo@google.com>
Date: Fri Mar 29 17:03:00 2024

Convert `lifecycle-runtime-compose` to multiplatform

* Only platforms supported by Compose in the AndroidX repository will be supported by `lifecycle-runtime-compose` (`android`, `desktop`).
* That is equivalent to what has been done with other artifacts, such as `lifecycle-viewmodel-compose`.
* Credits to Jake Wharton for the original contribution, his CL can be found at aosp/3002225

Test: `gw -p lifecycle bOS`
RelNote: "Added multiplatform support for `lifecycle-runtime-compose`."
Bug: 331769623
Change-Id: If7a714e598e360a1960f8b3a673b33538f595ff4

M docs-tip-of-tree/build.gradle
M lifecycle/lifecycle-runtime-compose/build.gradle
M lifecycle/lifecycle-runtime-compose/src/androidInstrumentedTest/kotlin/androidx/lifecycle/compose/CollectAsStateWithLifecycleTests.kt
M lifecycle/lifecycle-runtime-compose/src/androidInstrumentedTest/kotlin/androidx/lifecycle/compose/DropUnlessLifecycleTest.kt
M lifecycle/lifecycle-runtime-compose/src/androidInstrumentedTest/kotlin/androidx/lifecycle/compose/LifecycleEffectTest.kt
M lifecycle/lifecycle-runtime-compose/src/androidInstrumentedTest/kotlin/androidx/lifecycle/compose/LifecycleExtTest.kt
M lifecycle/lifecycle-runtime-compose/src/commonMain/kotlin/androidx/lifecycle/compose/DropUnlessLifecycle.kt
M lifecycle/lifecycle-runtime-compose/src/commonMain/kotlin/androidx/lifecycle/compose/FlowExt.kt
M lifecycle/lifecycle-runtime-compose/src/commonMain/kotlin/androidx/lifecycle/compose/LifecycleEffect.kt
M lifecycle/lifecycle-runtime-compose/src/commonMain/kotlin/androidx/lifecycle/compose/LifecycleExt.kt
M lifecycle/lifecycle-runtime-compose/src/commonMain/kotlin/androidx/lifecycle/compose/LocalLifecycleOwner.kt

https://android-review.googlesource.com/3020184

mg...@google.com <mg...@google.com> Apr 3, 2024 02:27PM

Marked as fixed.

na...@google.com <na...@google.com> #8Apr 17, 2024 05:17PM

The following release(s) address this bug.It is possible this bug has only been partially addressed:

androidx.compose.ui:ui:1.7.0-alpha07
androidx.compose.ui:ui-android:1.7.0-alpha07
androidx.compose.ui:ui-desktop:1.7.0-alpha07
androidx.lifecycle:lifecycle-runtime-compose:2.8.0-beta01