From 048db57ca9a47d5906af43a5e72ee6841ebb6dc8 Mon Sep 17 00:00:00 2001 From: Pavel Shishkin Date: Fri, 5 Dec 2025 11:02:46 +0100 Subject: [PATCH 01/21] remove `uikit` target in favor of `ios` (#2545) Partially adresses [CMP-1036](https://youtrack.jetbrains.com/issue/CMP-1036) Align custom source set names simplify build by unifying targets ## Testing [snapshot build](https://teamcity.jetbrains.com/buildConfiguration/JetBrainsPublicProjects_Compose_AllPersonalBuild/5717244) ## Release Notes N/A # Conflicts: # buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/AndroidXComposeMultiplatformExtensionImpl.kt # buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/ComposePlatforms.kt # buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsPublication.kt # compose/foundation/foundation-layout/build.gradle # compose/foundation/foundation/build.gradle # compose/material3/material3/build.gradle # compose/mpp/demo-swiftui/build.gradle.kts # compose/ui/ui-test/build.gradle # compose/ui/ui-text/build.gradle # compose/ui/ui-uikit/build.gradle # compose/ui/ui-util/build.gradle # compose/ui/ui/build.gradle # navigation/navigation-compose/build.gradle # navigation3/navigation3-ui/build.gradle # testutils/testutils-xctest/build.gradle --- .github/workflows/compose-publish-dry-run.yml | 2 +- .github/workflows/compose-tests.yml | 2 +- MULTIPLATFORM.md | 6 ++-- .../api/annotation.klib.api | 2 +- .../gradle.properties | 2 +- annotation/annotation/gradle.properties | 2 +- .../build/JetBrainsAndroidXImplPlugin.kt | 16 +--------- .../androidx/build/ComposePlatforms.kt | 6 ++-- ...ishingTask.kt => ComposePublishingTask.kt} | 6 ++-- .../androidx/build/JetBrainsPublication.kt | 12 +++---- .../api/collection.klib.api | 2 +- .../gradle.properties | 2 +- collection/collection/gradle.properties | 2 +- .../api/animation-core.klib.api | 2 +- .../api/animation-graphics.klib.api | 2 +- .../animation/api/animation.klib.api | 2 +- .../api/foundation-layout.klib.api | 2 +- .../foundation/foundation-layout/build.gradle | 4 +-- .../foundation/api/foundation.klib.api | 4 +-- compose/foundation/foundation/build.gradle | 9 ++++-- .../api/material-navigation.klib.api | 2 +- .../api/material-ripple.klib.api | 2 +- .../material/material/api/material.klib.api | 2 +- .../api/adaptive-layout.klib.api | 2 +- .../api/adaptive-navigation.klib.api | 2 +- .../api/adaptive-navigation3.klib.api | 2 +- .../adaptive/adaptive/api/adaptive.klib.api | 2 +- ...terial3-adaptive-navigation-suite.klib.api | 2 +- .../api/material3-window-size-class.klib.api | 2 +- .../material3/api/material3.klib.api | 4 +-- compose/material3/material3/build.gradle | 4 +-- compose/mpp/demo/build.gradle.kts | 32 +++++++++++-------- .../api/runtime.klib.api | 2 +- .../api/runtime-saveable.klib.api | 2 +- .../api/ui-backhandler.klib.api | 2 +- .../ui/ui-geometry/api/ui-geometry.klib.api | 2 +- .../ui/ui-graphics/api/ui-graphics.klib.api | 2 +- compose/ui/ui-test/api/ui-test.klib.api | 2 +- compose/ui/ui-test/build.gradle | 5 +-- compose/ui/ui-text/api/ui-text.klib.api | 6 ++-- compose/ui/ui-text/build.gradle | 5 +-- .../api/ui-tooling-preview.klib.api | 2 +- compose/ui/ui-uikit/api/ui-uikit.klib.api | 2 +- compose/ui/ui-uikit/build.gradle | 24 +++++++------- compose/ui/ui-unit/api/ui-unit.klib.api | 2 +- compose/ui/ui-util/api/ui-util.klib.api | 4 +-- compose/ui/ui-util/build.gradle | 5 +-- compose/ui/ui/api/ui.klib.api | 6 ++-- compose/ui/ui/build.gradle | 7 ++-- .../api/lifecycle-runtime-compose.klib.api | 2 +- .../api/lifecycle-viewmodel-compose.klib.api | 2 +- .../lifecycle-viewmodel-navigation3.klib.api | 2 +- mpp/build.gradle.kts | 10 ++---- .../api/navigation-compose.klib.api | 2 +- navigation/navigation-compose/build.gradle | 5 +-- .../api/navigation3-ui.klib.api | 2 +- navigation3/navigation3-ui/build.gradle | 5 +-- .../api/navigationevent-compose.klib.api | 2 +- .../api/savedstate-compose.klib.api | 2 +- testutils/testutils-xctest/build.gradle | 25 ++++++++------- 60 files changed, 142 insertions(+), 142 deletions(-) rename buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/{AbstractComposePublishingTask.kt => ComposePublishingTask.kt} (96%) diff --git a/.github/workflows/compose-publish-dry-run.yml b/.github/workflows/compose-publish-dry-run.yml index 5a07b20539b7e..bfccf3617db6b 100644 --- a/.github/workflows/compose-publish-dry-run.yml +++ b/.github/workflows/compose-publish-dry-run.yml @@ -22,7 +22,7 @@ jobs: - name: Compose Publish Darwin + Native Linux run: | - ./gradlew publishComposeJb -Pcompose.platforms=macos,uikit,tvos,watchos,linux,mingw \ + ./gradlew publishComposeJb -Pcompose.platforms=macos,ios,tvos,watchos,linux,mingw \ --no-daemon --stacktrace compose-web-publish: diff --git a/.github/workflows/compose-tests.yml b/.github/workflows/compose-tests.yml index c438fc89a54ed..203879873d97e 100644 --- a/.github/workflows/compose-tests.yml +++ b/.github/workflows/compose-tests.yml @@ -60,7 +60,7 @@ jobs: - name: Run iOS Tests timeout-minutes: 15 run: | - ./gradlew testUIKit \ + ./gradlew testIos \ --no-daemon --stacktrace - name: Test Summary diff --git a/MULTIPLATFORM.md b/MULTIPLATFORM.md index d6527393ca68c..f5246d3fd28ec 100644 --- a/MULTIPLATFORM.md +++ b/MULTIPLATFORM.md @@ -23,10 +23,10 @@ Run tests for Web: ./gradlew :mpp:testWeb ``` -Run tests for UIKit: +Run tests for iOS: ```bash -./gradlew :mpp:testUIKit' +./gradlew :mpp:testIos' ``` Run iOS instrumented tests. @@ -104,7 +104,7 @@ Compose Multiplatform core libraries can be published to local Maven with the fo ./gradlew :mpp:publishComposeJbToMavenLocal -Pcompose.platforms=all -Pjetbrains.publication.version.COMPOSE=0.1.0-dev1000 -Pjetbrains.publication.version.LIFECYCLE=0.1.0-dev1000 ``` - `-Pcompose.platforms=all` could be replace with comma-separated list of platforms, such as `js,jvm,androidDebug,androidRelease,macosx64,uikit`. + `-Pcompose.platforms=all` could be replace with comma-separated list of platforms, such as `js,jvm,androidDebug,androidRelease,macosx64,ios`. 3. Publish extended icons diff --git a/annotation/annotation-compatibility-stub/api/annotation.klib.api b/annotation/annotation-compatibility-stub/api/annotation.klib.api index 46503c6eac7a9..7b4b2c56094a4 100644 --- a/annotation/annotation-compatibility-stub/api/annotation.klib.api +++ b/annotation/annotation-compatibility-stub/api/annotation.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64, watchosX64] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64, watchosX64] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/annotation/annotation-compatibility-stub/gradle.properties b/annotation/annotation-compatibility-stub/gradle.properties index 5d333277226ea..2a1bdef179074 100644 --- a/annotation/annotation-compatibility-stub/gradle.properties +++ b/annotation/annotation-compatibility-stub/gradle.properties @@ -14,5 +14,5 @@ # limitations under the License. # -artifactRedirection.targetNames=android,jvm,macosX64,macosArm64,uikitX64,uikitArm64,uikitSimArm64,linuxX64 +artifactRedirection.targetNames=android,jvm,macosX64,macosArm64,iosX64,iosArm64,iosSimulatorArm64,linuxX64 artifactRedirection.groupId=androidx.annotation \ No newline at end of file diff --git a/annotation/annotation/gradle.properties b/annotation/annotation/gradle.properties index 638e7fa5c6c18..86379bed8f391 100644 --- a/annotation/annotation/gradle.properties +++ b/annotation/annotation/gradle.properties @@ -14,5 +14,5 @@ # limitations under the License. # -artifactRedirection.targetNames=android,jvm,macosX64,macosArm64,uikitX64,uikitArm64,uikitSimArm64,linuxX64 +artifactRedirection.targetNames=android,jvm,macosX64,macosArm64,iosX64,iosArm64,iosSimulatorArm64,linuxX64 artifactRedirection.groupId=androidx.annotation \ No newline at end of file diff --git a/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsAndroidXImplPlugin.kt b/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsAndroidXImplPlugin.kt index 5b012da8a708f..3e6359add6da8 100644 --- a/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsAndroidXImplPlugin.kt +++ b/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsAndroidXImplPlugin.kt @@ -89,20 +89,6 @@ open class JetBrainsExtensions( val test = compilations.getByName("test") val targetName = name.lowercase() - // The target name in a dependency project might be different from this project, - // so we check for an alternative name too. - // Historically, we had such aliases only for the 'ios <-> uikit' pair. - val altName = if (targetName.startsWith("ios")) { - targetName - .replace("iossimulator", "uikitsim") - .replace("ios", "uikit") - } else if (targetName.startsWith("uikit")) { - targetName - .replace("uikitsim", "iossimulator") - .replace("uikit", "ios") - } else { - null - } val rootProjectName = project.rootProject.name // compose-multiplatform-core val redirectedProjects by lazy { @@ -112,7 +98,7 @@ open class JetBrainsExtensions( // they have a group name with rootProjectName in it !it.group.toString().contains(rootProjectName) }?.artifactRedirection()?.takeIf { - it.targetNames.contains(targetName) || it.targetNames.contains(altName) + it.targetNames.contains(targetName) }?.let { project.path to it.groupId + ":" + project.name + ":" + it.versionForTargetOrDefault(targetName) } diff --git a/buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/ComposePlatforms.kt b/buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/ComposePlatforms.kt index 2bb4e65a4843a..8ef0f015ecb00 100644 --- a/buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/ComposePlatforms.kt +++ b/buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/ComposePlatforms.kt @@ -19,9 +19,9 @@ enum class ComposePlatforms(vararg val alternativeNames: String) { WasmJs("Web"), MacosX64("Macos"), MacosArm64("Macos"), - IosX64("Ios", "Uikit"), - IosArm64("Ios", "Uikit"), - IosSimulatorArm64("Ios", "Uikit"), + IosX64("Ios"), + IosArm64("Ios"), + IosSimulatorArm64("Ios"), TvosArm64("TvOs"), TvosX64("TvOs"), TvosSimulatorArm64("TvOs"), diff --git a/buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/AbstractComposePublishingTask.kt b/buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/ComposePublishingTask.kt similarity index 96% rename from buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/AbstractComposePublishingTask.kt rename to buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/ComposePublishingTask.kt index 1af98c9ad0644..de464814bdda3 100644 --- a/buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/AbstractComposePublishingTask.kt +++ b/buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/ComposePublishingTask.kt @@ -10,7 +10,7 @@ import org.gradle.api.tasks.CacheableTask import org.gradle.api.tasks.Internal @CacheableTask -abstract class AbstractComposePublishingTask : DefaultTask() { +open class ComposePublishingTask : DefaultTask() { @get:Internal lateinit var repository: String @@ -21,7 +21,9 @@ abstract class AbstractComposePublishingTask : DefaultTask() { composeProperties.targetPlatforms } - abstract fun dependsOnComposeTask(task: String) + fun dependsOnComposeTask(task: String) { + dependsOn(task) + } fun publish(rootProject: Project, component: ComposeComponent) { if (component.customTasks.isNotEmpty()) { diff --git a/buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsPublication.kt b/buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsPublication.kt index c9dc36d62dc98..29f7f3c8fbb19 100644 --- a/buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsPublication.kt +++ b/buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsPublication.kt @@ -101,17 +101,17 @@ object JetBrainsPublication { // ComposeComponent( // path = ":lifecycle:lifecycle-common", // // No android target here - jvm artefact will be used for android apps as well -// supportedPlatforms = ComposePlatforms.ALL_AOSP - ComposePlatforms.ANDROID +// supportedPlatforms = ComposePlatforms.ALL - ComposePlatforms.ANDROID // ), // ComposeComponent( // path = ":lifecycle:lifecycle-runtime", -// supportedPlatforms = ComposePlatforms.ALL_AOSP +// supportedPlatforms = ComposePlatforms.ALL // ), // ComposeComponent( // path = ":lifecycle:lifecycle-viewmodel", -// supportedPlatforms = ComposePlatforms.ALL_AOSP +// supportedPlatforms = ComposePlatforms.ALL // ), -// ComposeComponent(":lifecycle:lifecycle-viewmodel-savedstate", supportedPlatforms = ComposePlatforms.ALL_AOSP), +// ComposeComponent(":lifecycle:lifecycle-viewmodel-savedstate", supportedPlatforms = ComposePlatforms.ALL), // ComposeComponent(":lifecycle:lifecycle-runtime-compose", supportedPlatforms = ComposePlatforms.ALL), ComposeComponent(":lifecycle:lifecycle-viewmodel-compose"), ComposeComponent(":lifecycle:lifecycle-viewmodel-navigation3"), @@ -129,12 +129,12 @@ object JetBrainsPublication { ), "SAVEDSTATE" to listOf( // STUBs - // ComposeComponent(":savedstate:savedstate", supportedPlatforms = ComposePlatforms.ALL_AOSP), + // ComposeComponent(":savedstate:savedstate", supportedPlatforms = ComposePlatforms.ALL), // ComposeComponent(":savedstate:savedstate-compose", supportedPlatforms = ComposePlatforms.ALL), ), "WINDOW" to listOf( // STUBS - // ComposeComponent(":window:window-core", supportedPlatforms = ComposePlatforms.ALL_AOSP - ComposePlatforms.WINDOWS_NATIVE), + // ComposeComponent(":window:window-core", supportedPlatforms = ComposePlatforms.ALL - ComposePlatforms.WINDOWS_NATIVE), ), ) diff --git a/collection/collection-compatibility-stub/api/collection.klib.api b/collection/collection-compatibility-stub/api/collection.klib.api index a70d9edc38447..cbdeabcb6b45e 100644 --- a/collection/collection-compatibility-stub/api/collection.klib.api +++ b/collection/collection-compatibility-stub/api/collection.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64, watchosX64] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64, watchosX64] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/collection/collection-compatibility-stub/gradle.properties b/collection/collection-compatibility-stub/gradle.properties index 72ce42167313a..ab9496db3659d 100644 --- a/collection/collection-compatibility-stub/gradle.properties +++ b/collection/collection-compatibility-stub/gradle.properties @@ -14,5 +14,5 @@ # limitations under the License. # -artifactRedirection.targetNames=android,jvm,macosX64,macosArm64,uikitX64,uikitArm64,uikitSimArm64,linuxX64 +artifactRedirection.targetNames=android,jvm,macosX64,macosArm64,iosX64,iosArm64,iosSimulatorArm64,linuxX64 artifactRedirection.groupId=androidx.collection \ No newline at end of file diff --git a/collection/collection/gradle.properties b/collection/collection/gradle.properties index 72ce42167313a..ab9496db3659d 100644 --- a/collection/collection/gradle.properties +++ b/collection/collection/gradle.properties @@ -14,5 +14,5 @@ # limitations under the License. # -artifactRedirection.targetNames=android,jvm,macosX64,macosArm64,uikitX64,uikitArm64,uikitSimArm64,linuxX64 +artifactRedirection.targetNames=android,jvm,macosX64,macosArm64,iosX64,iosArm64,iosSimulatorArm64,linuxX64 artifactRedirection.groupId=androidx.collection \ No newline at end of file diff --git a/compose/animation/animation-core/api/animation-core.klib.api b/compose/animation/animation-core/api/animation-core.klib.api index e49a660250455..23263fb561747 100644 --- a/compose/animation/animation-core/api/animation-core.klib.api +++ b/compose/animation/animation-core/api/animation-core.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/animation/animation-graphics/api/animation-graphics.klib.api b/compose/animation/animation-graphics/api/animation-graphics.klib.api index 8a4e0963ab55d..8adb0275bbe8e 100644 --- a/compose/animation/animation-graphics/api/animation-graphics.klib.api +++ b/compose/animation/animation-graphics/api/animation-graphics.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/animation/animation/api/animation.klib.api b/compose/animation/animation/api/animation.klib.api index fc3120c4f87b6..b46f04614d00d 100644 --- a/compose/animation/animation/api/animation.klib.api +++ b/compose/animation/animation/api/animation.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/foundation/foundation-layout/api/foundation-layout.klib.api b/compose/foundation/foundation-layout/api/foundation-layout.klib.api index 85c53a5ac78b9..93d10ace10b70 100644 --- a/compose/foundation/foundation-layout/api/foundation-layout.klib.api +++ b/compose/foundation/foundation-layout/api/foundation-layout.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/foundation/foundation-layout/build.gradle b/compose/foundation/foundation-layout/build.gradle index ea8c85e7796db..565733758845a 100644 --- a/compose/foundation/foundation-layout/build.gradle +++ b/compose/foundation/foundation-layout/build.gradle @@ -146,11 +146,11 @@ androidXMultiplatform { dependsOn(nonJvmTest) } - uikitMain { + iosMain { dependsOn(nativeMain) } - uikitTest { + iosTest { dependsOn(nativeTest) } diff --git a/compose/foundation/foundation/api/foundation.klib.api b/compose/foundation/foundation/api/foundation.klib.api index f948e6f4e4b13..3fd86adfbfd12 100644 --- a/compose/foundation/foundation/api/foundation.klib.api +++ b/compose/foundation/foundation/api/foundation.klib.api @@ -1,6 +1,6 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] -// Alias: ios => [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] +// Alias: ios => [iosArm64, iosSimulatorArm64, iosX64] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle index b21906475eb41..e7b201d571385 100644 --- a/compose/foundation/foundation/build.gradle +++ b/compose/foundation/foundation/build.gradle @@ -206,7 +206,10 @@ androidXMultiplatform { dependsOn(darwinTest) } - uikitMain { + iosMain { + + kotlin.srcDir("src/uikitMain/kotlin") + resources.srcDir("src/uikitMain/resources") dependsOn(darwinMain) dependencies { // TODO: We shouldn't use it directly here @@ -214,7 +217,9 @@ androidXMultiplatform { } } - uikitTest { + iosTest { + + kotlin.srcDir("src/uikitTest/kotlin") dependsOn(darwinTest) } diff --git a/compose/material/material-navigation/api/material-navigation.klib.api b/compose/material/material-navigation/api/material-navigation.klib.api index dbb4ae46aa33f..b402cb35d8b8e 100644 --- a/compose/material/material-navigation/api/material-navigation.klib.api +++ b/compose/material/material-navigation/api/material-navigation.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/material/material-ripple/api/material-ripple.klib.api b/compose/material/material-ripple/api/material-ripple.klib.api index 2534a84ee6ace..2f2384372ce9f 100644 --- a/compose/material/material-ripple/api/material-ripple.klib.api +++ b/compose/material/material-ripple/api/material-ripple.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/material/material/api/material.klib.api b/compose/material/material/api/material.klib.api index 7b675b886b3d5..a6d0d53c60732 100644 --- a/compose/material/material/api/material.klib.api +++ b/compose/material/material/api/material.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/material3/adaptive/adaptive-layout/api/adaptive-layout.klib.api b/compose/material3/adaptive/adaptive-layout/api/adaptive-layout.klib.api index d412edb33f57b..813d4d93b809b 100644 --- a/compose/material3/adaptive/adaptive-layout/api/adaptive-layout.klib.api +++ b/compose/material3/adaptive/adaptive-layout/api/adaptive-layout.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/material3/adaptive/adaptive-navigation/api/adaptive-navigation.klib.api b/compose/material3/adaptive/adaptive-navigation/api/adaptive-navigation.klib.api index ade3779735208..7167132226480 100644 --- a/compose/material3/adaptive/adaptive-navigation/api/adaptive-navigation.klib.api +++ b/compose/material3/adaptive/adaptive-navigation/api/adaptive-navigation.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/material3/adaptive/adaptive-navigation3/api/adaptive-navigation3.klib.api b/compose/material3/adaptive/adaptive-navigation3/api/adaptive-navigation3.klib.api index 2fd59437547c5..10c47804587a8 100644 --- a/compose/material3/adaptive/adaptive-navigation3/api/adaptive-navigation3.klib.api +++ b/compose/material3/adaptive/adaptive-navigation3/api/adaptive-navigation3.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/material3/adaptive/adaptive/api/adaptive.klib.api b/compose/material3/adaptive/adaptive/api/adaptive.klib.api index 8b9c8e42046fa..3450b2fde793e 100644 --- a/compose/material3/adaptive/adaptive/api/adaptive.klib.api +++ b/compose/material3/adaptive/adaptive/api/adaptive.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/material3/material3-adaptive-navigation-suite/api/material3-adaptive-navigation-suite.klib.api b/compose/material3/material3-adaptive-navigation-suite/api/material3-adaptive-navigation-suite.klib.api index 0c26c69f822b2..e1dd9d70833be 100644 --- a/compose/material3/material3-adaptive-navigation-suite/api/material3-adaptive-navigation-suite.klib.api +++ b/compose/material3/material3-adaptive-navigation-suite/api/material3-adaptive-navigation-suite.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/material3/material3-window-size-class/api/material3-window-size-class.klib.api b/compose/material3/material3-window-size-class/api/material3-window-size-class.klib.api index 5e7cba1ef3339..43fe751ec0a49 100644 --- a/compose/material3/material3-window-size-class/api/material3-window-size-class.klib.api +++ b/compose/material3/material3-window-size-class/api/material3-window-size-class.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/material3/material3/api/material3.klib.api b/compose/material3/material3/api/material3.klib.api index 52c95e0906423..56b18ca9d5e53 100644 --- a/compose/material3/material3/api/material3.klib.api +++ b/compose/material3/material3/api/material3.klib.api @@ -1,6 +1,6 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] -// Alias: apple => [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, macosArm64, macosX64] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] +// Alias: apple => [iosArm64, iosSimulatorArm64, iosX64, macosArm64, macosX64] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/material3/material3/build.gradle b/compose/material3/material3/build.gradle index 05d5bb3bf9a12..b212bf0a42273 100644 --- a/compose/material3/material3/build.gradle +++ b/compose/material3/material3/build.gradle @@ -182,11 +182,11 @@ androidXMultiplatform { dependsOn(nativeTest) } - uikitMain { + iosMain { dependsOn(darwinMain) } - uikitTest { + iosTest { dependsOn(darwinTest) } diff --git a/compose/mpp/demo/build.gradle.kts b/compose/mpp/demo/build.gradle.kts index 53b427a502564..a540637efe349 100644 --- a/compose/mpp/demo/build.gradle.kts +++ b/compose/mpp/demo/build.gradle.kts @@ -100,7 +100,7 @@ kotlin { } } } - iosX64("uikitX64") { + iosX64("iosX64") { binaries { executable() { entryPoint = "androidx.compose.mpp.demo.main" @@ -114,7 +114,7 @@ kotlin { } } } - iosArm64("uikitArm64") { + iosArm64("iosArm64") { binaries { executable() { entryPoint = "androidx.compose.mpp.demo.main" @@ -128,7 +128,7 @@ kotlin { } } } - iosSimulatorArm64("uikitSimArm64") { + iosSimulatorArm64("iosSimArm64") { binaries { executable() { entryPoint = "androidx.compose.mpp.demo.main" @@ -221,17 +221,21 @@ kotlin { val macosMain by creating { dependsOn(darwinMain) } val macosX64Main by getting { dependsOn(macosMain) } val macosArm64Main by getting { dependsOn(macosMain) } - val uikitMain by creating { dependsOn(darwinMain) } - val uikitX64Main by getting { dependsOn(uikitMain) } - val uikitArm64Main by getting { dependsOn(uikitMain) } - val uikitSimArm64Main by getting { dependsOn(uikitMain) } + val iosMain by creating { + kotlin.srcDir("src/uikitMain/kotlin") + resources.srcDir("src/uikitMain/resources") + dependsOn(darwinMain) + } + val iosX64Main by getting { dependsOn(iosMain) } + val iosArm64Main by getting { dependsOn(iosMain) } + val iosSimArm64Main by getting { dependsOn(iosMain) } } } enum class Target(val simulator: Boolean, val key: String) { - UIKIT_X64(true, "uikitX64"), - UIKIT_ARM64(false, "uikitArm64"), - UIKIT_SIM_ARM64(true, "uikitSimArm64"), + IOS_X64(true, "iosX64"), + IOS_ARM64(false, "iosArm64"), + IOS_SIM_ARM64(true, "iosSimArm64"), } if (System.getProperty("os.name") == "Mac OS X") { @@ -240,16 +244,16 @@ if (System.getProperty("os.name") == "Mac OS X") { val target = sdkName.orEmpty().let { when { - it.startsWith("iphoneos") -> Target.UIKIT_ARM64 + it.startsWith("iphoneos") -> Target.IOS_ARM64 it.startsWith("iphonesimulator") -> { if (System.getProperty("os.arch") == "aarch64") { - Target.UIKIT_SIM_ARM64 + Target.IOS_SIM_ARM64 } else { - Target.UIKIT_X64 + Target.IOS_X64 } } - else -> Target.UIKIT_X64 + else -> Target.IOS_X64 } } diff --git a/compose/runtime/runtime-compatibility-stub/api/runtime.klib.api b/compose/runtime/runtime-compatibility-stub/api/runtime.klib.api index 133837d66a973..eb2d0e6b6a8f7 100644 --- a/compose/runtime/runtime-compatibility-stub/api/runtime.klib.api +++ b/compose/runtime/runtime-compatibility-stub/api/runtime.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64, watchosX64] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64, watchosX64] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/runtime/runtime-saveable-compatibility-stub/api/runtime-saveable.klib.api b/compose/runtime/runtime-saveable-compatibility-stub/api/runtime-saveable.klib.api index 7cfea0d56742e..c94043893336d 100644 --- a/compose/runtime/runtime-saveable-compatibility-stub/api/runtime-saveable.klib.api +++ b/compose/runtime/runtime-saveable-compatibility-stub/api/runtime-saveable.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64, watchosX64] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64, watchosX64] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/ui/ui-backhandler/api/ui-backhandler.klib.api b/compose/ui/ui-backhandler/api/ui-backhandler.klib.api index 4487a628ea1f8..7a24e653602db 100644 --- a/compose/ui/ui-backhandler/api/ui-backhandler.klib.api +++ b/compose/ui/ui-backhandler/api/ui-backhandler.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/ui/ui-geometry/api/ui-geometry.klib.api b/compose/ui/ui-geometry/api/ui-geometry.klib.api index 257e256654291..7891bd5d74b44 100644 --- a/compose/ui/ui-geometry/api/ui-geometry.klib.api +++ b/compose/ui/ui-geometry/api/ui-geometry.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/ui/ui-graphics/api/ui-graphics.klib.api b/compose/ui/ui-graphics/api/ui-graphics.klib.api index 92b955381b5c0..9b571bb709a2a 100644 --- a/compose/ui/ui-graphics/api/ui-graphics.klib.api +++ b/compose/ui/ui-graphics/api/ui-graphics.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/ui/ui-test/api/ui-test.klib.api b/compose/ui/ui-test/api/ui-test.klib.api index ad23f85e47826..10508f89bc435 100644 --- a/compose/ui/ui-test/api/ui-test.klib.api +++ b/compose/ui/ui-test/api/ui-test.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/ui/ui-test/build.gradle b/compose/ui/ui-test/build.gradle index a93c326e3b4e1..9fd5b6efea26d 100644 --- a/compose/ui/ui-test/build.gradle +++ b/compose/ui/ui-test/build.gradle @@ -210,11 +210,12 @@ androidXMultiplatform { dependsOn(darwinTest) } - uikitMain { + iosMain { + kotlin.srcDir("src/uikitMain/kotlin") dependsOn(darwinMain) } - uikitTest { + iosTest { dependsOn(darwinTest) } diff --git a/compose/ui/ui-text/api/ui-text.klib.api b/compose/ui/ui-text/api/ui-text.klib.api index c0549ba9aa095..d5537a08793f9 100644 --- a/compose/ui/ui-text/api/ui-text.klib.api +++ b/compose/ui/ui-text/api/ui-text.klib.api @@ -1,7 +1,7 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] -// Alias: apple => [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, macosArm64, macosX64] -// Alias: ios => [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] +// Alias: apple => [iosArm64, iosSimulatorArm64, iosX64, macosArm64, macosX64] +// Alias: ios => [iosArm64, iosSimulatorArm64, iosX64] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/ui/ui-text/build.gradle b/compose/ui/ui-text/build.gradle index 27b90cee53eb1..b3c07a2cfc7ae 100644 --- a/compose/ui/ui-text/build.gradle +++ b/compose/ui/ui-text/build.gradle @@ -202,11 +202,12 @@ androidXMultiplatform { dependsOn(darwinTest) } - uikitMain { + iosMain { + kotlin.srcDir("src/uikitMain/kotlin") dependsOn(darwinMain) } - uikitTest { + iosTest { dependsOn(darwinTest) } diff --git a/compose/ui/ui-tooling-preview/api/ui-tooling-preview.klib.api b/compose/ui/ui-tooling-preview/api/ui-tooling-preview.klib.api index 981ed397aae41..d41d377214283 100644 --- a/compose/ui/ui-tooling-preview/api/ui-tooling-preview.klib.api +++ b/compose/ui/ui-tooling-preview/api/ui-tooling-preview.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/ui/ui-uikit/api/ui-uikit.klib.api b/compose/ui/ui-uikit/api/ui-uikit.klib.api index d80af775ac228..34e3271f62ea2 100644 --- a/compose/ui/ui-uikit/api/ui-uikit.klib.api +++ b/compose/ui/ui-uikit/api/ui-uikit.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64] +// Targets: [iosArm64, iosSimulatorArm64, iosX64] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/ui/ui-uikit/build.gradle b/compose/ui/ui-uikit/build.gradle index 8c59c41e49b8c..2376c038fabcd 100644 --- a/compose/ui/ui-uikit/build.gradle +++ b/compose/ui/ui-uikit/build.gradle @@ -24,32 +24,32 @@ plugins { } kotlin { - iosX64 { + iosX64("iosX64") { configure(it, false, "x86_64", "iosX64Test") } - iosArm64 { + iosArm64("iosArm64") { configure(it, true, "arm64", null /*"iosArm64Test"*/) } - iosSimulatorArm64 { - configure(it, false, "arm64", "iosSimArm64Test") + iosSimulatorArm64("iosSimulatorArm64") { + configure(it, false, "arm64", "iosSimulatorArm64Test") } sourceSets { commonMain {} - def uikitMain = sourceSets.create("uikitMain") + def iosMain = sourceSets.create("iosMain") { + kotlin.srcDir("src/uikitMain/kotlin") + } def iosX64Main = sourceSets.getByName("iosX64Main") def iosArm64Main = sourceSets.getByName("iosArm64Main") def iosSimArm64Main = sourceSets.getByName("iosSimulatorArm64Main") - darwinMain.dependsOn(commonMain) - uikitMain.dependsOn(darwinMain) - iosX64Main.dependsOn(uikitMain) - iosArm64Main.dependsOn(uikitMain) - iosSimArm64Main.dependsOn(uikitMain) + iosMain.dependsOn(commonMain) + iosX64Main.dependsOn(iosMain) + iosArm64Main.dependsOn(iosMain) + iosSimulatorArm64Main.dependsOn(iosMain) commonMain.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version - darwinMain.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version - uikitMain.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version + iosMain.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version iosX64Main.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version iosArm64Main.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version iosSimArm64Main.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version diff --git a/compose/ui/ui-unit/api/ui-unit.klib.api b/compose/ui/ui-unit/api/ui-unit.klib.api index f1923e21f0574..79509a25b05df 100644 --- a/compose/ui/ui-unit/api/ui-unit.klib.api +++ b/compose/ui/ui-unit/api/ui-unit.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/ui/ui-util/api/ui-util.klib.api b/compose/ui/ui-util/api/ui-util.klib.api index dafde7d9eea24..2680ce4ea067d 100644 --- a/compose/ui/ui-util/api/ui-util.klib.api +++ b/compose/ui/ui-util/api/ui-util.klib.api @@ -1,6 +1,6 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] -// Alias: ios => [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] +// Alias: ios => [iosArm64, iosSimulatorArm64, iosX64] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/compose/ui/ui-util/build.gradle b/compose/ui/ui-util/build.gradle index a63ac55b82278..0989b59c0fd99 100644 --- a/compose/ui/ui-util/build.gradle +++ b/compose/ui/ui-util/build.gradle @@ -120,14 +120,15 @@ androidXMultiplatform { dependsOn(nativeTest) } - uikitMain { + iosMain { + kotlin.srcDir("src/uikitMain/kotlin") dependsOn(nativeMain) dependencies { implementation(project(":compose:ui:ui-uikit")) } } - uikitTest { + iosTest { dependsOn(nativeTest) } diff --git a/compose/ui/ui/api/ui.klib.api b/compose/ui/ui/api/ui.klib.api index 2a9ac22168f4a..4bdeedcb2aed3 100644 --- a/compose/ui/ui/api/ui.klib.api +++ b/compose/ui/ui/api/ui.klib.api @@ -1,7 +1,7 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] -// Alias: apple => [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, macosArm64, macosX64] -// Alias: ios => [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] +// Alias: apple => [iosArm64, iosSimulatorArm64, iosX64, macosArm64, macosX64] +// Alias: ios => [iosArm64, iosSimulatorArm64, iosX64] // Alias: macos => [macosArm64, macosX64] // Rendering settings: // - Signature version: 2 diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle index e1932c659ea7e..69fb0ee5990a4 100644 --- a/compose/ui/ui/build.gradle +++ b/compose/ui/ui/build.gradle @@ -287,14 +287,17 @@ androidXMultiplatform { dependsOn(nativeTest) } - uikitMain { + iosMain { + kotlin.srcDir("src/uikitMain/kotlin") + resources.srcDir("src/uikitMain/resources") dependsOn(nativeMain) dependencies { implementation(project(":compose:ui:ui-uikit")) } } - uikitTest { + iosTest { + kotlin.srcDir("src/uikitTest/kotlin") dependsOn(nativeTest) } diff --git a/lifecycle/lifecycle-runtime-compose-compatibility-stub/api/lifecycle-runtime-compose.klib.api b/lifecycle/lifecycle-runtime-compose-compatibility-stub/api/lifecycle-runtime-compose.klib.api index 15066fa493a68..2d43df47befd5 100644 --- a/lifecycle/lifecycle-runtime-compose-compatibility-stub/api/lifecycle-runtime-compose.klib.api +++ b/lifecycle/lifecycle-runtime-compose-compatibility-stub/api/lifecycle-runtime-compose.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64, watchosX64] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64, watchosX64] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/lifecycle/lifecycle-viewmodel-compose/api/lifecycle-viewmodel-compose.klib.api b/lifecycle/lifecycle-viewmodel-compose/api/lifecycle-viewmodel-compose.klib.api index 5bd714369cbe9..48901b45d2e90 100644 --- a/lifecycle/lifecycle-viewmodel-compose/api/lifecycle-viewmodel-compose.klib.api +++ b/lifecycle/lifecycle-viewmodel-compose/api/lifecycle-viewmodel-compose.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/lifecycle/lifecycle-viewmodel-navigation3/api/lifecycle-viewmodel-navigation3.klib.api b/lifecycle/lifecycle-viewmodel-navigation3/api/lifecycle-viewmodel-navigation3.klib.api index caf5809e69d2d..e05871161ba31 100644 --- a/lifecycle/lifecycle-viewmodel-navigation3/api/lifecycle-viewmodel-navigation3.klib.api +++ b/lifecycle/lifecycle-viewmodel-navigation3/api/lifecycle-viewmodel-navigation3.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/mpp/build.gradle.kts b/mpp/build.gradle.kts index 07b06de0ffe1c..23454a915d51d 100644 --- a/mpp/build.gradle.kts +++ b/mpp/build.gradle.kts @@ -1,4 +1,4 @@ -import org.jetbrains.androidx.build.AbstractComposePublishingTask +import org.jetbrains.androidx.build.ComposePublishingTask import org.jetbrains.androidx.build.ArtifactRedirection import org.jetbrains.androidx.build.ComposePlatforms import org.jetbrains.androidx.build.ComposeProperties @@ -11,12 +11,6 @@ import org.jetbrains.androidx.build.hasRedirection evaluationDependsOn(it.path) } -open class ComposePublishingTask : AbstractComposePublishingTask() { - override fun dependsOnComposeTask(task: String) { - dependsOn(task) - } -} - val libraryToComponents = JetBrainsPublication.libraryToComponents val pathToComposeComponent = libraryToComponents.values.flatten().associateBy { it.path } @@ -84,7 +78,7 @@ val testWebWasm = tasks.register("testWebWasm") { dependsOn(":navigation:navigation-runtime:wasmJsTest") } -tasks.register("testUIKit") { +tasks.register("testIos") { group = "Compose Multiplatform" val suffix = if (System.getProperty("os.arch") == "aarch64") "SimulatorArm64Test" else "X64Test" val iosTestSubtaskName = "ios$suffix" diff --git a/navigation/navigation-compose/api/navigation-compose.klib.api b/navigation/navigation-compose/api/navigation-compose.klib.api index 5c977ce04a970..09bf3f207a99c 100644 --- a/navigation/navigation-compose/api/navigation-compose.klib.api +++ b/navigation/navigation-compose/api/navigation-compose.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle index d2f513b1c8e41..60246d9fbabee 100644 --- a/navigation/navigation-compose/build.gradle +++ b/navigation/navigation-compose/build.gradle @@ -191,11 +191,12 @@ androidXMultiplatform { dependsOn(darwinTest) } - uikitMain { + iosMain { + kotlin.srcDir("src/uikitMain/kotlin") dependsOn(darwinMain) } - uikitTest { + iosTest { dependsOn(darwinTest) } diff --git a/navigation3/navigation3-ui/api/navigation3-ui.klib.api b/navigation3/navigation3-ui/api/navigation3-ui.klib.api index 0a6a3995672a4..fc85643d84f2d 100644 --- a/navigation3/navigation3-ui/api/navigation3-ui.klib.api +++ b/navigation3/navigation3-ui/api/navigation3-ui.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/navigation3/navigation3-ui/build.gradle b/navigation3/navigation3-ui/build.gradle index 0bc12a4ed0bc7..4c15343ab6c6c 100644 --- a/navigation3/navigation3-ui/build.gradle +++ b/navigation3/navigation3-ui/build.gradle @@ -130,11 +130,12 @@ androidXMultiplatform { dependsOn(nativeTest) } - uikitMain { + iosMain { + kotlin.srcDir("src/uikitMain/kotlin") dependsOn(nativeMain) } - uikitTest { + iosTest { dependsOn(nativeTest) } diff --git a/navigationevent/navigationevent-compose/api/navigationevent-compose.klib.api b/navigationevent/navigationevent-compose/api/navigationevent-compose.klib.api index c9cd1adee4fa0..746a9a4073120 100644 --- a/navigationevent/navigationevent-compose/api/navigationevent-compose.klib.api +++ b/navigationevent/navigationevent-compose/api/navigationevent-compose.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, macosArm64, macosX64, wasmJs] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/savedstate/savedstate-compose-compatibility-stub/api/savedstate-compose.klib.api b/savedstate/savedstate-compose-compatibility-stub/api/savedstate-compose.klib.api index fad4cd0b71a5f..262f0ad5eb3b5 100644 --- a/savedstate/savedstate-compose-compatibility-stub/api/savedstate-compose.klib.api +++ b/savedstate/savedstate-compose-compatibility-stub/api/savedstate-compose.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [iosArm64.uikitArm64, iosSimulatorArm64.uikitSimArm64, iosX64.uikitX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64, watchosX64] +// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm32, watchosArm64, watchosSimulatorArm64, watchosX64] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/testutils/testutils-xctest/build.gradle b/testutils/testutils-xctest/build.gradle index 4dff11a851473..445340577afd1 100644 --- a/testutils/testutils-xctest/build.gradle +++ b/testutils/testutils-xctest/build.gradle @@ -26,28 +26,30 @@ plugins { } kotlin { - iosX64 { + iosX64("iosX64") { configure(it, false) } - iosArm64 { + iosArm64("iosArm64") { configure(it, true) } - iosSimulatorArm64 { + iosSimulatorArm64("iosSimulatorArm64") { configure(it, false) } sourceSets { commonMain {} - def uikitMain = sourceSets.create("uikitMain") + def iosMain = sourceSets.create("iosMain") { + kotlin.srcDir("src/uikitMain/kotlin") + resources.srcDir("src/uikitMain/resources") + } def iosX64Main = sourceSets.getByName("iosX64Main") def iosArm64Main = sourceSets.getByName("iosArm64Main") - def iosSimArm64Main = sourceSets.getByName("iosSimulatorArm64Main") + def iosSimulatorArm64Main = sourceSets.getByName("iosSimulatorArm64Main") - darwinMain.dependsOn(commonMain) - uikitMain.dependsOn(darwinMain) - iosX64Main.dependsOn(uikitMain) - iosArm64Main.dependsOn(uikitMain) - iosSimArm64Main.dependsOn(uikitMain) + iosMain.dependsOn(commonMain) + iosX64Main.dependsOn(iosMain) + iosArm64Main.dependsOn(iosMain) + iosSimulatorArm64Main.dependsOn(iosMain) configureEach { languageSettings.optIn("kotlinx.cinterop.BetaInteropApi") @@ -56,8 +58,7 @@ kotlin { } commonMain.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version - darwinMain.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version - uikitMain.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version + iosMain.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version iosX64Main.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version iosArm64Main.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version iosSimArm64Main.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version From 5dbc3a86c827ad8bcc0644da73eee8ef85a32a74 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Fri, 5 Dec 2025 20:49:57 +0100 Subject: [PATCH 02/21] iosMain rename additional fixes --- compose/foundation/foundation-layout/build.gradle | 4 ++-- compose/foundation/foundation/build.gradle | 4 ++-- compose/material3/material3/build.gradle | 4 ++-- compose/ui/ui-test/build.gradle | 4 ++-- compose/ui/ui-text/build.gradle | 4 ++-- compose/ui/ui-util/build.gradle | 4 ++-- compose/ui/ui/build.gradle | 4 ++-- navigation/navigation-compose/build.gradle | 4 ++-- navigation3/navigation3-ui/build.gradle | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/compose/foundation/foundation-layout/build.gradle b/compose/foundation/foundation-layout/build.gradle index 565733758845a..e4c9e3e586b85 100644 --- a/compose/foundation/foundation-layout/build.gradle +++ b/compose/foundation/foundation-layout/build.gradle @@ -177,8 +177,8 @@ androidXMultiplatform { if (target.platformType == KotlinPlatformType.native) { if (target.konanTarget.family == Family.IOS) { - target.compilations["main"].defaultSourceSet.dependsOn(uikitMain) - target.compilations["test"].defaultSourceSet.dependsOn(uikitTest) + target.compilations["main"].defaultSourceSet.dependsOn(iosMain) + target.compilations["test"].defaultSourceSet.dependsOn(iosTest) } else if (target.konanTarget.family == Family.OSX) { target.compilations["main"].defaultSourceSet.dependsOn(macosMain) target.compilations["test"].defaultSourceSet.dependsOn(macosTest) diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle index e7b201d571385..f9faae7007fc0 100644 --- a/compose/foundation/foundation/build.gradle +++ b/compose/foundation/foundation/build.gradle @@ -259,8 +259,8 @@ androidXMultiplatform { if (target.platformType == KotlinPlatformType.native) { if (target.konanTarget.family == Family.IOS) { - target.compilations["main"].defaultSourceSet.dependsOn(uikitMain) - target.compilations["test"].defaultSourceSet.dependsOn(uikitTest) + target.compilations["main"].defaultSourceSet.dependsOn(iosMain) + target.compilations["test"].defaultSourceSet.dependsOn(iosTest) } else if (target.konanTarget.family == Family.OSX) { target.compilations["main"].defaultSourceSet.dependsOn(macosMain) target.compilations["test"].defaultSourceSet.dependsOn(macosTest) diff --git a/compose/material3/material3/build.gradle b/compose/material3/material3/build.gradle index b212bf0a42273..512d2fe5a3dc1 100644 --- a/compose/material3/material3/build.gradle +++ b/compose/material3/material3/build.gradle @@ -226,8 +226,8 @@ androidXMultiplatform { if (target.platformType == KotlinPlatformType.native) { if (target.konanTarget.family == Family.IOS) { - target.compilations["main"].defaultSourceSet.dependsOn(uikitMain) - target.compilations["test"].defaultSourceSet.dependsOn(uikitTest) + target.compilations["main"].defaultSourceSet.dependsOn(iosMain) + target.compilations["test"].defaultSourceSet.dependsOn(iosTest) } else if (target.konanTarget.family.appleFamily) { target.compilations["main"].defaultSourceSet.dependsOn(darwinMain) target.compilations["test"].defaultSourceSet.dependsOn(darwinTest) diff --git a/compose/ui/ui-test/build.gradle b/compose/ui/ui-test/build.gradle index 9fd5b6efea26d..675e7dff484bf 100644 --- a/compose/ui/ui-test/build.gradle +++ b/compose/ui/ui-test/build.gradle @@ -234,8 +234,8 @@ androidXMultiplatform { if (target.platformType == KotlinPlatformType.native) { if (target.konanTarget.family == Family.IOS) { - target.compilations["main"].defaultSourceSet.dependsOn(uikitMain) - target.compilations["test"].defaultSourceSet.dependsOn(uikitTest) + target.compilations["main"].defaultSourceSet.dependsOn(iosMain) + target.compilations["test"].defaultSourceSet.dependsOn(iosTest) } else if (target.konanTarget.family == Family.OSX) { target.compilations["main"].defaultSourceSet.dependsOn(macosMain) target.compilations["test"].defaultSourceSet.dependsOn(macosTest) diff --git a/compose/ui/ui-text/build.gradle b/compose/ui/ui-text/build.gradle index b3c07a2cfc7ae..5c6c239abe5a1 100644 --- a/compose/ui/ui-text/build.gradle +++ b/compose/ui/ui-text/build.gradle @@ -238,8 +238,8 @@ androidXMultiplatform { if (target.platformType == KotlinPlatformType.native) { if (target.konanTarget.family == Family.IOS) { - target.compilations["main"].defaultSourceSet.dependsOn(uikitMain) - target.compilations["test"].defaultSourceSet.dependsOn(uikitTest) + target.compilations["main"].defaultSourceSet.dependsOn(iosMain) + target.compilations["test"].defaultSourceSet.dependsOn(iosTest) } else if (target.konanTarget.family == Family.OSX) { target.compilations["main"].defaultSourceSet.dependsOn(macosMain) target.compilations["test"].defaultSourceSet.dependsOn(macosTest) diff --git a/compose/ui/ui-util/build.gradle b/compose/ui/ui-util/build.gradle index 0989b59c0fd99..fb61ebd8669ec 100644 --- a/compose/ui/ui-util/build.gradle +++ b/compose/ui/ui-util/build.gradle @@ -147,8 +147,8 @@ androidXMultiplatform { if (target.platformType == KotlinPlatformType.native) { if (target.konanTarget.family == Family.IOS) { - target.compilations["main"].defaultSourceSet.dependsOn(uikitMain) - target.compilations["test"].defaultSourceSet.dependsOn(uikitTest) + target.compilations["main"].defaultSourceSet.dependsOn(iosMain) + target.compilations["test"].defaultSourceSet.dependsOn(iosTest) } else if (target.konanTarget.family == Family.OSX) { target.compilations["main"].defaultSourceSet.dependsOn(macosMain) target.compilations["test"].defaultSourceSet.dependsOn(macosTest) diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle index 69fb0ee5990a4..c60591accb225 100644 --- a/compose/ui/ui/build.gradle +++ b/compose/ui/ui/build.gradle @@ -344,8 +344,8 @@ androidXMultiplatform { if (target.platformType == KotlinPlatformType.native) { if (target.konanTarget.family == Family.IOS) { - target.compilations["main"].defaultSourceSet.dependsOn(uikitMain) - target.compilations["test"].defaultSourceSet.dependsOn(uikitTest) + target.compilations["main"].defaultSourceSet.dependsOn(iosMain) + target.compilations["test"].defaultSourceSet.dependsOn(iosTest) } else if (target.konanTarget.family == Family.OSX) { target.compilations["main"].defaultSourceSet.dependsOn(macosMain) target.compilations["test"].defaultSourceSet.dependsOn(macosTest) diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle index 60246d9fbabee..9886a95c88f70 100644 --- a/navigation/navigation-compose/build.gradle +++ b/navigation/navigation-compose/build.gradle @@ -211,8 +211,8 @@ androidXMultiplatform { targets.configureEach { target -> if (target.platformType == KotlinPlatformType.native) { if (target.konanTarget.family == Family.IOS) { - target.compilations["main"].defaultSourceSet.dependsOn(uikitMain) - target.compilations["test"].defaultSourceSet.dependsOn(uikitTest) + target.compilations["main"].defaultSourceSet.dependsOn(iosMain) + target.compilations["test"].defaultSourceSet.dependsOn(iosTest) } else if (target.konanTarget.family == Family.OSX) { target.compilations["main"].defaultSourceSet.dependsOn(macosMain) target.compilations["test"].defaultSourceSet.dependsOn(macosTest) diff --git a/navigation3/navigation3-ui/build.gradle b/navigation3/navigation3-ui/build.gradle index 4c15343ab6c6c..809550c346eec 100644 --- a/navigation3/navigation3-ui/build.gradle +++ b/navigation3/navigation3-ui/build.gradle @@ -150,8 +150,8 @@ androidXMultiplatform { targets.configureEach { target -> if (target.platformType == KotlinPlatformType.native) { if (target.konanTarget.family == Family.IOS) { - target.compilations["main"].defaultSourceSet.dependsOn(uikitMain) - target.compilations["test"].defaultSourceSet.dependsOn(uikitTest) + target.compilations["main"].defaultSourceSet.dependsOn(iosMain) + target.compilations["test"].defaultSourceSet.dependsOn(iosTest) } else if (target.konanTarget.family == Family.OSX) { target.compilations["main"].defaultSourceSet.dependsOn(macosMain) target.compilations["test"].defaultSourceSet.dependsOn(macosTest) From 92916e6f4cb7486a5cc974f0ee177ca889ff797d Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Fri, 5 Dec 2025 21:35:29 +0100 Subject: [PATCH 03/21] api dump --- .../ui-graphics/api/desktop/ui-graphics.api | 67 +++++++++ .../ui/ui-graphics/api/ui-graphics.klib.api | 134 ++++++++++++++++++ .../api/desktop/ui-tooling-data.api | 118 --------------- compose/ui/ui/api/desktop/ui.api | 4 + .../api/desktop/navigation-common.api | 4 + .../api/navigation-common.klib.api | 1 + 6 files changed, 210 insertions(+), 118 deletions(-) delete mode 100644 compose/ui/ui-tooling-data/api/desktop/ui-tooling-data.api diff --git a/compose/ui/ui-graphics/api/desktop/ui-graphics.api b/compose/ui/ui-graphics/api/desktop/ui-graphics.api index a4f41e3984f37..3677f81369b90 100644 --- a/compose/ui/ui-graphics/api/desktop/ui-graphics.api +++ b/compose/ui/ui-graphics/api/desktop/ui-graphics.api @@ -55,6 +55,7 @@ public final class androidx/compose/ui/graphics/BlendMode$Companion { } public final class androidx/compose/ui/graphics/BlendModeColorFilter : androidx/compose/ui/graphics/ColorFilter { + public static final field $stable I public synthetic fun (JILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun equals (Ljava/lang/Object;)Z public final fun getBlendMode-0nO6VwU ()I @@ -64,6 +65,7 @@ public final class androidx/compose/ui/graphics/BlendModeColorFilter : androidx/ } public final class androidx/compose/ui/graphics/BlurEffect : androidx/compose/ui/graphics/RenderEffect { + public static final field $stable I public static final field Companion Landroidx/compose/ui/graphics/BlurEffect$Companion; public synthetic fun (Landroidx/compose/ui/graphics/RenderEffect;FFIILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun (Landroidx/compose/ui/graphics/RenderEffect;FFILkotlin/jvm/internal/DefaultConstructorMarker;)V @@ -78,6 +80,7 @@ public final class androidx/compose/ui/graphics/BlurEffect$Companion { } public abstract class androidx/compose/ui/graphics/Brush { + public static final field $stable I public static final field Companion Landroidx/compose/ui/graphics/Brush$Companion; public abstract fun applyTo-Pq9zytI (JLandroidx/compose/ui/graphics/Paint;F)V public fun getIntrinsicSize-NH-jbRc ()J @@ -241,6 +244,7 @@ public final class androidx/compose/ui/graphics/Color$Companion { } public class androidx/compose/ui/graphics/ColorFilter { + public static final field $stable I public static final field Companion Landroidx/compose/ui/graphics/ColorFilter$Companion; } @@ -296,6 +300,7 @@ public final class androidx/compose/ui/graphics/ColorMatrix { } public final class androidx/compose/ui/graphics/ColorMatrixColorFilter : androidx/compose/ui/graphics/ColorFilter { + public static final field $stable I public synthetic fun ([FLkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun copyColorMatrix-gBh15pI ([F)[F public static synthetic fun copyColorMatrix-gBh15pI$default (Landroidx/compose/ui/graphics/ColorMatrixColorFilter;[FILjava/lang/Object;)[F @@ -433,6 +438,7 @@ public final class androidx/compose/ui/graphics/Interpolatable$Companion { } public class androidx/compose/ui/graphics/Interval { + public static final field $stable I public fun (FFLjava/lang/Object;)V public synthetic fun (FFLjava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun contains (F)Z @@ -447,6 +453,7 @@ public class androidx/compose/ui/graphics/Interval { } public final class androidx/compose/ui/graphics/IntervalTree { + public static final field $stable I public fun ()V public final fun addInterval (FFLjava/lang/Object;)V public final fun clear ()V @@ -464,6 +471,7 @@ public final class androidx/compose/ui/graphics/IntervalTree { } public final class androidx/compose/ui/graphics/LightingColorFilter : androidx/compose/ui/graphics/ColorFilter { + public static final field $stable I public synthetic fun (JJLkotlin/jvm/internal/DefaultConstructorMarker;)V public fun equals (Ljava/lang/Object;)Z public final fun getAdd-0d7_KjU ()J @@ -473,6 +481,7 @@ public final class androidx/compose/ui/graphics/LightingColorFilter : androidx/c } public final class androidx/compose/ui/graphics/LinearGradient : androidx/compose/ui/graphics/ShaderBrush, androidx/compose/ui/graphics/Interpolatable { + public static final field $stable I public synthetic fun (Ljava/util/List;Ljava/util/List;JJIILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun createShader-uvyYCjk (J)Lorg/jetbrains/skia/Shader; public fun equals (Ljava/lang/Object;)Z @@ -535,6 +544,7 @@ public final class androidx/compose/ui/graphics/MatrixKt { } public final class androidx/compose/ui/graphics/OffsetEffect : androidx/compose/ui/graphics/RenderEffect { + public static final field $stable I public synthetic fun (Landroidx/compose/ui/graphics/RenderEffect;JLkotlin/jvm/internal/DefaultConstructorMarker;)V public fun equals (Ljava/lang/Object;)Z public fun hashCode ()I @@ -542,16 +552,19 @@ public final class androidx/compose/ui/graphics/OffsetEffect : androidx/compose/ } public abstract class androidx/compose/ui/graphics/Outline { + public static final field $stable I public abstract fun getBounds ()Landroidx/compose/ui/geometry/Rect; } public final class androidx/compose/ui/graphics/Outline$Generic : androidx/compose/ui/graphics/Outline { + public static final field $stable I public fun (Landroidx/compose/ui/graphics/Path;)V public fun getBounds ()Landroidx/compose/ui/geometry/Rect; public final fun getPath ()Landroidx/compose/ui/graphics/Path; } public final class androidx/compose/ui/graphics/Outline$Rectangle : androidx/compose/ui/graphics/Outline { + public static final field $stable I public fun (Landroidx/compose/ui/geometry/Rect;)V public fun equals (Ljava/lang/Object;)Z public fun getBounds ()Landroidx/compose/ui/geometry/Rect; @@ -560,6 +573,7 @@ public final class androidx/compose/ui/graphics/Outline$Rectangle : androidx/com } public final class androidx/compose/ui/graphics/Outline$Rounded : androidx/compose/ui/graphics/Outline { + public static final field $stable I public fun (Landroidx/compose/ui/geometry/RoundRect;)V public fun equals (Ljava/lang/Object;)Z public fun getBounds ()Landroidx/compose/ui/geometry/Rect; @@ -747,6 +761,7 @@ public final class androidx/compose/ui/graphics/PathGeometryKt { } public final class androidx/compose/ui/graphics/PathHitTester { + public static final field $stable I public fun ()V public final fun contains-k-4lQ0M (J)Z public final fun updatePath (Landroidx/compose/ui/graphics/Path;F)V @@ -825,6 +840,7 @@ public final class androidx/compose/ui/graphics/PathOperationKt { } public final class androidx/compose/ui/graphics/PathSegment { + public static final field $stable I public fun equals (Ljava/lang/Object;)Z public final fun getPoints ()[F public final fun getType ()Landroidx/compose/ui/graphics/PathSegment$Type; @@ -858,6 +874,7 @@ public final class androidx/compose/ui/graphics/PathSvgKt { } public final class androidx/compose/ui/graphics/PixelMap { + public static final field $stable I public fun ([IIIII)V public final fun get-WaAFU9c (II)J public final fun getBuffer ()[I @@ -887,6 +904,7 @@ public final class androidx/compose/ui/graphics/PointMode$Companion { } public final class androidx/compose/ui/graphics/RadialGradient : androidx/compose/ui/graphics/ShaderBrush, androidx/compose/ui/graphics/Interpolatable { + public static final field $stable I public synthetic fun (Ljava/util/List;Ljava/util/List;JFIILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun createShader-uvyYCjk (J)Lorg/jetbrains/skia/Shader; public fun equals (Ljava/lang/Object;)Z @@ -907,6 +925,7 @@ public final class androidx/compose/ui/graphics/Rects_skikoKt { } public abstract class androidx/compose/ui/graphics/RenderEffect { + public static final field $stable I public final fun asSkiaImageFilter ()Lorg/jetbrains/skia/ImageFilter; protected abstract fun createImageFilter ()Lorg/jetbrains/skia/ImageFilter; public fun isSupported ()Z @@ -923,6 +942,7 @@ public final class androidx/compose/ui/graphics/RenderEffect_desktopKt { } public abstract class androidx/compose/ui/graphics/ShaderBrush : androidx/compose/ui/graphics/Brush { + public static final field $stable I public fun ()V public final fun applyTo-Pq9zytI (JLandroidx/compose/ui/graphics/Paint;F)V public abstract fun createShader-uvyYCjk (J)Lorg/jetbrains/skia/Shader; @@ -943,6 +963,7 @@ public final class androidx/compose/ui/graphics/ShaderKt { } public final class androidx/compose/ui/graphics/Shadow { + public static final field $stable I public static final field Companion Landroidx/compose/ui/graphics/Shadow$Companion; public synthetic fun (JJFILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun (JJFLkotlin/jvm/internal/DefaultConstructorMarker;)V @@ -1021,6 +1042,7 @@ public final class androidx/compose/ui/graphics/SkiaTileMode_skikoKt { } public final class androidx/compose/ui/graphics/SolidColor : androidx/compose/ui/graphics/Brush, androidx/compose/ui/graphics/Interpolatable { + public static final field $stable I public synthetic fun (JLkotlin/jvm/internal/DefaultConstructorMarker;)V public fun applyTo-Pq9zytI (JLandroidx/compose/ui/graphics/Paint;F)V public fun equals (Ljava/lang/Object;)Z @@ -1088,6 +1110,7 @@ public final class androidx/compose/ui/graphics/StrokeJoin$Companion { } public final class androidx/compose/ui/graphics/SweepGradient : androidx/compose/ui/graphics/ShaderBrush, androidx/compose/ui/graphics/Interpolatable { + public static final field $stable I public synthetic fun (JLjava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun createShader-uvyYCjk (J)Lorg/jetbrains/skia/Shader; public fun equals (Ljava/lang/Object;)Z @@ -1136,6 +1159,7 @@ public final class androidx/compose/ui/graphics/VertexMode$Companion { } public final class androidx/compose/ui/graphics/Vertices { + public static final field $stable I public synthetic fun (ILjava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getColors ()[I public final fun getIndices ()[S @@ -1145,6 +1169,7 @@ public final class androidx/compose/ui/graphics/Vertices { } public abstract class androidx/compose/ui/graphics/colorspace/Adaptation { + public static final field $stable I public static final field Companion Landroidx/compose/ui/graphics/colorspace/Adaptation$Companion; public synthetic fun ([FLkotlin/jvm/internal/DefaultConstructorMarker;)V } @@ -1177,6 +1202,7 @@ public final class androidx/compose/ui/graphics/colorspace/ColorModel$Companion } public abstract class androidx/compose/ui/graphics/colorspace/ColorSpace { + public static final field $stable I public synthetic fun (Ljava/lang/String;JLkotlin/jvm/internal/DefaultConstructorMarker;)V public fun equals (Ljava/lang/Object;)Z public final fun fromXyz (FFF)[F @@ -1203,6 +1229,7 @@ public final class androidx/compose/ui/graphics/colorspace/ColorSpaceKt { } public final class androidx/compose/ui/graphics/colorspace/ColorSpaces { + public static final field $stable I public static final field INSTANCE Landroidx/compose/ui/graphics/colorspace/ColorSpaces; public final fun getAces ()Landroidx/compose/ui/graphics/colorspace/Rgb; public final fun getAcescg ()Landroidx/compose/ui/graphics/colorspace/Rgb; @@ -1227,6 +1254,7 @@ public final class androidx/compose/ui/graphics/colorspace/ColorSpaces { } public class androidx/compose/ui/graphics/colorspace/Connector { + public static final field $stable I public final fun getDestination ()Landroidx/compose/ui/graphics/colorspace/ColorSpace; public final fun getRenderIntent-uksYyKA ()I public final fun getSource ()Landroidx/compose/ui/graphics/colorspace/ColorSpace; @@ -1235,6 +1263,7 @@ public class androidx/compose/ui/graphics/colorspace/Connector { } public final class androidx/compose/ui/graphics/colorspace/Illuminant { + public static final field $stable I public static final field INSTANCE Landroidx/compose/ui/graphics/colorspace/Illuminant; public final fun getA ()Landroidx/compose/ui/graphics/colorspace/WhitePoint; public final fun getB ()Landroidx/compose/ui/graphics/colorspace/WhitePoint; @@ -1268,6 +1297,7 @@ public final class androidx/compose/ui/graphics/colorspace/RenderIntent$Companio } public final class androidx/compose/ui/graphics/colorspace/Rgb : androidx/compose/ui/graphics/colorspace/ColorSpace { + public static final field $stable I public fun (Ljava/lang/String;[FD)V public fun (Ljava/lang/String;[FLandroidx/compose/ui/graphics/colorspace/TransferParameters;)V public fun (Ljava/lang/String;[FLandroidx/compose/ui/graphics/colorspace/WhitePoint;D)V @@ -1299,6 +1329,7 @@ public final class androidx/compose/ui/graphics/colorspace/Rgb : androidx/compos } public final class androidx/compose/ui/graphics/colorspace/TransferParameters { + public static final field $stable I public fun (DDDDDDD)V public synthetic fun (DDDDDDDILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()D @@ -1323,6 +1354,7 @@ public final class androidx/compose/ui/graphics/colorspace/TransferParameters { } public final class androidx/compose/ui/graphics/colorspace/WhitePoint { + public static final field $stable I public fun (FF)V public fun (FFF)V public final fun component1 ()F @@ -1337,6 +1369,7 @@ public final class androidx/compose/ui/graphics/colorspace/WhitePoint { } public final class androidx/compose/ui/graphics/drawscope/CanvasDrawScope : androidx/compose/ui/graphics/drawscope/DrawScope { + public static final field $stable I public fun ()V public final fun draw-yzxVdVo (Landroidx/compose/ui/unit/Density;Landroidx/compose/ui/unit/LayoutDirection;Landroidx/compose/ui/graphics/Canvas;JLkotlin/jvm/functions/Function1;)V public fun drawArc-illE91I (Landroidx/compose/ui/graphics/Brush;FFZJJFLandroidx/compose/ui/graphics/drawscope/DrawStyle;Landroidx/compose/ui/graphics/ColorFilter;I)V @@ -1366,6 +1399,7 @@ public final class androidx/compose/ui/graphics/drawscope/CanvasDrawScope : andr } public final class androidx/compose/ui/graphics/drawscope/CanvasDrawScope$DrawParams { + public static final field $stable I public synthetic fun (Landroidx/compose/ui/unit/Density;Landroidx/compose/ui/unit/LayoutDirection;Landroidx/compose/ui/graphics/Canvas;JILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun (Landroidx/compose/ui/unit/Density;Landroidx/compose/ui/unit/LayoutDirection;Landroidx/compose/ui/graphics/Canvas;JLkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Landroidx/compose/ui/unit/Density; @@ -1548,6 +1582,7 @@ public abstract interface annotation class androidx/compose/ui/graphics/drawscop } public abstract class androidx/compose/ui/graphics/drawscope/DrawStyle { + public static final field $stable I } public abstract interface class androidx/compose/ui/graphics/drawscope/DrawTransform { @@ -1587,10 +1622,12 @@ public final class androidx/compose/ui/graphics/drawscope/DrawTransformKt { } public final class androidx/compose/ui/graphics/drawscope/Fill : androidx/compose/ui/graphics/drawscope/DrawStyle { + public static final field $stable I public static final field INSTANCE Landroidx/compose/ui/graphics/drawscope/Fill; } public final class androidx/compose/ui/graphics/drawscope/Stroke : androidx/compose/ui/graphics/drawscope/DrawStyle { + public static final field $stable I public static final field Companion Landroidx/compose/ui/graphics/drawscope/Stroke$Companion; public static final field DefaultMiter F public static final field HairlineWidth F @@ -1631,6 +1668,7 @@ public final class androidx/compose/ui/graphics/layer/CompositingStrategy$Compan } public final class androidx/compose/ui/graphics/layer/GraphicsLayer { + public static final field $stable I public final fun getAlpha ()F public final fun getAmbientShadowColor-0d7_KjU ()J public final fun getBlendMode-0nO6VwU ()I @@ -1688,6 +1726,7 @@ public final class androidx/compose/ui/graphics/layer/GraphicsLayerKt { } public final class androidx/compose/ui/graphics/painter/BitmapPainter : androidx/compose/ui/graphics/painter/Painter { + public static final field $stable I public synthetic fun (Landroidx/compose/ui/graphics/ImageBitmap;JJILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun (Landroidx/compose/ui/graphics/ImageBitmap;JJLkotlin/jvm/internal/DefaultConstructorMarker;)V public fun equals (Ljava/lang/Object;)Z @@ -1702,6 +1741,7 @@ public final class androidx/compose/ui/graphics/painter/BitmapPainterKt { } public final class androidx/compose/ui/graphics/painter/BrushPainter : androidx/compose/ui/graphics/painter/Painter { + public static final field $stable I public fun (Landroidx/compose/ui/graphics/Brush;)V public fun equals (Ljava/lang/Object;)Z public final fun getBrush ()Landroidx/compose/ui/graphics/Brush; @@ -1711,6 +1751,7 @@ public final class androidx/compose/ui/graphics/painter/BrushPainter : androidx/ } public final class androidx/compose/ui/graphics/painter/ColorPainter : androidx/compose/ui/graphics/painter/Painter { + public static final field $stable I public synthetic fun (JLkotlin/jvm/internal/DefaultConstructorMarker;)V public fun equals (Ljava/lang/Object;)Z public final fun getColor-0d7_KjU ()J @@ -1720,6 +1761,7 @@ public final class androidx/compose/ui/graphics/painter/ColorPainter : androidx/ } public abstract class androidx/compose/ui/graphics/painter/Painter { + public static final field $stable I public fun ()V protected fun applyAlpha (F)Z protected fun applyColorFilter (Landroidx/compose/ui/graphics/ColorFilter;)Z @@ -1731,16 +1773,19 @@ public abstract class androidx/compose/ui/graphics/painter/Painter { } public final class androidx/compose/ui/graphics/shadow/DropShadowPainter : androidx/compose/ui/graphics/painter/Painter { + public static final field $stable I public fun (Landroidx/compose/ui/graphics/Shape;Landroidx/compose/ui/graphics/shadow/Shadow;)V public fun getIntrinsicSize-NH-jbRc ()J } public final class androidx/compose/ui/graphics/shadow/InnerShadowPainter : androidx/compose/ui/graphics/painter/Painter { + public static final field $stable I public fun (Landroidx/compose/ui/graphics/Shape;Landroidx/compose/ui/graphics/shadow/Shadow;)V public fun getIntrinsicSize-NH-jbRc ()J } public final class androidx/compose/ui/graphics/shadow/Shadow { + public static final field $stable I public synthetic fun (FJFJFIILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun (FJFJFILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun (FLandroidx/compose/ui/graphics/Brush;FJFIILkotlin/jvm/internal/DefaultConstructorMarker;)V @@ -1768,6 +1813,7 @@ public final class androidx/compose/ui/graphics/shadow/ShadowKt { } public final class androidx/compose/ui/graphics/vector/PathBuilder { + public static final field $stable I public fun ()V public final fun arcTo (FFFZZFF)Landroidx/compose/ui/graphics/vector/PathBuilder; public final fun arcToRelative (FFFZZFF)Landroidx/compose/ui/graphics/vector/PathBuilder; @@ -1792,6 +1838,7 @@ public final class androidx/compose/ui/graphics/vector/PathBuilder { } public abstract class androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public synthetic fun (ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun (ZZLkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun isCurve ()Z @@ -1799,6 +1846,7 @@ public abstract class androidx/compose/ui/graphics/vector/PathNode { } public final class androidx/compose/ui/graphics/vector/PathNode$ArcTo : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public fun (FFFZZFF)V public final fun component1 ()F public final fun component2 ()F @@ -1822,10 +1870,12 @@ public final class androidx/compose/ui/graphics/vector/PathNode$ArcTo : androidx } public final class androidx/compose/ui/graphics/vector/PathNode$Close : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public static final field INSTANCE Landroidx/compose/ui/graphics/vector/PathNode$Close; } public final class androidx/compose/ui/graphics/vector/PathNode$CurveTo : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public fun (FFFFFF)V public final fun component1 ()F public final fun component2 ()F @@ -1847,6 +1897,7 @@ public final class androidx/compose/ui/graphics/vector/PathNode$CurveTo : androi } public final class androidx/compose/ui/graphics/vector/PathNode$HorizontalTo : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public fun (F)V public final fun component1 ()F public final fun copy (F)Landroidx/compose/ui/graphics/vector/PathNode$HorizontalTo; @@ -1858,6 +1909,7 @@ public final class androidx/compose/ui/graphics/vector/PathNode$HorizontalTo : a } public final class androidx/compose/ui/graphics/vector/PathNode$LineTo : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public fun (FF)V public final fun component1 ()F public final fun component2 ()F @@ -1871,6 +1923,7 @@ public final class androidx/compose/ui/graphics/vector/PathNode$LineTo : android } public final class androidx/compose/ui/graphics/vector/PathNode$MoveTo : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public fun (FF)V public final fun component1 ()F public final fun component2 ()F @@ -1884,6 +1937,7 @@ public final class androidx/compose/ui/graphics/vector/PathNode$MoveTo : android } public final class androidx/compose/ui/graphics/vector/PathNode$QuadTo : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public fun (FFFF)V public final fun component1 ()F public final fun component2 ()F @@ -1901,6 +1955,7 @@ public final class androidx/compose/ui/graphics/vector/PathNode$QuadTo : android } public final class androidx/compose/ui/graphics/vector/PathNode$ReflectiveCurveTo : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public fun (FFFF)V public final fun component1 ()F public final fun component2 ()F @@ -1918,6 +1973,7 @@ public final class androidx/compose/ui/graphics/vector/PathNode$ReflectiveCurveT } public final class androidx/compose/ui/graphics/vector/PathNode$ReflectiveQuadTo : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public fun (FF)V public final fun component1 ()F public final fun component2 ()F @@ -1931,6 +1987,7 @@ public final class androidx/compose/ui/graphics/vector/PathNode$ReflectiveQuadTo } public final class androidx/compose/ui/graphics/vector/PathNode$RelativeArcTo : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public fun (FFFZZFF)V public final fun component1 ()F public final fun component2 ()F @@ -1954,6 +2011,7 @@ public final class androidx/compose/ui/graphics/vector/PathNode$RelativeArcTo : } public final class androidx/compose/ui/graphics/vector/PathNode$RelativeCurveTo : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public fun (FFFFFF)V public final fun component1 ()F public final fun component2 ()F @@ -1975,6 +2033,7 @@ public final class androidx/compose/ui/graphics/vector/PathNode$RelativeCurveTo } public final class androidx/compose/ui/graphics/vector/PathNode$RelativeHorizontalTo : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public fun (F)V public final fun component1 ()F public final fun copy (F)Landroidx/compose/ui/graphics/vector/PathNode$RelativeHorizontalTo; @@ -1986,6 +2045,7 @@ public final class androidx/compose/ui/graphics/vector/PathNode$RelativeHorizont } public final class androidx/compose/ui/graphics/vector/PathNode$RelativeLineTo : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public fun (FF)V public final fun component1 ()F public final fun component2 ()F @@ -1999,6 +2059,7 @@ public final class androidx/compose/ui/graphics/vector/PathNode$RelativeLineTo : } public final class androidx/compose/ui/graphics/vector/PathNode$RelativeMoveTo : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public fun (FF)V public final fun component1 ()F public final fun component2 ()F @@ -2012,6 +2073,7 @@ public final class androidx/compose/ui/graphics/vector/PathNode$RelativeMoveTo : } public final class androidx/compose/ui/graphics/vector/PathNode$RelativeQuadTo : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public fun (FFFF)V public final fun component1 ()F public final fun component2 ()F @@ -2029,6 +2091,7 @@ public final class androidx/compose/ui/graphics/vector/PathNode$RelativeQuadTo : } public final class androidx/compose/ui/graphics/vector/PathNode$RelativeReflectiveCurveTo : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public fun (FFFF)V public final fun component1 ()F public final fun component2 ()F @@ -2046,6 +2109,7 @@ public final class androidx/compose/ui/graphics/vector/PathNode$RelativeReflecti } public final class androidx/compose/ui/graphics/vector/PathNode$RelativeReflectiveQuadTo : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public fun (FF)V public final fun component1 ()F public final fun component2 ()F @@ -2059,6 +2123,7 @@ public final class androidx/compose/ui/graphics/vector/PathNode$RelativeReflecti } public final class androidx/compose/ui/graphics/vector/PathNode$RelativeVerticalTo : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public fun (F)V public final fun component1 ()F public final fun copy (F)Landroidx/compose/ui/graphics/vector/PathNode$RelativeVerticalTo; @@ -2070,6 +2135,7 @@ public final class androidx/compose/ui/graphics/vector/PathNode$RelativeVertical } public final class androidx/compose/ui/graphics/vector/PathNode$VerticalTo : androidx/compose/ui/graphics/vector/PathNode { + public static final field $stable I public fun (F)V public final fun component1 ()F public final fun copy (F)Landroidx/compose/ui/graphics/vector/PathNode$VerticalTo; @@ -2081,6 +2147,7 @@ public final class androidx/compose/ui/graphics/vector/PathNode$VerticalTo : and } public final class androidx/compose/ui/graphics/vector/PathParser { + public static final field $stable I public fun ()V public final fun addPathNodes (Ljava/util/List;)Landroidx/compose/ui/graphics/vector/PathParser; public final fun clear ()V diff --git a/compose/ui/ui-graphics/api/ui-graphics.klib.api b/compose/ui/ui-graphics/api/ui-graphics.klib.api index 9b571bb709a2a..112433ac628e1 100644 --- a/compose/ui/ui-graphics/api/ui-graphics.klib.api +++ b/compose/ui/ui-graphics/api/ui-graphics.klib.api @@ -1941,12 +1941,79 @@ final const val androidx.compose.ui.graphics/DefaultAlpha // androidx.compose.ui final const val androidx.compose.ui.graphics/UnspecifiedColor // androidx.compose.ui.graphics/UnspecifiedColor|{}UnspecifiedColor[0] final fun (): kotlin/ULong // androidx.compose.ui.graphics/UnspecifiedColor.|(){}[0] +final val androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_Adaptation$stableprop // androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_Adaptation$stableprop|#static{}androidx_compose_ui_graphics_colorspace_Adaptation$stableprop[0] +final val androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_ColorSpace$stableprop // androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_ColorSpace$stableprop|#static{}androidx_compose_ui_graphics_colorspace_ColorSpace$stableprop[0] +final val androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_ColorSpaces$stableprop // androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_ColorSpaces$stableprop|#static{}androidx_compose_ui_graphics_colorspace_ColorSpaces$stableprop[0] +final val androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_Connector$stableprop // androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_Connector$stableprop|#static{}androidx_compose_ui_graphics_colorspace_Connector$stableprop[0] +final val androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_Illuminant$stableprop // androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_Illuminant$stableprop|#static{}androidx_compose_ui_graphics_colorspace_Illuminant$stableprop[0] +final val androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_Rgb$stableprop // androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_Rgb$stableprop|#static{}androidx_compose_ui_graphics_colorspace_Rgb$stableprop[0] +final val androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_TransferParameters$stableprop // androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_TransferParameters$stableprop|#static{}androidx_compose_ui_graphics_colorspace_TransferParameters$stableprop[0] +final val androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_WhitePoint$stableprop // androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_WhitePoint$stableprop|#static{}androidx_compose_ui_graphics_colorspace_WhitePoint$stableprop[0] +final val androidx.compose.ui.graphics.drawscope/androidx_compose_ui_graphics_drawscope_CanvasDrawScope$stableprop // androidx.compose.ui.graphics.drawscope/androidx_compose_ui_graphics_drawscope_CanvasDrawScope$stableprop|#static{}androidx_compose_ui_graphics_drawscope_CanvasDrawScope$stableprop[0] +final val androidx.compose.ui.graphics.drawscope/androidx_compose_ui_graphics_drawscope_DrawStyle$stableprop // androidx.compose.ui.graphics.drawscope/androidx_compose_ui_graphics_drawscope_DrawStyle$stableprop|#static{}androidx_compose_ui_graphics_drawscope_DrawStyle$stableprop[0] +final val androidx.compose.ui.graphics.drawscope/androidx_compose_ui_graphics_drawscope_Fill$stableprop // androidx.compose.ui.graphics.drawscope/androidx_compose_ui_graphics_drawscope_Fill$stableprop|#static{}androidx_compose_ui_graphics_drawscope_Fill$stableprop[0] +final val androidx.compose.ui.graphics.drawscope/androidx_compose_ui_graphics_drawscope_Stroke$stableprop // androidx.compose.ui.graphics.drawscope/androidx_compose_ui_graphics_drawscope_Stroke$stableprop|#static{}androidx_compose_ui_graphics_drawscope_Stroke$stableprop[0] +final val androidx.compose.ui.graphics.layer/androidx_compose_ui_graphics_layer_GraphicsLayer$stableprop // androidx.compose.ui.graphics.layer/androidx_compose_ui_graphics_layer_GraphicsLayer$stableprop|#static{}androidx_compose_ui_graphics_layer_GraphicsLayer$stableprop[0] +final val androidx.compose.ui.graphics.painter/androidx_compose_ui_graphics_painter_BitmapPainter$stableprop // androidx.compose.ui.graphics.painter/androidx_compose_ui_graphics_painter_BitmapPainter$stableprop|#static{}androidx_compose_ui_graphics_painter_BitmapPainter$stableprop[0] +final val androidx.compose.ui.graphics.painter/androidx_compose_ui_graphics_painter_BrushPainter$stableprop // androidx.compose.ui.graphics.painter/androidx_compose_ui_graphics_painter_BrushPainter$stableprop|#static{}androidx_compose_ui_graphics_painter_BrushPainter$stableprop[0] +final val androidx.compose.ui.graphics.painter/androidx_compose_ui_graphics_painter_ColorPainter$stableprop // androidx.compose.ui.graphics.painter/androidx_compose_ui_graphics_painter_ColorPainter$stableprop|#static{}androidx_compose_ui_graphics_painter_ColorPainter$stableprop[0] +final val androidx.compose.ui.graphics.painter/androidx_compose_ui_graphics_painter_Painter$stableprop // androidx.compose.ui.graphics.painter/androidx_compose_ui_graphics_painter_Painter$stableprop|#static{}androidx_compose_ui_graphics_painter_Painter$stableprop[0] +final val androidx.compose.ui.graphics.shadow/androidx_compose_ui_graphics_shadow_DropShadowPainter$stableprop // androidx.compose.ui.graphics.shadow/androidx_compose_ui_graphics_shadow_DropShadowPainter$stableprop|#static{}androidx_compose_ui_graphics_shadow_DropShadowPainter$stableprop[0] +final val androidx.compose.ui.graphics.shadow/androidx_compose_ui_graphics_shadow_InnerShadowPainter$stableprop // androidx.compose.ui.graphics.shadow/androidx_compose_ui_graphics_shadow_InnerShadowPainter$stableprop|#static{}androidx_compose_ui_graphics_shadow_InnerShadowPainter$stableprop[0] +final val androidx.compose.ui.graphics.shadow/androidx_compose_ui_graphics_shadow_Shadow$stableprop // androidx.compose.ui.graphics.shadow/androidx_compose_ui_graphics_shadow_Shadow$stableprop|#static{}androidx_compose_ui_graphics_shadow_Shadow$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathBuilder$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathBuilder$stableprop|#static{}androidx_compose_ui_graphics_vector_PathBuilder$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_ArcTo$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_ArcTo$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_ArcTo$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_Close$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_Close$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_Close$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_CurveTo$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_CurveTo$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_CurveTo$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_HorizontalTo$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_HorizontalTo$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_HorizontalTo$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_LineTo$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_LineTo$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_LineTo$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_MoveTo$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_MoveTo$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_MoveTo$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_QuadTo$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_QuadTo$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_QuadTo$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_ReflectiveCurveTo$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_ReflectiveCurveTo$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_ReflectiveCurveTo$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_ReflectiveQuadTo$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_ReflectiveQuadTo$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_ReflectiveQuadTo$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeArcTo$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeArcTo$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_RelativeArcTo$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeCurveTo$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeCurveTo$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_RelativeCurveTo$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeHorizontalTo$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeHorizontalTo$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_RelativeHorizontalTo$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeLineTo$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeLineTo$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_RelativeLineTo$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeMoveTo$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeMoveTo$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_RelativeMoveTo$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeQuadTo$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeQuadTo$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_RelativeQuadTo$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeReflectiveCurveTo$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeReflectiveCurveTo$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_RelativeReflectiveCurveTo$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeReflectiveQuadTo$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeReflectiveQuadTo$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_RelativeReflectiveQuadTo$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeVerticalTo$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeVerticalTo$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_RelativeVerticalTo$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_VerticalTo$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_VerticalTo$stableprop|#static{}androidx_compose_ui_graphics_vector_PathNode_VerticalTo$stableprop[0] +final val androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathParser$stableprop // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathParser$stableprop|#static{}androidx_compose_ui_graphics_vector_PathParser$stableprop[0] final val androidx.compose.ui.graphics/CloseSegment // androidx.compose.ui.graphics/CloseSegment|{}CloseSegment[0] final fun (): androidx.compose.ui.graphics/PathSegment // androidx.compose.ui.graphics/CloseSegment.|(){}[0] final val androidx.compose.ui.graphics/DoneSegment // androidx.compose.ui.graphics/DoneSegment|{}DoneSegment[0] final fun (): androidx.compose.ui.graphics/PathSegment // androidx.compose.ui.graphics/DoneSegment.|(){}[0] final val androidx.compose.ui.graphics/RectangleShape // androidx.compose.ui.graphics/RectangleShape|{}RectangleShape[0] final fun (): androidx.compose.ui.graphics/Shape // androidx.compose.ui.graphics/RectangleShape.|(){}[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_BlendModeColorFilter$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_BlendModeColorFilter$stableprop|#static{}androidx_compose_ui_graphics_BlendModeColorFilter$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_BlurEffect$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_BlurEffect$stableprop|#static{}androidx_compose_ui_graphics_BlurEffect$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_Brush$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_Brush$stableprop|#static{}androidx_compose_ui_graphics_Brush$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_ColorFilter$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_ColorFilter$stableprop|#static{}androidx_compose_ui_graphics_ColorFilter$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_ColorMatrixColorFilter$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_ColorMatrixColorFilter$stableprop|#static{}androidx_compose_ui_graphics_ColorMatrixColorFilter$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_Interval$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_Interval$stableprop|#static{}androidx_compose_ui_graphics_Interval$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_IntervalTree$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_IntervalTree$stableprop|#static{}androidx_compose_ui_graphics_IntervalTree$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_LightingColorFilter$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_LightingColorFilter$stableprop|#static{}androidx_compose_ui_graphics_LightingColorFilter$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_LinearGradient$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_LinearGradient$stableprop|#static{}androidx_compose_ui_graphics_LinearGradient$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_OffsetEffect$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_OffsetEffect$stableprop|#static{}androidx_compose_ui_graphics_OffsetEffect$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_Outline$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_Outline$stableprop|#static{}androidx_compose_ui_graphics_Outline$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_Outline_Generic$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_Outline_Generic$stableprop|#static{}androidx_compose_ui_graphics_Outline_Generic$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_Outline_Rectangle$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_Outline_Rectangle$stableprop|#static{}androidx_compose_ui_graphics_Outline_Rectangle$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_Outline_Rounded$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_Outline_Rounded$stableprop|#static{}androidx_compose_ui_graphics_Outline_Rounded$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_PathHitTester$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_PathHitTester$stableprop|#static{}androidx_compose_ui_graphics_PathHitTester$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_PathSegment$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_PathSegment$stableprop|#static{}androidx_compose_ui_graphics_PathSegment$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_PixelMap$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_PixelMap$stableprop|#static{}androidx_compose_ui_graphics_PixelMap$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_RadialGradient$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_RadialGradient$stableprop|#static{}androidx_compose_ui_graphics_RadialGradient$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_RenderEffect$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_RenderEffect$stableprop|#static{}androidx_compose_ui_graphics_RenderEffect$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_ShaderBrush$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_ShaderBrush$stableprop|#static{}androidx_compose_ui_graphics_ShaderBrush$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_Shadow$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_Shadow$stableprop|#static{}androidx_compose_ui_graphics_Shadow$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_SkiaGraphicsContext$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_SkiaGraphicsContext$stableprop|#static{}androidx_compose_ui_graphics_SkiaGraphicsContext$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_SolidColor$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_SolidColor$stableprop|#static{}androidx_compose_ui_graphics_SolidColor$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_SweepGradient$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_SweepGradient$stableprop|#static{}androidx_compose_ui_graphics_SweepGradient$stableprop[0] +final val androidx.compose.ui.graphics/androidx_compose_ui_graphics_Vertices$stableprop // androidx.compose.ui.graphics/androidx_compose_ui_graphics_Vertices$stableprop|#static{}androidx_compose_ui_graphics_Vertices$stableprop[0] final val androidx.compose.ui.graphics/difference // androidx.compose.ui.graphics/difference|@androidx.compose.ui.graphics.PathOperation.Companion{}difference[0] final fun (androidx.compose.ui.graphics/PathOperation.Companion).(): androidx.compose.ui.graphics/PathOperation // androidx.compose.ui.graphics/difference.|@androidx.compose.ui.graphics.PathOperation.Companion(){}[0] final val androidx.compose.ui.graphics/intersect // androidx.compose.ui.graphics/intersect|@androidx.compose.ui.graphics.PathOperation.Companion{}intersect[0] @@ -2007,8 +2074,50 @@ final fun (org.jetbrains.skia/Path).androidx.compose.ui.graphics/asComposePath() final fun (org.jetbrains.skia/PathEffect).androidx.compose.ui.graphics/asComposePathEffect(): androidx.compose.ui.graphics/PathEffect // androidx.compose.ui.graphics/asComposePathEffect|asComposePathEffect@org.jetbrains.skia.PathEffect(){}[0] final fun (org.jetbrains.skia/PathMeasure).androidx.compose.ui.graphics/asComposePathEffect(): androidx.compose.ui.graphics/PathMeasure // androidx.compose.ui.graphics/asComposePathEffect|asComposePathEffect@org.jetbrains.skia.PathMeasure(){}[0] final fun (org.jetbrains.skia/Rect).androidx.compose.ui.graphics/toComposeRect(): androidx.compose.ui.geometry/Rect // androidx.compose.ui.graphics/toComposeRect|toComposeRect@org.jetbrains.skia.Rect(){}[0] +final fun androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_Adaptation$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_Adaptation$stableprop_getter|androidx_compose_ui_graphics_colorspace_Adaptation$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_ColorSpace$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_ColorSpace$stableprop_getter|androidx_compose_ui_graphics_colorspace_ColorSpace$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_ColorSpaces$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_ColorSpaces$stableprop_getter|androidx_compose_ui_graphics_colorspace_ColorSpaces$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_Connector$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_Connector$stableprop_getter|androidx_compose_ui_graphics_colorspace_Connector$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_Illuminant$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_Illuminant$stableprop_getter|androidx_compose_ui_graphics_colorspace_Illuminant$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_Rgb$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_Rgb$stableprop_getter|androidx_compose_ui_graphics_colorspace_Rgb$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_TransferParameters$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_TransferParameters$stableprop_getter|androidx_compose_ui_graphics_colorspace_TransferParameters$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_WhitePoint$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.colorspace/androidx_compose_ui_graphics_colorspace_WhitePoint$stableprop_getter|androidx_compose_ui_graphics_colorspace_WhitePoint$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.drawscope/androidx_compose_ui_graphics_drawscope_CanvasDrawScope$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.drawscope/androidx_compose_ui_graphics_drawscope_CanvasDrawScope$stableprop_getter|androidx_compose_ui_graphics_drawscope_CanvasDrawScope$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.drawscope/androidx_compose_ui_graphics_drawscope_DrawStyle$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.drawscope/androidx_compose_ui_graphics_drawscope_DrawStyle$stableprop_getter|androidx_compose_ui_graphics_drawscope_DrawStyle$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.drawscope/androidx_compose_ui_graphics_drawscope_Fill$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.drawscope/androidx_compose_ui_graphics_drawscope_Fill$stableprop_getter|androidx_compose_ui_graphics_drawscope_Fill$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.drawscope/androidx_compose_ui_graphics_drawscope_Stroke$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.drawscope/androidx_compose_ui_graphics_drawscope_Stroke$stableprop_getter|androidx_compose_ui_graphics_drawscope_Stroke$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.layer/androidx_compose_ui_graphics_layer_GraphicsLayer$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.layer/androidx_compose_ui_graphics_layer_GraphicsLayer$stableprop_getter|androidx_compose_ui_graphics_layer_GraphicsLayer$stableprop_getter(){}[0] final fun androidx.compose.ui.graphics.painter/BitmapPainter(androidx.compose.ui.graphics/ImageBitmap, androidx.compose.ui.unit/IntOffset = ..., androidx.compose.ui.unit/IntSize = ..., androidx.compose.ui.graphics/FilterQuality = ...): androidx.compose.ui.graphics.painter/BitmapPainter // androidx.compose.ui.graphics.painter/BitmapPainter|BitmapPainter(androidx.compose.ui.graphics.ImageBitmap;androidx.compose.ui.unit.IntOffset;androidx.compose.ui.unit.IntSize;androidx.compose.ui.graphics.FilterQuality){}[0] +final fun androidx.compose.ui.graphics.painter/androidx_compose_ui_graphics_painter_BitmapPainter$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.painter/androidx_compose_ui_graphics_painter_BitmapPainter$stableprop_getter|androidx_compose_ui_graphics_painter_BitmapPainter$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.painter/androidx_compose_ui_graphics_painter_BrushPainter$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.painter/androidx_compose_ui_graphics_painter_BrushPainter$stableprop_getter|androidx_compose_ui_graphics_painter_BrushPainter$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.painter/androidx_compose_ui_graphics_painter_ColorPainter$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.painter/androidx_compose_ui_graphics_painter_ColorPainter$stableprop_getter|androidx_compose_ui_graphics_painter_ColorPainter$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.painter/androidx_compose_ui_graphics_painter_Painter$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.painter/androidx_compose_ui_graphics_painter_Painter$stableprop_getter|androidx_compose_ui_graphics_painter_Painter$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.shadow/androidx_compose_ui_graphics_shadow_DropShadowPainter$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.shadow/androidx_compose_ui_graphics_shadow_DropShadowPainter$stableprop_getter|androidx_compose_ui_graphics_shadow_DropShadowPainter$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.shadow/androidx_compose_ui_graphics_shadow_InnerShadowPainter$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.shadow/androidx_compose_ui_graphics_shadow_InnerShadowPainter$stableprop_getter|androidx_compose_ui_graphics_shadow_InnerShadowPainter$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.shadow/androidx_compose_ui_graphics_shadow_Shadow$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.shadow/androidx_compose_ui_graphics_shadow_Shadow$stableprop_getter|androidx_compose_ui_graphics_shadow_Shadow$stableprop_getter(){}[0] final fun androidx.compose.ui.graphics.shadow/lerp(androidx.compose.ui.graphics.shadow/Shadow?, androidx.compose.ui.graphics.shadow/Shadow?, kotlin/Float): androidx.compose.ui.graphics.shadow/Shadow? // androidx.compose.ui.graphics.shadow/lerp|lerp(androidx.compose.ui.graphics.shadow.Shadow?;androidx.compose.ui.graphics.shadow.Shadow?;kotlin.Float){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathBuilder$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathBuilder$stableprop_getter|androidx_compose_ui_graphics_vector_PathBuilder$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_ArcTo$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_ArcTo$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_ArcTo$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_Close$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_Close$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_Close$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_CurveTo$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_CurveTo$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_CurveTo$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_HorizontalTo$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_HorizontalTo$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_HorizontalTo$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_LineTo$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_LineTo$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_LineTo$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_MoveTo$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_MoveTo$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_MoveTo$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_QuadTo$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_QuadTo$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_QuadTo$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_ReflectiveCurveTo$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_ReflectiveCurveTo$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_ReflectiveCurveTo$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_ReflectiveQuadTo$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_ReflectiveQuadTo$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_ReflectiveQuadTo$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeArcTo$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeArcTo$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_RelativeArcTo$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeCurveTo$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeCurveTo$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_RelativeCurveTo$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeHorizontalTo$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeHorizontalTo$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_RelativeHorizontalTo$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeLineTo$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeLineTo$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_RelativeLineTo$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeMoveTo$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeMoveTo$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_RelativeMoveTo$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeQuadTo$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeQuadTo$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_RelativeQuadTo$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeReflectiveCurveTo$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeReflectiveCurveTo$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_RelativeReflectiveCurveTo$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeReflectiveQuadTo$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeReflectiveQuadTo$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_RelativeReflectiveQuadTo$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeVerticalTo$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_RelativeVerticalTo$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_RelativeVerticalTo$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_VerticalTo$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathNode_VerticalTo$stableprop_getter|androidx_compose_ui_graphics_vector_PathNode_VerticalTo$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathParser$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics.vector/androidx_compose_ui_graphics_vector_PathParser$stableprop_getter|androidx_compose_ui_graphics_vector_PathParser$stableprop_getter(){}[0] final fun androidx.compose.ui.graphics/BlurEffect(kotlin/Float, kotlin/Float, androidx.compose.ui.graphics/TileMode = ...): androidx.compose.ui.graphics/BlurEffect // androidx.compose.ui.graphics/BlurEffect|BlurEffect(kotlin.Float;kotlin.Float;androidx.compose.ui.graphics.TileMode){}[0] final fun androidx.compose.ui.graphics/Canvas(androidx.compose.ui.graphics/ImageBitmap): androidx.compose.ui.graphics/Canvas // androidx.compose.ui.graphics/Canvas|Canvas(androidx.compose.ui.graphics.ImageBitmap){}[0] final fun androidx.compose.ui.graphics/Color(kotlin/Float, kotlin/Float, kotlin/Float, kotlin/Float = ..., androidx.compose.ui.graphics.colorspace/ColorSpace = ...): androidx.compose.ui.graphics/Color // androidx.compose.ui.graphics/Color|Color(kotlin.Float;kotlin.Float;kotlin.Float;kotlin.Float;androidx.compose.ui.graphics.colorspace.ColorSpace){}[0] @@ -2028,6 +2137,31 @@ final fun androidx.compose.ui.graphics/PathMeasure(): androidx.compose.ui.graphi final fun androidx.compose.ui.graphics/RadialGradientShader(androidx.compose.ui.geometry/Offset, kotlin/Float, kotlin.collections/List, kotlin.collections/List? = ..., androidx.compose.ui.graphics/TileMode = ...): org.jetbrains.skia/Shader // androidx.compose.ui.graphics/RadialGradientShader|RadialGradientShader(androidx.compose.ui.geometry.Offset;kotlin.Float;kotlin.collections.List;kotlin.collections.List?;androidx.compose.ui.graphics.TileMode){}[0] final fun androidx.compose.ui.graphics/ShaderBrush(org.jetbrains.skia/Shader): androidx.compose.ui.graphics/ShaderBrush // androidx.compose.ui.graphics/ShaderBrush|ShaderBrush(org.jetbrains.skia.Shader){}[0] final fun androidx.compose.ui.graphics/SweepGradientShader(androidx.compose.ui.geometry/Offset, kotlin.collections/List, kotlin.collections/List? = ...): org.jetbrains.skia/Shader // androidx.compose.ui.graphics/SweepGradientShader|SweepGradientShader(androidx.compose.ui.geometry.Offset;kotlin.collections.List;kotlin.collections.List?){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_BlendModeColorFilter$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_BlendModeColorFilter$stableprop_getter|androidx_compose_ui_graphics_BlendModeColorFilter$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_BlurEffect$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_BlurEffect$stableprop_getter|androidx_compose_ui_graphics_BlurEffect$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_Brush$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_Brush$stableprop_getter|androidx_compose_ui_graphics_Brush$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_ColorFilter$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_ColorFilter$stableprop_getter|androidx_compose_ui_graphics_ColorFilter$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_ColorMatrixColorFilter$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_ColorMatrixColorFilter$stableprop_getter|androidx_compose_ui_graphics_ColorMatrixColorFilter$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_Interval$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_Interval$stableprop_getter|androidx_compose_ui_graphics_Interval$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_IntervalTree$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_IntervalTree$stableprop_getter|androidx_compose_ui_graphics_IntervalTree$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_LightingColorFilter$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_LightingColorFilter$stableprop_getter|androidx_compose_ui_graphics_LightingColorFilter$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_LinearGradient$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_LinearGradient$stableprop_getter|androidx_compose_ui_graphics_LinearGradient$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_OffsetEffect$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_OffsetEffect$stableprop_getter|androidx_compose_ui_graphics_OffsetEffect$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_Outline$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_Outline$stableprop_getter|androidx_compose_ui_graphics_Outline$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_Outline_Generic$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_Outline_Generic$stableprop_getter|androidx_compose_ui_graphics_Outline_Generic$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_Outline_Rectangle$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_Outline_Rectangle$stableprop_getter|androidx_compose_ui_graphics_Outline_Rectangle$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_Outline_Rounded$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_Outline_Rounded$stableprop_getter|androidx_compose_ui_graphics_Outline_Rounded$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_PathHitTester$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_PathHitTester$stableprop_getter|androidx_compose_ui_graphics_PathHitTester$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_PathSegment$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_PathSegment$stableprop_getter|androidx_compose_ui_graphics_PathSegment$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_PixelMap$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_PixelMap$stableprop_getter|androidx_compose_ui_graphics_PixelMap$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_RadialGradient$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_RadialGradient$stableprop_getter|androidx_compose_ui_graphics_RadialGradient$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_RenderEffect$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_RenderEffect$stableprop_getter|androidx_compose_ui_graphics_RenderEffect$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_ShaderBrush$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_ShaderBrush$stableprop_getter|androidx_compose_ui_graphics_ShaderBrush$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_Shadow$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_Shadow$stableprop_getter|androidx_compose_ui_graphics_Shadow$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_SkiaGraphicsContext$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_SkiaGraphicsContext$stableprop_getter|androidx_compose_ui_graphics_SkiaGraphicsContext$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_SolidColor$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_SolidColor$stableprop_getter|androidx_compose_ui_graphics_SolidColor$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_SweepGradient$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_SweepGradient$stableprop_getter|androidx_compose_ui_graphics_SweepGradient$stableprop_getter(){}[0] +final fun androidx.compose.ui.graphics/androidx_compose_ui_graphics_Vertices$stableprop_getter(): kotlin/Int // androidx.compose.ui.graphics/androidx_compose_ui_graphics_Vertices$stableprop_getter|androidx_compose_ui_graphics_Vertices$stableprop_getter(){}[0] final fun androidx.compose.ui.graphics/computeCubicVerticalBounds(kotlin/Float, kotlin/Float, kotlin/Float, kotlin/Float, kotlin/FloatArray, kotlin/Int = ...): androidx.collection/FloatFloatPair // androidx.compose.ui.graphics/computeCubicVerticalBounds|computeCubicVerticalBounds(kotlin.Float;kotlin.Float;kotlin.Float;kotlin.Float;kotlin.FloatArray;kotlin.Int){}[0] final fun androidx.compose.ui.graphics/computeHorizontalBounds(androidx.compose.ui.graphics/PathSegment, kotlin/FloatArray, kotlin/Int = ...): androidx.collection/FloatFloatPair // androidx.compose.ui.graphics/computeHorizontalBounds|computeHorizontalBounds(androidx.compose.ui.graphics.PathSegment;kotlin.FloatArray;kotlin.Int){}[0] final fun androidx.compose.ui.graphics/degrees(kotlin/Float): kotlin/Float // androidx.compose.ui.graphics/degrees|degrees(kotlin.Float){}[0] diff --git a/compose/ui/ui-tooling-data/api/desktop/ui-tooling-data.api b/compose/ui/ui-tooling-data/api/desktop/ui-tooling-data.api deleted file mode 100644 index 6523b6a4eb85e..0000000000000 --- a/compose/ui/ui-tooling-data/api/desktop/ui-tooling-data.api +++ /dev/null @@ -1,118 +0,0 @@ -public final class androidx/compose/ui/tooling/data/CallGroup : androidx/compose/ui/tooling/data/Group { - public static final field $stable I - public fun (Ljava/lang/Object;Ljava/lang/String;Landroidx/compose/ui/unit/IntRect;Landroidx/compose/ui/tooling/data/SourceLocation;Ljava/lang/Object;Ljava/util/List;Ljava/util/Collection;Ljava/util/Collection;Z)V - public fun getParameters ()Ljava/util/List; -} - -public final class androidx/compose/ui/tooling/data/CompositionDataTreeKt { - public static final fun makeTree (Ljava/util/Set;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function3;Landroidx/compose/ui/tooling/data/ContextCache;)Ljava/util/List; - public static synthetic fun makeTree$default (Ljava/util/Set;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function3;Landroidx/compose/ui/tooling/data/ContextCache;ILjava/lang/Object;)Ljava/util/List; -} - -public final class androidx/compose/ui/tooling/data/ContextCache { - public static final field $stable I - public fun ()V - public final fun clear ()V -} - -public abstract class androidx/compose/ui/tooling/data/Group { - public static final field $stable I - public synthetic fun (Ljava/lang/Object;Ljava/lang/String;Landroidx/compose/ui/tooling/data/SourceLocation;Ljava/lang/Object;Landroidx/compose/ui/unit/IntRect;Ljava/util/Collection;Ljava/util/Collection;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun getBox ()Landroidx/compose/ui/unit/IntRect; - public final fun getChildren ()Ljava/util/Collection; - public final fun getData ()Ljava/util/Collection; - public final fun getIdentity ()Ljava/lang/Object; - public final fun getKey ()Ljava/lang/Object; - public final fun getLocation ()Landroidx/compose/ui/tooling/data/SourceLocation; - public fun getModifierInfo ()Ljava/util/List; - public final fun getName ()Ljava/lang/String; - public fun getParameters ()Ljava/util/List; - public final fun isInline ()Z -} - -public final class androidx/compose/ui/tooling/data/JoinedKey { - public static final field $stable I - public fun (Ljava/lang/Object;Ljava/lang/Object;)V - public final fun component1 ()Ljava/lang/Object; - public final fun component2 ()Ljava/lang/Object; - public final fun copy (Ljava/lang/Object;Ljava/lang/Object;)Landroidx/compose/ui/tooling/data/JoinedKey; - public static synthetic fun copy$default (Landroidx/compose/ui/tooling/data/JoinedKey;Ljava/lang/Object;Ljava/lang/Object;ILjava/lang/Object;)Landroidx/compose/ui/tooling/data/JoinedKey; - public fun equals (Ljava/lang/Object;)Z - public final fun getLeft ()Ljava/lang/Object; - public final fun getRight ()Ljava/lang/Object; - public fun hashCode ()I - public fun toString ()Ljava/lang/String; -} - -public final class androidx/compose/ui/tooling/data/NodeGroup : androidx/compose/ui/tooling/data/Group { - public static final field $stable I - public fun (Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/ui/unit/IntRect;Ljava/util/Collection;Ljava/util/List;Ljava/util/Collection;)V - public fun getModifierInfo ()Ljava/util/List; - public final fun getNode ()Ljava/lang/Object; -} - -public final class androidx/compose/ui/tooling/data/ParameterInformation { - public static final field $stable I - public fun (Ljava/lang/String;Ljava/lang/Object;ZZZLjava/lang/String;Z)V - public final fun component1 ()Ljava/lang/String; - public final fun component2 ()Ljava/lang/Object; - public final fun component3 ()Z - public final fun component4 ()Z - public final fun component5 ()Z - public final fun component6 ()Ljava/lang/String; - public final fun component7 ()Z - public final fun copy (Ljava/lang/String;Ljava/lang/Object;ZZZLjava/lang/String;Z)Landroidx/compose/ui/tooling/data/ParameterInformation; - public static synthetic fun copy$default (Landroidx/compose/ui/tooling/data/ParameterInformation;Ljava/lang/String;Ljava/lang/Object;ZZZLjava/lang/String;ZILjava/lang/Object;)Landroidx/compose/ui/tooling/data/ParameterInformation; - public fun equals (Ljava/lang/Object;)Z - public final fun getCompared ()Z - public final fun getFromDefault ()Z - public final fun getInlineClass ()Ljava/lang/String; - public final fun getName ()Ljava/lang/String; - public final fun getStable ()Z - public final fun getStatic ()Z - public final fun getValue ()Ljava/lang/Object; - public fun hashCode ()I - public fun toString ()Ljava/lang/String; -} - -public final class androidx/compose/ui/tooling/data/SlotTreeKt { - public static final fun asTree (Landroidx/compose/runtime/tooling/CompositionData;)Landroidx/compose/ui/tooling/data/Group; - public static final fun findParameters (Landroidx/compose/runtime/tooling/CompositionGroup;Landroidx/compose/ui/tooling/data/ContextCache;)Ljava/util/List; - public static synthetic fun findParameters$default (Landroidx/compose/runtime/tooling/CompositionGroup;Landroidx/compose/ui/tooling/data/ContextCache;ILjava/lang/Object;)Ljava/util/List; - public static final fun getPosition (Landroidx/compose/ui/tooling/data/Group;)Ljava/lang/String; - public static final fun mapTree (Landroidx/compose/runtime/tooling/CompositionData;Lkotlin/jvm/functions/Function3;Landroidx/compose/ui/tooling/data/ContextCache;)Ljava/lang/Object; - public static synthetic fun mapTree$default (Landroidx/compose/runtime/tooling/CompositionData;Lkotlin/jvm/functions/Function3;Landroidx/compose/ui/tooling/data/ContextCache;ILjava/lang/Object;)Ljava/lang/Object; -} - -public abstract interface class androidx/compose/ui/tooling/data/SourceContext { - public abstract fun getBounds ()Landroidx/compose/ui/unit/IntRect; - public abstract fun getDepth ()I - public abstract fun getLocation ()Landroidx/compose/ui/tooling/data/SourceLocation; - public abstract fun getName ()Ljava/lang/String; - public abstract fun getParameters ()Ljava/util/List; - public fun isInline ()Z -} - -public final class androidx/compose/ui/tooling/data/SourceLocation { - public static final field $stable I - public fun (IIILjava/lang/String;I)V - public final fun component1 ()I - public final fun component2 ()I - public final fun component3 ()I - public final fun component4 ()Ljava/lang/String; - public final fun component5 ()I - public final fun copy (IIILjava/lang/String;I)Landroidx/compose/ui/tooling/data/SourceLocation; - public static synthetic fun copy$default (Landroidx/compose/ui/tooling/data/SourceLocation;IIILjava/lang/String;IILjava/lang/Object;)Landroidx/compose/ui/tooling/data/SourceLocation; - public fun equals (Ljava/lang/Object;)Z - public final fun getLength ()I - public final fun getLineNumber ()I - public final fun getOffset ()I - public final fun getPackageHash ()I - public final fun getSourceFile ()Ljava/lang/String; - public fun hashCode ()I - public fun toString ()Ljava/lang/String; -} - -public abstract interface annotation class androidx/compose/ui/tooling/data/UiToolingDataApi : java/lang/annotation/Annotation { -} - diff --git a/compose/ui/ui/api/desktop/ui.api b/compose/ui/ui/api/desktop/ui.api index 5baab9d84eae5..80163b0c12f33 100644 --- a/compose/ui/ui/api/desktop/ui.api +++ b/compose/ui/ui/api/desktop/ui.api @@ -2020,8 +2020,10 @@ public final class androidx/compose/ui/input/mouse/MouseScrollUnit$Page : androi public abstract interface class androidx/compose/ui/input/nestedscroll/NestedScrollConnection { public fun onPostFling-RZ2iAVY (JJLkotlin/coroutines/Continuation;)Ljava/lang/Object; + public static synthetic fun onPostFling-RZ2iAVY$suspendImpl (Landroidx/compose/ui/input/nestedscroll/NestedScrollConnection;JJLkotlin/coroutines/Continuation;)Ljava/lang/Object; public fun onPostScroll-DzOQY0M (JJI)J public fun onPreFling-QWom1Mo (JLkotlin/coroutines/Continuation;)Ljava/lang/Object; + public static synthetic fun onPreFling-QWom1Mo$suspendImpl (Landroidx/compose/ui/input/nestedscroll/NestedScrollConnection;JLkotlin/coroutines/Continuation;)Ljava/lang/Object; public fun onPreScroll-OzD1aCk (JI)J } @@ -2081,7 +2083,9 @@ public abstract interface class androidx/compose/ui/input/pointer/AwaitPointerEv public abstract fun getSize-YbymL2g ()J public abstract fun getViewConfiguration ()Landroidx/compose/ui/platform/ViewConfiguration; public fun withTimeout (JLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public static synthetic fun withTimeout$suspendImpl (Landroidx/compose/ui/input/pointer/AwaitPointerEventScope;JLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public fun withTimeoutOrNull (JLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public static synthetic fun withTimeoutOrNull$suspendImpl (Landroidx/compose/ui/input/pointer/AwaitPointerEventScope;JLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; } public final class androidx/compose/ui/input/pointer/AwaitPointerEventScope$DefaultImpls { diff --git a/navigation/navigation-common/api/desktop/navigation-common.api b/navigation/navigation-common/api/desktop/navigation-common.api index 2b028c77891e5..eca848bec107b 100644 --- a/navigation/navigation-common/api/desktop/navigation-common.api +++ b/navigation/navigation-common/api/desktop/navigation-common.api @@ -413,6 +413,10 @@ public final class androidx/navigation/NavType$Companion { public final fun inferFromValueType (Ljava/lang/Object;)Landroidx/navigation/NavType; } +public final class androidx/navigation/NavTypeKt { + public static final fun parseAndPutFromUri (Landroidx/navigation/NavType;Landroidx/savedstate/SavedState;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object; +} + public abstract class androidx/navigation/NavUri { public fun ()V public abstract fun getFragment ()Ljava/lang/String; diff --git a/navigation/navigation-common/api/navigation-common.klib.api b/navigation/navigation-common/api/navigation-common.klib.api index db8f460d216e2..d19b4ffd92604 100644 --- a/navigation/navigation-common/api/navigation-common.klib.api +++ b/navigation/navigation-common/api/navigation-common.klib.api @@ -598,6 +598,7 @@ final fun <#A: kotlin/Any> (androidx.navigation/NavGraphBuilder).androidx.naviga final fun <#A: kotlin/Any> androidx.navigation.serialization/generateRouteWithArgs(#A, kotlin.collections/Map>): kotlin/String // androidx.navigation.serialization/generateRouteWithArgs|generateRouteWithArgs(0:0;kotlin.collections.Map>){0§}[0] final fun <#A: kotlin/Any> androidx.navigation/navDeepLink(kotlin.reflect/KClass<#A>, kotlin/String, kotlin.collections/Map> = ..., kotlin/Function1): androidx.navigation/NavDeepLink // androidx.navigation/navDeepLink|navDeepLink(kotlin.reflect.KClass<0:0>;kotlin.String;kotlin.collections.Map>;kotlin.Function1){0§}[0] final fun <#A: kotlin/Any?> (androidx.navigation/NavBackStackEntry).androidx.navigation/toRoute(kotlin.reflect/KClass<*>): #A // androidx.navigation/toRoute|toRoute@androidx.navigation.NavBackStackEntry(kotlin.reflect.KClass<*>){0§}[0] +final fun <#A: kotlin/Any?> (androidx.navigation/NavType<#A>).androidx.navigation/parseAndPutFromUri(androidx.savedstate/SavedState, kotlin/String, kotlin/String): #A // androidx.navigation/parseAndPutFromUri|parseAndPutFromUri@androidx.navigation.NavType<0:0>(androidx.savedstate.SavedState;kotlin.String;kotlin.String){0§}[0] final fun <#A: kotlin/Any?> (kotlinx.serialization/KSerializer<#A>).androidx.navigation.serialization/decodeArguments(androidx.lifecycle/SavedStateHandle, kotlin.collections/Map>): #A // androidx.navigation.serialization/decodeArguments|decodeArguments@kotlinx.serialization.KSerializer<0:0>(androidx.lifecycle.SavedStateHandle;kotlin.collections.Map>){0§}[0] final fun <#A: kotlin/Any?> (kotlinx.serialization/KSerializer<#A>).androidx.navigation.serialization/decodeArguments(androidx.savedstate/SavedState, kotlin.collections/Map>): #A // androidx.navigation.serialization/decodeArguments|decodeArguments@kotlinx.serialization.KSerializer<0:0>(androidx.savedstate.SavedState;kotlin.collections.Map>){0§}[0] final fun <#A: kotlin/Any?> (kotlinx.serialization/KSerializer<#A>).androidx.navigation.serialization/generateHashCode(): kotlin/Int // androidx.navigation.serialization/generateHashCode|generateHashCode@kotlinx.serialization.KSerializer<0:0>(){0§}[0] From 6522149d643a805c86127e4f6d4c976565c14d30 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Fri, 5 Dec 2025 21:37:51 +0100 Subject: [PATCH 04/21] fix ui-tooling-data --- compose/ui/ui-tooling-data/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compose/ui/ui-tooling-data/build.gradle b/compose/ui/ui-tooling-data/build.gradle index f0c3cd0ab3985..e90d49c269c9b 100644 --- a/compose/ui/ui-tooling-data/build.gradle +++ b/compose/ui/ui-tooling-data/build.gradle @@ -93,6 +93,10 @@ androidXMultiplatform { implementation(libs.truth) } } + + desktopMain { + dependsOn(jvmMain) + } } } From f16959c29202b4538c9c238e56b55fcc7a75f1a5 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Fri, 5 Dec 2025 21:52:28 +0100 Subject: [PATCH 05/21] fix iosInstrumentedTest --- .../build/AndroidXForkMultiplatformExtensionImpl.kt | 6 +++--- compose/ui/ui/build.gradle | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/AndroidXForkMultiplatformExtensionImpl.kt b/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/AndroidXForkMultiplatformExtensionImpl.kt index 1702296d90472..f06d40ee2f746 100644 --- a/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/AndroidXForkMultiplatformExtensionImpl.kt +++ b/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/AndroidXForkMultiplatformExtensionImpl.kt @@ -204,7 +204,7 @@ abstract class AndroidXForkMultiplatformExtensionImpl @Inject constructor( override fun iosInstrumentedTest() { project.multiplatformExtension!!.run { - val uikitInstrumentedTest = sourceSets.create("uikitInstrumentedTest") + val iosInstrumentedTest = sourceSets.create("iosInstrumentedTest") fun KotlinNativeTargetWithSimulatorTests.configureTestRun() { val testCompilation = compilations.create("instrumentedTest") { @@ -214,7 +214,7 @@ abstract class AndroidXForkMultiplatformExtensionImpl @Inject constructor( } it.associateWith(compilations.getByName("test")) - it.defaultSourceSet.dependsOn(uikitInstrumentedTest) + it.defaultSourceSet.dependsOn(iosInstrumentedTest) } binaries.framework("InstrumentedTest", setOf(DEBUG)) { compilation = testCompilation @@ -228,7 +228,7 @@ abstract class AndroidXForkMultiplatformExtensionImpl @Inject constructor( KotlinNativeTargetWithSimulatorTests::configureTestRun ) testableTargets.getByName( - "iosSimArm64", + "iosSimulatorArm64", KotlinNativeTargetWithSimulatorTests::class, KotlinNativeTargetWithSimulatorTests::configureTestRun ) diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle index c60591accb225..9dab61596c993 100644 --- a/compose/ui/ui/build.gradle +++ b/compose/ui/ui/build.gradle @@ -365,8 +365,7 @@ androidXMultiplatform { } androidXForkMultiplatform { - // TODO(buildsrc): fix iosInstrumentedTest - //iosInstrumentedTest() + iosInstrumentedTest() configureDarwinFlags() } From 1c78969ad72978f185c867716222913e8657d07e Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Fri, 5 Dec 2025 23:09:02 +0100 Subject: [PATCH 06/21] fix api --- compose/foundation/foundation/api/desktop/foundation.api | 9 +-------- compose/ui/ui-text/api/desktop/ui-text.api | 8 -------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/compose/foundation/foundation/api/desktop/foundation.api b/compose/foundation/foundation/api/desktop/foundation.api index e9f40d5f44511..1cc89939e2e4e 100644 --- a/compose/foundation/foundation/api/desktop/foundation.api +++ b/compose/foundation/foundation/api/desktop/foundation.api @@ -720,6 +720,7 @@ public final class androidx/compose/foundation/gestures/TapGestureDetector_skiko public abstract interface class androidx/compose/foundation/gestures/TargetedFlingBehavior : androidx/compose/foundation/gestures/FlingBehavior { public fun performFling (Landroidx/compose/foundation/gestures/ScrollScope;FLkotlin/coroutines/Continuation;)Ljava/lang/Object; public abstract fun performFling (Landroidx/compose/foundation/gestures/ScrollScope;FLkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public static synthetic fun performFling$suspendImpl (Landroidx/compose/foundation/gestures/TargetedFlingBehavior;Landroidx/compose/foundation/gestures/ScrollScope;FLkotlin/coroutines/Continuation;)Ljava/lang/Object; } public final class androidx/compose/foundation/gestures/TransformGestureDetectorKt { @@ -1293,10 +1294,6 @@ public final class androidx/compose/foundation/lazy/layout/LazyLayoutPinnedItemL public synthetic fun add (Ljava/lang/Object;)Z public fun addAll (ILjava/util/Collection;)Z public fun addAll (Ljava/util/Collection;)Z - public fun addFirst (Landroidx/compose/foundation/lazy/layout/LazyLayoutPinnedItemList$PinnedItem;)V - public synthetic fun addFirst (Ljava/lang/Object;)V - public fun addLast (Landroidx/compose/foundation/lazy/layout/LazyLayoutPinnedItemList$PinnedItem;)V - public synthetic fun addLast (Ljava/lang/Object;)V public fun clear ()V public fun contains (Landroidx/compose/foundation/lazy/layout/LazyLayoutPinnedItemList$PinnedItem;)Z public final fun contains (Ljava/lang/Object;)Z @@ -1316,10 +1313,6 @@ public final class androidx/compose/foundation/lazy/layout/LazyLayoutPinnedItemL public synthetic fun remove (I)Ljava/lang/Object; public fun remove (Ljava/lang/Object;)Z public fun removeAll (Ljava/util/Collection;)Z - public fun removeFirst ()Landroidx/compose/foundation/lazy/layout/LazyLayoutPinnedItemList$PinnedItem; - public synthetic fun removeFirst ()Ljava/lang/Object; - public fun removeLast ()Landroidx/compose/foundation/lazy/layout/LazyLayoutPinnedItemList$PinnedItem; - public synthetic fun removeLast ()Ljava/lang/Object; public fun replaceAll (Ljava/util/function/UnaryOperator;)V public fun retainAll (Ljava/util/Collection;)Z public fun set (ILandroidx/compose/foundation/lazy/layout/LazyLayoutPinnedItemList$PinnedItem;)Landroidx/compose/foundation/lazy/layout/LazyLayoutPinnedItemList$PinnedItem; diff --git a/compose/ui/ui-text/api/desktop/ui-text.api b/compose/ui/ui-text/api/desktop/ui-text.api index 24154199c689c..066f8ac944508 100644 --- a/compose/ui/ui-text/api/desktop/ui-text.api +++ b/compose/ui/ui-text/api/desktop/ui-text.api @@ -884,10 +884,6 @@ public final class androidx/compose/ui/text/font/FontListFontFamily : androidx/c public synthetic fun add (Ljava/lang/Object;)Z public fun addAll (ILjava/util/Collection;)Z public fun addAll (Ljava/util/Collection;)Z - public fun addFirst (Landroidx/compose/ui/text/font/Font;)V - public synthetic fun addFirst (Ljava/lang/Object;)V - public fun addLast (Landroidx/compose/ui/text/font/Font;)V - public synthetic fun addLast (Ljava/lang/Object;)V public fun clear ()V public fun contains (Landroidx/compose/ui/text/font/Font;)Z public final fun contains (Ljava/lang/Object;)Z @@ -910,10 +906,6 @@ public final class androidx/compose/ui/text/font/FontListFontFamily : androidx/c public synthetic fun remove (I)Ljava/lang/Object; public fun remove (Ljava/lang/Object;)Z public fun removeAll (Ljava/util/Collection;)Z - public fun removeFirst ()Landroidx/compose/ui/text/font/Font; - public synthetic fun removeFirst ()Ljava/lang/Object; - public fun removeLast ()Landroidx/compose/ui/text/font/Font; - public synthetic fun removeLast ()Ljava/lang/Object; public fun replaceAll (Ljava/util/function/UnaryOperator;)V public fun retainAll (Ljava/util/Collection;)Z public fun set (ILandroidx/compose/ui/text/font/Font;)Landroidx/compose/ui/text/font/Font; From 9f57dc1ed224dbf559f12ba7a08cf3ec64c695fa Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Fri, 5 Dec 2025 23:39:12 +0100 Subject: [PATCH 07/21] fix api --- .../api/desktop/ui-tooling-data.api | 118 ++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 compose/ui/ui-tooling-data/api/desktop/ui-tooling-data.api diff --git a/compose/ui/ui-tooling-data/api/desktop/ui-tooling-data.api b/compose/ui/ui-tooling-data/api/desktop/ui-tooling-data.api new file mode 100644 index 0000000000000..6523b6a4eb85e --- /dev/null +++ b/compose/ui/ui-tooling-data/api/desktop/ui-tooling-data.api @@ -0,0 +1,118 @@ +public final class androidx/compose/ui/tooling/data/CallGroup : androidx/compose/ui/tooling/data/Group { + public static final field $stable I + public fun (Ljava/lang/Object;Ljava/lang/String;Landroidx/compose/ui/unit/IntRect;Landroidx/compose/ui/tooling/data/SourceLocation;Ljava/lang/Object;Ljava/util/List;Ljava/util/Collection;Ljava/util/Collection;Z)V + public fun getParameters ()Ljava/util/List; +} + +public final class androidx/compose/ui/tooling/data/CompositionDataTreeKt { + public static final fun makeTree (Ljava/util/Set;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function3;Landroidx/compose/ui/tooling/data/ContextCache;)Ljava/util/List; + public static synthetic fun makeTree$default (Ljava/util/Set;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function3;Landroidx/compose/ui/tooling/data/ContextCache;ILjava/lang/Object;)Ljava/util/List; +} + +public final class androidx/compose/ui/tooling/data/ContextCache { + public static final field $stable I + public fun ()V + public final fun clear ()V +} + +public abstract class androidx/compose/ui/tooling/data/Group { + public static final field $stable I + public synthetic fun (Ljava/lang/Object;Ljava/lang/String;Landroidx/compose/ui/tooling/data/SourceLocation;Ljava/lang/Object;Landroidx/compose/ui/unit/IntRect;Ljava/util/Collection;Ljava/util/Collection;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun getBox ()Landroidx/compose/ui/unit/IntRect; + public final fun getChildren ()Ljava/util/Collection; + public final fun getData ()Ljava/util/Collection; + public final fun getIdentity ()Ljava/lang/Object; + public final fun getKey ()Ljava/lang/Object; + public final fun getLocation ()Landroidx/compose/ui/tooling/data/SourceLocation; + public fun getModifierInfo ()Ljava/util/List; + public final fun getName ()Ljava/lang/String; + public fun getParameters ()Ljava/util/List; + public final fun isInline ()Z +} + +public final class androidx/compose/ui/tooling/data/JoinedKey { + public static final field $stable I + public fun (Ljava/lang/Object;Ljava/lang/Object;)V + public final fun component1 ()Ljava/lang/Object; + public final fun component2 ()Ljava/lang/Object; + public final fun copy (Ljava/lang/Object;Ljava/lang/Object;)Landroidx/compose/ui/tooling/data/JoinedKey; + public static synthetic fun copy$default (Landroidx/compose/ui/tooling/data/JoinedKey;Ljava/lang/Object;Ljava/lang/Object;ILjava/lang/Object;)Landroidx/compose/ui/tooling/data/JoinedKey; + public fun equals (Ljava/lang/Object;)Z + public final fun getLeft ()Ljava/lang/Object; + public final fun getRight ()Ljava/lang/Object; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class androidx/compose/ui/tooling/data/NodeGroup : androidx/compose/ui/tooling/data/Group { + public static final field $stable I + public fun (Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/ui/unit/IntRect;Ljava/util/Collection;Ljava/util/List;Ljava/util/Collection;)V + public fun getModifierInfo ()Ljava/util/List; + public final fun getNode ()Ljava/lang/Object; +} + +public final class androidx/compose/ui/tooling/data/ParameterInformation { + public static final field $stable I + public fun (Ljava/lang/String;Ljava/lang/Object;ZZZLjava/lang/String;Z)V + public final fun component1 ()Ljava/lang/String; + public final fun component2 ()Ljava/lang/Object; + public final fun component3 ()Z + public final fun component4 ()Z + public final fun component5 ()Z + public final fun component6 ()Ljava/lang/String; + public final fun component7 ()Z + public final fun copy (Ljava/lang/String;Ljava/lang/Object;ZZZLjava/lang/String;Z)Landroidx/compose/ui/tooling/data/ParameterInformation; + public static synthetic fun copy$default (Landroidx/compose/ui/tooling/data/ParameterInformation;Ljava/lang/String;Ljava/lang/Object;ZZZLjava/lang/String;ZILjava/lang/Object;)Landroidx/compose/ui/tooling/data/ParameterInformation; + public fun equals (Ljava/lang/Object;)Z + public final fun getCompared ()Z + public final fun getFromDefault ()Z + public final fun getInlineClass ()Ljava/lang/String; + public final fun getName ()Ljava/lang/String; + public final fun getStable ()Z + public final fun getStatic ()Z + public final fun getValue ()Ljava/lang/Object; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class androidx/compose/ui/tooling/data/SlotTreeKt { + public static final fun asTree (Landroidx/compose/runtime/tooling/CompositionData;)Landroidx/compose/ui/tooling/data/Group; + public static final fun findParameters (Landroidx/compose/runtime/tooling/CompositionGroup;Landroidx/compose/ui/tooling/data/ContextCache;)Ljava/util/List; + public static synthetic fun findParameters$default (Landroidx/compose/runtime/tooling/CompositionGroup;Landroidx/compose/ui/tooling/data/ContextCache;ILjava/lang/Object;)Ljava/util/List; + public static final fun getPosition (Landroidx/compose/ui/tooling/data/Group;)Ljava/lang/String; + public static final fun mapTree (Landroidx/compose/runtime/tooling/CompositionData;Lkotlin/jvm/functions/Function3;Landroidx/compose/ui/tooling/data/ContextCache;)Ljava/lang/Object; + public static synthetic fun mapTree$default (Landroidx/compose/runtime/tooling/CompositionData;Lkotlin/jvm/functions/Function3;Landroidx/compose/ui/tooling/data/ContextCache;ILjava/lang/Object;)Ljava/lang/Object; +} + +public abstract interface class androidx/compose/ui/tooling/data/SourceContext { + public abstract fun getBounds ()Landroidx/compose/ui/unit/IntRect; + public abstract fun getDepth ()I + public abstract fun getLocation ()Landroidx/compose/ui/tooling/data/SourceLocation; + public abstract fun getName ()Ljava/lang/String; + public abstract fun getParameters ()Ljava/util/List; + public fun isInline ()Z +} + +public final class androidx/compose/ui/tooling/data/SourceLocation { + public static final field $stable I + public fun (IIILjava/lang/String;I)V + public final fun component1 ()I + public final fun component2 ()I + public final fun component3 ()I + public final fun component4 ()Ljava/lang/String; + public final fun component5 ()I + public final fun copy (IIILjava/lang/String;I)Landroidx/compose/ui/tooling/data/SourceLocation; + public static synthetic fun copy$default (Landroidx/compose/ui/tooling/data/SourceLocation;IIILjava/lang/String;IILjava/lang/Object;)Landroidx/compose/ui/tooling/data/SourceLocation; + public fun equals (Ljava/lang/Object;)Z + public final fun getLength ()I + public final fun getLineNumber ()I + public final fun getOffset ()I + public final fun getPackageHash ()I + public final fun getSourceFile ()Ljava/lang/String; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public abstract interface annotation class androidx/compose/ui/tooling/data/UiToolingDataApi : java/lang/annotation/Annotation { +} + From 51c14b15b0704ac70bfd6a72ac1153fbfa55b1fe Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Sat, 6 Dec 2025 00:10:03 +0100 Subject: [PATCH 08/21] fix java.lang.OutOfMemoryError: Metaspace on jbApiDump --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e1901ced6e305..99e25cee0230a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.jvmargs=-Xmx12g \ -XX:+HeapDumpOnOutOfMemoryError \ -XX:+UseParallelGC \ - -XX:MaxMetaspaceSize=1g \ + -XX:MaxMetaspaceSize=2g \ -Dkotlin.daemon.jvm.options=-XX:MaxMetaspaceSize=1g \ -Dlint.nullness.ignore-deprecated=true \ -Dfile.encoding=UTF-8 From 9af2912b98901477d08c43b62e07b6124566ac7b Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Sat, 6 Dec 2025 01:12:32 +0100 Subject: [PATCH 09/21] restore desktopHeadlessTest --- compose/ui/ui/build.gradle | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle index 9dab61596c993..3686207d5e325 100644 --- a/compose/ui/ui/build.gradle +++ b/compose/ui/ui/build.gradle @@ -545,4 +545,21 @@ tasks.register("updateTranslationsIos", UpdateTranslationsTask.class) { tasks.findByName("desktopTest").configure { systemProperties["GOLDEN_PATH"] = project.rootDir.absolutePath + "/golden" +} + +tasks.register("desktopHeadlessTest", Test) { + testClassesDirs = sourceSets.desktopTest.output.classesDirs + classpath = sourceSets.desktopTest.runtimeClasspath + + useJUnit { + includeCategories("androidx.compose.ui.HeadlessTest") + } + systemProperty("java.awt.headless", "true") +} + +tasks.desktopTest { + useJUnit { + excludeCategories("androidx.compose.ui.HeadlessTest") + } + finalizedBy("desktopHeadlessTest") } \ No newline at end of file From 416c8c0bf63f75f676d9ba1319516faddf33cc8c Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 8 Dec 2025 03:42:08 +0100 Subject: [PATCH 10/21] Temporary fix web tests --- .../build/AndroidXMultiplatformExtension.kt | 15 +++++++++++++-- .../AndroidXForkMultiplatformExtensionImpl.kt | 3 +++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXMultiplatformExtension.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXMultiplatformExtension.kt index 486018ed5cc80..6df59287f4dde 100644 --- a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXMultiplatformExtension.kt +++ b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXMultiplatformExtension.kt @@ -737,8 +737,19 @@ abstract class AndroidXMultiplatformExtension(val project: Project) { browser { testTask { it.useKarma { - useChromeHeadless() - useConfigDirectory(File(getSupportRootFolder(), "buildSrc/karmaconfig")) + // TODO(buildSrc) temporary + useChrome() + useFirefox() + useSafari() + useConfigDirectory( + project.rootProject.projectDir.resolve( + if (platform == PlatformIdentifier.JS) { + "mpp/karma.config.d/js" + } else { + "mpp/karma.config.d/wasm" + } + ) + ) } } } diff --git a/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/AndroidXForkMultiplatformExtensionImpl.kt b/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/AndroidXForkMultiplatformExtensionImpl.kt index f06d40ee2f746..102a0e7254266 100644 --- a/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/AndroidXForkMultiplatformExtensionImpl.kt +++ b/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/AndroidXForkMultiplatformExtensionImpl.kt @@ -16,6 +16,7 @@ package org.jetbrains.androidx.build +import androidx.build.AndroidXMultiplatformExtension import androidx.build.multiplatformExtension import javax.inject.Inject import org.gradle.api.Project @@ -161,6 +162,8 @@ fun Project.configureTargetsForComposeMultiplatform() { abstract class AndroidXForkMultiplatformExtensionImpl @Inject constructor( private val project: Project ) : AndroidXForkMultiplatformExtension { + private val androidxMultiplatformExtension by lazy { project.extensions.findByType(AndroidXMultiplatformExtension::class.java) } + override fun configureDarwinFlags() { val darwinFlags = listOf( "-linker-option", "-framework", "-linker-option", "Metal", From 621f90aa218c9308fd74b11dee205d0b596f2430 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 8 Dec 2025 03:47:42 +0100 Subject: [PATCH 11/21] Fix ios tests --- .../build/AndroidXForkMultiplatformExtensionImpl.kt | 1 + compose/ui/ui/build.gradle | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/AndroidXForkMultiplatformExtensionImpl.kt b/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/AndroidXForkMultiplatformExtensionImpl.kt index 102a0e7254266..f04751bfa4d6a 100644 --- a/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/AndroidXForkMultiplatformExtensionImpl.kt +++ b/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/AndroidXForkMultiplatformExtensionImpl.kt @@ -208,6 +208,7 @@ abstract class AndroidXForkMultiplatformExtensionImpl @Inject constructor( override fun iosInstrumentedTest() { project.multiplatformExtension!!.run { val iosInstrumentedTest = sourceSets.create("iosInstrumentedTest") + iosInstrumentedTest.kotlin.srcDir("src/uikitInstrumentedTest/kotlin") fun KotlinNativeTargetWithSimulatorTests.configureTestRun() { val testCompilation = compilations.create("instrumentedTest") { diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle index 3686207d5e325..e1d0ee3003df9 100644 --- a/compose/ui/ui/build.gradle +++ b/compose/ui/ui/build.gradle @@ -301,11 +301,12 @@ androidXMultiplatform { dependsOn(nativeTest) } - uikitInstrumentedTest { - dependencies { - implementation(project(":compose:material:material")) - implementation(project(":compose:foundation:foundation")) - } + iosInstrumentedTest.dependencies { + implementation(project(":compose:material:material")) + implementation(project(":compose:material3:material3")) + implementation(project(":compose:foundation:foundation")) + implementation(project(":compose:ui:ui-test-junit4")) + implementation(project(":internal-testutils-xctest")) } webMain { From 41fded5759e75499b902e65d0da42ad8c767cc3d Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 8 Dec 2025 03:52:47 +0100 Subject: [PATCH 12/21] Fix ios tests --- settings.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/settings.gradle b/settings.gradle index 9ead9e36d5e8c..0fcb8e03a95d7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1333,6 +1333,7 @@ includeProject(":internal-testutils-gradle-plugin", "testutils/testutils-gradle- includeProject(":internal-testutils-mockito", "testutils/testutils-mockito", [BuildType.MAIN, BuildType.MEDIA, BuildType.FLAN, BuildType.COMPOSE]) includeProject(":internal-testutils-lifecycle", "testutils/testutils-lifecycle", [BuildType.MAIN, BuildType.COMPOSE, BuildType.FLAN, BuildType.KMP]) includeProject(":internal-testutils-appfunctions", "testutils/testutils-appfunctions", [BuildType.MAIN]) +includeProject(":internal-testutils-xctest", "testutils/testutils-xctest") includeProject(":kruth:kruth", [BuildType.MAIN, BuildType.INFRAROGUE, BuildType.KMP, BuildType.COMPOSE]) ///////////////////////////// From e4756090867578447a9bc5e9fb51d23ddf8415da Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 8 Dec 2025 04:00:34 +0100 Subject: [PATCH 13/21] Fix ios tests --- compose/ui/ui/build.gradle | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle index e1d0ee3003df9..4468f37928e4f 100644 --- a/compose/ui/ui/build.gradle +++ b/compose/ui/ui/build.gradle @@ -66,7 +66,14 @@ androidXMultiplatform { wasmJs() defaultPlatform(PlatformIdentifier.ANDROID) +} + +androidXForkMultiplatform { + iosInstrumentedTest() + configureDarwinFlags() +} +androidXMultiplatform { sourceSets { commonMain { dependencies { @@ -365,11 +372,6 @@ androidXMultiplatform { } } -androidXForkMultiplatform { - iosInstrumentedTest() - configureDarwinFlags() -} - dependencies { constraints { From 21ad20a9959c8d352d0d18927d61c56c2bc68820 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 8 Dec 2025 04:22:34 +0100 Subject: [PATCH 14/21] Fix web tests --- navigation/navigation-runtime/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/navigation/navigation-runtime/build.gradle b/navigation/navigation-runtime/build.gradle index 6d0fc6ce79cb1..dbbfc482b1ac7 100644 --- a/navigation/navigation-runtime/build.gradle +++ b/navigation/navigation-runtime/build.gradle @@ -79,6 +79,11 @@ androidXMultiplatform { nonAndroidTest { dependsOn(commonTest) + dependencies { + implementation(project(":kruth:kruth")) + implementation(project(":navigation:navigation-testing")) + implementation(project(":internal-testutils-navigation")) + } } jvmMain { From 143384803d6d85ca1a6632a35c3dd1c0f56595cf Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 8 Dec 2025 10:44:40 +0100 Subject: [PATCH 15/21] Fix webTest --- navigation/navigation-runtime/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/navigation/navigation-runtime/build.gradle b/navigation/navigation-runtime/build.gradle index dbbfc482b1ac7..0085580862985 100644 --- a/navigation/navigation-runtime/build.gradle +++ b/navigation/navigation-runtime/build.gradle @@ -80,6 +80,7 @@ androidXMultiplatform { nonAndroidTest { dependsOn(commonTest) dependencies { + implementation(libs.kotlinCoroutinesTest) implementation(project(":kruth:kruth")) implementation(project(":navigation:navigation-testing")) implementation(project(":internal-testutils-navigation")) From b294249d1c7e41f372f268e886822da534c155c2 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 8 Dec 2025 11:19:28 +0100 Subject: [PATCH 16/21] Target KOTLIN_2_2 as in jb-main - fixes web tests "Name contains illegal chars that cannot appear in JavaScript identifier." - potentially another things --- .../src/main/kotlin/androidx/build/AndroidXConfiguration.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/public/src/main/kotlin/androidx/build/AndroidXConfiguration.kt b/buildSrc/public/src/main/kotlin/androidx/build/AndroidXConfiguration.kt index c666ca828d7a0..023ecfa62a168 100644 --- a/buildSrc/public/src/main/kotlin/androidx/build/AndroidXConfiguration.kt +++ b/buildSrc/public/src/main/kotlin/androidx/build/AndroidXConfiguration.kt @@ -41,7 +41,7 @@ enum class KotlinTarget(val apiVersion: KotlinVersion, val catalogVersion: Strin KOTLIN_2_0(KotlinVersion.KOTLIN_2_0, "kotlin20"), KOTLIN_2_1(KotlinVersion.KOTLIN_2_1, "kotlin21"), KOTLIN_2_2(KotlinVersion.KOTLIN_2_2, "kotlin22"), - DEFAULT(KOTLIN_2_0), + DEFAULT(KOTLIN_2_2), LATEST(KOTLIN_2_2); constructor( From abc37443c80adfc0e43a49337b24942585548102 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 8 Dec 2025 11:47:14 +0100 Subject: [PATCH 17/21] Fix org.gradle.api.tasks.TaskExecutionException: Execution failed for task ':kotlinStoreYarnLock' --- .../jetbrains/androidx/build/JetBrainsAndroidXRootImplPlugin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsAndroidXRootImplPlugin.kt b/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsAndroidXRootImplPlugin.kt index 2e1461e603c4a..abc78f24163a2 100644 --- a/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsAndroidXRootImplPlugin.kt +++ b/buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsAndroidXRootImplPlugin.kt @@ -31,7 +31,7 @@ class JetBrainsAndroidXRootImplPlugin @Inject constructor( val componentFactory: SoftwareComponentFactory ) : Plugin { override fun apply(project: Project) { - project.subprojects { subproject -> + project.allprojects { subproject -> subproject.tasks.configureEach { if (it.name == "kotlinStoreYarnLock") it.enabled = false if (it.name == "kotlinWasmStoreYarnLock") it.enabled = false From 88a5757f608189186cb979cffd8e567091f6cff9 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 8 Dec 2025 12:17:55 +0100 Subject: [PATCH 18/21] Fix Android compilation --- .../androidx/testutils/TestNavigator.kt | 14 +++++++------- .../testutils/TestNavigatorDestinationBuilder.kt | 4 ++-- .../androidx/testutils/TestNavigatorProvider.kt | 0 3 files changed, 9 insertions(+), 9 deletions(-) rename testutils/testutils-navigation/src/androidMain/{java => kotlin}/androidx/testutils/TestNavigator.kt (81%) rename testutils/testutils-navigation/src/androidMain/{java => kotlin}/androidx/testutils/TestNavigatorDestinationBuilder.kt (93%) rename testutils/testutils-navigation/src/androidMain/{java => kotlin}/androidx/testutils/TestNavigatorProvider.kt (100%) diff --git a/testutils/testutils-navigation/src/androidMain/java/androidx/testutils/TestNavigator.kt b/testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigator.kt similarity index 81% rename from testutils/testutils-navigation/src/androidMain/java/androidx/testutils/TestNavigator.kt rename to testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigator.kt index 60f3a233c8955..b238dd8e41720 100644 --- a/testutils/testutils-navigation/src/androidMain/java/androidx/testutils/TestNavigator.kt +++ b/testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigator.kt @@ -23,20 +23,20 @@ import androidx.navigation.Navigator /** A simple Navigator that doesn't actually navigate anywhere, but does dispatch correctly */ @Navigator.Name("test") -open class TestNavigator(private val hasTransitions: Boolean = false) : +actual open class TestNavigator actual constructor(private val hasTransitions: Boolean) : Navigator() { - val backStack: List + actual val backStack: List get() = state.backStack.value - val current: NavBackStackEntry + actual val current: NavBackStackEntry get() = backStack.lastOrNull() ?: throw IllegalStateException("Nothing on the back stack") - fun popCurrent() { + actual fun popCurrent() { state.pop(current, false) } - override fun createDestination(): Destination { + actual override fun createDestination(): Destination { return Destination(this) } @@ -62,11 +62,11 @@ open class TestNavigator(private val hasTransitions: Boolean = false) : } } - public fun onTransitionComplete(entry: NavBackStackEntry) { + public actual fun onTransitionComplete(entry: NavBackStackEntry) { state.markTransitionComplete(entry) } /** A simple Test destination */ - open class Destination constructor(navigator: Navigator) : + actual open class Destination actual constructor(navigator: Navigator) : NavDestination(navigator) } diff --git a/testutils/testutils-navigation/src/androidMain/java/androidx/testutils/TestNavigatorDestinationBuilder.kt b/testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigatorDestinationBuilder.kt similarity index 93% rename from testutils/testutils-navigation/src/androidMain/java/androidx/testutils/TestNavigatorDestinationBuilder.kt rename to testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigatorDestinationBuilder.kt index 49b6d1b77c1b8..17968651501dc 100644 --- a/testutils/testutils-navigation/src/androidMain/java/androidx/testutils/TestNavigatorDestinationBuilder.kt +++ b/testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigatorDestinationBuilder.kt @@ -65,11 +65,11 @@ inline fun NavGraphBuilder.test( /** DSL for constructing a new [TestNavigator.Destination] */ @NavDestinationDsl -class TestNavigatorDestinationBuilder : NavDestinationBuilder { +actual class TestNavigatorDestinationBuilder : NavDestinationBuilder { @Suppress("DEPRECATION") constructor(navigator: TestNavigator, @IdRes id: Int = 0) : super(navigator, id) - constructor(navigator: TestNavigator, route: String) : super(navigator, route) + actual constructor(navigator: TestNavigator, route: String) : super(navigator, route) constructor( navigator: TestNavigator, diff --git a/testutils/testutils-navigation/src/androidMain/java/androidx/testutils/TestNavigatorProvider.kt b/testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigatorProvider.kt similarity index 100% rename from testutils/testutils-navigation/src/androidMain/java/androidx/testutils/TestNavigatorProvider.kt rename to testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigatorProvider.kt From 4cf361b7e287a556b0a13165816e4712b7c03366 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 8 Dec 2025 12:43:30 +0100 Subject: [PATCH 19/21] Fix ios compilation --- settings.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 0fcb8e03a95d7..b0ec0596496cc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -86,7 +86,8 @@ getGradle().beforeProject { project -> project.ext.supportRootFolder = supportRootFolder project.ext.prebuiltsRoot = prebuiltsRoot def checkoutRoot = new File("${buildscript.sourceFile.parent}") - init.chooseBuildDirectory(checkoutRoot, rootProject.name, project) + // TODO(buildSrc) "androidx" required for ios instrumented tests, because it is hardcoded + init.chooseBuildDirectory(checkoutRoot, "androidx", project) /* Could not set unknown property 'kotlin.project.persistent.dir' for project ':buildSrc' of type org.gradle.api.Project. From dff5f6d624aa86c45d1204f010935263b819ff15 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 8 Dec 2025 16:03:34 +0100 Subject: [PATCH 20/21] Fix Android compilation --- .../testutils/TestNavigatorDestinationBuilder.kt | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigatorDestinationBuilder.kt b/testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigatorDestinationBuilder.kt index 17968651501dc..4c86551ba2519 100644 --- a/testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigatorDestinationBuilder.kt +++ b/testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigatorDestinationBuilder.kt @@ -30,9 +30,6 @@ import kotlin.reflect.KType /** Construct a new [TestNavigator.Destination] */ inline fun NavGraphBuilder.test(@IdRes id: Int) = test(id) {} -/** Construct a new [TestNavigator.Destination] */ -inline fun NavGraphBuilder.test(route: String) = test(route) {} - /** Construct a new [TestNavigator.Destination] */ inline fun NavGraphBuilder.test(typeMap: Map> = emptyMap()) = test(typeMap) {} @@ -44,15 +41,6 @@ inline fun NavGraphBuilder.test( builder: TestNavigatorDestinationBuilder.() -> Unit, ) = destination(TestNavigatorDestinationBuilder(provider[TestNavigator::class], id).apply(builder)) -/** Construct a new [TestNavigator.Destination] */ -inline fun NavGraphBuilder.test( - route: String, - builder: TestNavigatorDestinationBuilder.() -> Unit, -) = - destination( - TestNavigatorDestinationBuilder(provider[TestNavigator::class], route).apply(builder) - ) - /** Construct a new [TestNavigator.Destination] */ inline fun NavGraphBuilder.test( typeMap: Map> = emptyMap(), From ace2c79600ab9940fd2c42d44746215ffb141cfd Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 8 Dec 2025 16:04:46 +0100 Subject: [PATCH 21/21] Fix Android compilation --- .../testutils/{TestNavigator.kt => TestNavigator.android.kt} | 0 ...ationBuilder.kt => TestNavigatorDestinationBuilder.android.kt} | 0 ...{TestNavigatorProvider.kt => TestNavigatorProvider.android.kt} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/{TestNavigator.kt => TestNavigator.android.kt} (100%) rename testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/{TestNavigatorDestinationBuilder.kt => TestNavigatorDestinationBuilder.android.kt} (100%) rename testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/{TestNavigatorProvider.kt => TestNavigatorProvider.android.kt} (100%) diff --git a/testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigator.kt b/testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigator.android.kt similarity index 100% rename from testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigator.kt rename to testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigator.android.kt diff --git a/testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigatorDestinationBuilder.kt b/testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigatorDestinationBuilder.android.kt similarity index 100% rename from testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigatorDestinationBuilder.kt rename to testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigatorDestinationBuilder.android.kt diff --git a/testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigatorProvider.kt b/testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigatorProvider.android.kt similarity index 100% rename from testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigatorProvider.kt rename to testutils/testutils-navigation/src/androidMain/kotlin/androidx/testutils/TestNavigatorProvider.android.kt