Pin versions for 1.10.0-beta02 (#2566)

MatkovIvan · web-flow · commit 4c05dc62f320 · 2025-11-11T15:56:26.000+01:00
- Bumped lifecycle/savedstate pins to the latest patch to resolve
possible redirect issues
- Pin Compose in material3 to make it compatible with Compose
Multiplatform 1.9.x
- Use direct references to androidx annotation/collection in pins since
our wrappers will be in transitive dependencies anyway, so KT-60874 is
not the case here

## Release Notes
N/A
diff --git a/compose/material3/material3-adaptive-navigation-suite/build.gradle b/compose/material3/material3-adaptive-navigation-suite/build.gradle
@@ -50,10 +50,10 @@ kotlin {
             dependencies {
                 implementation(libs.kotlinStdlib)
                 implementation(project(":compose:material3:material3"))
-                implementation(project(":compose:material3:adaptive:adaptive"))
-                implementation(project(":compose:ui:ui"))
-                implementation(project(":window:window-core"))
-                api(project(":annotation:annotation"))
+                implementation("org.jetbrains.compose.material3.adaptive:adaptive:1.2.0")
+                implementation("org.jetbrains.compose.ui:ui:1.9.3")
+                implementation("org.jetbrains.androidx.window:window-core:1.4.0")
+                api("androidx.annotation:annotation:1.9.1")
             }
         }
 
diff --git a/compose/material3/material3-window-size-class/build.gradle b/compose/material3/material3-window-size-class/build.gradle
@@ -41,10 +41,10 @@ kotlin {
         commonMain {
             dependencies {
                 implementation(libs.kotlinStdlib)
-                implementation(project(":compose:ui:ui-util"))
-                api(project(":compose:runtime:runtime"))
-                api(project(":compose:ui:ui"))
-                api(project(":compose:ui:ui-unit"))
+                implementation("org.jetbrains.compose.ui:ui-util:1.9.3")
+                api("org.jetbrains.compose.runtime:runtime:1.9.3")
+                api("org.jetbrains.compose.ui:ui:1.9.3")
+                api("org.jetbrains.compose.ui:ui-unit:1.9.3")
             }
         }
 
diff --git a/compose/material3/material3/build.gradle b/compose/material3/material3/build.gradle
@@ -98,20 +98,20 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
         sourceSets {
             commonMain.dependencies {
                 implementation(libs.kotlinStdlib)
-                implementation(project(":compose:animation:animation-core"))
-
-                api(project(":compose:foundation:foundation"))
-                api(project(":compose:material:material-ripple"))
-                api(project(":compose:runtime:runtime"))
-                api(project(":compose:ui:ui-graphics"))
-                api(project(":compose:ui:ui-text"))
-                api("androidx.graphics:graphics-shapes:1.1.0-beta01")
-
-                implementation(project(":compose:ui:ui-util"))
-                implementation(project(":compose:ui:ui-backhandler"))
-                implementation(project(":compose:foundation:foundation-layout"))
-                implementation(project(":annotation:annotation"))
-                implementation(project(":collection:collection"))
+                implementation("org.jetbrains.compose.animation:animation-core:1.9.3")
+
+                api("org.jetbrains.compose.foundation:foundation:1.9.3")
+                api("org.jetbrains.compose.material:material-ripple:1.9.3")
+                api("org.jetbrains.compose.runtime:runtime:1.9.3")
+                api("org.jetbrains.compose.ui:ui-graphics:1.9.3")
+                api("org.jetbrains.compose.ui:ui-text:1.9.3")
+                api("androidx.graphics:graphics-shapes:1.1.0")
+
+                implementation("org.jetbrains.compose.ui:ui-util:1.9.3")
+                implementation("org.jetbrains.compose.ui:ui-backhandler:1.9.3")
+                implementation("org.jetbrains.compose.foundation:foundation-layout:1.9.3")
+                implementation("androidx.annotation:annotation:1.9.1")
+                implementation("androidx.collection:collection:1.5.0")
             }
 
             androidMain.dependencies {
@@ -183,6 +183,10 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
 
             skikoTest.dependencies {
                 implementation(libs.kotlinTest)
+                // Test against project dependencies
+                implementation(project(":compose:foundation:foundation"))
+                implementation(project(":compose:ui:ui"))
+                implementation(project(":compose:runtime:runtime"))
                 implementation(project(":compose:ui:ui-test"))
                 def navigationEventVersion = project.findProperty('artifactRedirection.version.androidx.navigationevent')
                 implementation("androidx.navigationevent:navigationevent-testing:$navigationEventVersion")
diff --git a/compose/runtime/runtime-saveable-compatibility-stub/build.gradle b/compose/runtime/runtime-saveable-compatibility-stub/build.gradle
@@ -60,8 +60,8 @@ kotlin {
                 // Keep direct references to fork versions to correctly resolve
                 // New redirections to Google's artifacts
                 api(project(":compose:runtime:runtime"))
-                implementation("org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.5")
-                api("org.jetbrains.androidx.savedstate:savedstate-compose:1.3.5")
+                implementation("org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.6")
+                api("org.jetbrains.androidx.savedstate:savedstate-compose:1.3.6")
             }
         }
     }
diff --git a/compose/runtime/runtime-saveable/build.gradle b/compose/runtime/runtime-saveable/build.gradle
@@ -95,9 +95,9 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
             commonMain.dependencies {
                 implementation(libs.kotlinStdlib)
                 implementation(project(":collection:collection"))
-                implementation("org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.5")
+                implementation("org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.6")
                 api(project(":compose:runtime:runtime"))
-                api("org.jetbrains.androidx.savedstate:savedstate-compose:1.3.5")
+                api("org.jetbrains.androidx.savedstate:savedstate-compose:1.3.6")
             }
 
             androidMain.dependencies {
diff --git a/compose/ui/ui-test/build.gradle b/compose/ui/ui-test/build.gradle
@@ -153,9 +153,9 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
 
                     // Required to properly resolve supertypes of DefaultArchitectureComponentsOwner
                     // Keep in sync with :ui:ui module
-                    implementation("org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.5")
-                    implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.5")
-                    implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.5")
+                    implementation("org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.6")
+                    implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.6")
+                    implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.6")
 
                     // Use direct dependency to AOSP's artifact instead of using project reference
                     // because this module supports all KMP platforms from the beginning
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle
@@ -175,11 +175,11 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
                 api project(":compose:ui:ui-text")
                 api project(":compose:ui:ui-unit")
                 api project(":compose:ui:ui-util")
-                api("org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.5")
-                implementation("org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.5")
-                implementation("org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.5")
-                implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.5")
-                implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.5")
+                api("org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.6")
+                implementation("org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.6")
+                implementation("org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.6")
+                implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.6")
+                implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.6")
             }
 
             androidMain.dependencies {
diff --git a/lifecycle/lifecycle-runtime-compose-compatibility-stub/build.gradle b/lifecycle/lifecycle-runtime-compose-compatibility-stub/build.gradle
@@ -65,7 +65,7 @@ kotlin {
                 // New redirections to Google's artifacts
                 implementation(project(":lifecycle:lifecycle-common"))
                 api(project(":lifecycle:lifecycle-runtime"))
-                api(project(":compose:runtime:runtime"))
+                api("org.jetbrains.compose.runtime:runtime:1.9.3")
             }
         }
     }
diff --git a/lifecycle/lifecycle-runtime-compose/build.gradle b/lifecycle/lifecycle-runtime-compose/build.gradle
@@ -61,8 +61,8 @@ kotlin {
             dependencies {
                 api(project(":annotation:annotation"))
                 implementation(project(":lifecycle:lifecycle-common"))
-                api project(":lifecycle:lifecycle-runtime")
-                api project(":compose:runtime:runtime")
+                api(project(":lifecycle:lifecycle-runtime"))
+                api("org.jetbrains.compose.runtime:runtime:1.9.3")
 
                 implementation(libs.kotlinStdlib)
             }
diff --git a/lifecycle/lifecycle-viewmodel-navigation3/build.gradle b/lifecycle/lifecycle-viewmodel-navigation3/build.gradle
@@ -53,8 +53,8 @@ kotlin {
                 api(project(":lifecycle:lifecycle-viewmodel-compose"))
                 def lifecycleVersion = project.findProperty('artifactRedirection.version.androidx.lifecycle')
                 api("androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycleVersion")
-                api("org.jetbrains.compose.runtime:runtime:1.9.1")
-                api("org.jetbrains.compose.runtime:runtime-saveable:1.9.1")
+                api("org.jetbrains.compose.runtime:runtime:1.9.3")
+                api("org.jetbrains.compose.runtime:runtime-saveable:1.9.3")
                 def navigation3Version = project.findProperty('artifactRedirection.version.androidx.navigation3')
                 api("androidx.navigation3:navigation3-runtime:$navigation3Version")
                 def savedstateVersion = project.findProperty('artifactRedirection.version.androidx.savedstate')
diff --git a/lifecycle/lifecycle-viewmodel-savedstate-compatibility-stub/build.gradle b/lifecycle/lifecycle-viewmodel-savedstate-compatibility-stub/build.gradle
@@ -50,7 +50,7 @@ androidXMultiplatform {
 
                 // Keep direct references to fork versions to correctly resolve
                 // New redirections to Google's artifacts
-                api("org.jetbrains.androidx.savedstate:savedstate:1.3.5")
+                api("org.jetbrains.androidx.savedstate:savedstate:1.3.6")
                 implementation(project(":lifecycle:lifecycle-common"))
                 api(project(":lifecycle:lifecycle-viewmodel"))
             }
diff --git a/savedstate/savedstate-compatibility-stub/build.gradle b/savedstate/savedstate-compatibility-stub/build.gradle
@@ -34,7 +34,7 @@ androidXMultiplatform {
 
                 // Keep direct references to fork versions to correctly resolve
                 // New redirections to Google's artifacts
-                implementation("org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.5")
+                implementation("org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.6")
             }
         }
     }
diff --git a/savedstate/savedstate-compose-compatibility-stub/build.gradle b/savedstate/savedstate-compose-compatibility-stub/build.gradle
@@ -64,7 +64,7 @@ kotlin {
                 // Keep direct references to fork versions to correctly resolve
                 // New redirections to Google's artifacts
                 api(project(":savedstate:savedstate"))
-                api("org.jetbrains.compose.runtime:runtime:1.9.1")
+                api("org.jetbrains.compose.runtime:runtime:1.9.3")
             }
         }
     }
diff --git a/savedstate/savedstate-compose/build.gradle b/savedstate/savedstate-compose/build.gradle
@@ -61,7 +61,7 @@ kotlin {
         commonMain {
             dependencies {
                 api(project(":savedstate:savedstate"))
-                api("org.jetbrains.compose.runtime:runtime:1.9.1")
+                api("org.jetbrains.compose.runtime:runtime:1.9.3")
             }
         }
 
diff --git a/savedstate/savedstate/build.gradle b/savedstate/savedstate/build.gradle
@@ -34,7 +34,7 @@ androidXMultiplatform {
             dependencies {
                 api(libs.kotlinStdlib)
                 api(project(":annotation:annotation"))
-                implementation("org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.5")
+                implementation("org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.6")
                 api(libs.kotlinCoroutinesCore)
                 api(libs.kotlinSerializationCore)
             }

Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,10 @@ kotlin {`
`50`	`50`	`dependencies {`
`51`	`51`	`implementation(libs.kotlinStdlib)`
`52`	`52`	`implementation(project(":compose:material3:material3"))`
`53`		`- implementation(project(":compose:material3:adaptive:adaptive"))`
`54`		`- implementation(project(":compose:ui:ui"))`
`55`		`- implementation(project(":window:window-core"))`
`56`		`- api(project(":annotation:annotation"))`
	`53`	`+ implementation("org.jetbrains.compose.material3.adaptive:adaptive:1.2.0")`
	`54`	`+ implementation("org.jetbrains.compose.ui:ui:1.9.3")`
	`55`	`+ implementation("org.jetbrains.androidx.window:window-core:1.4.0")`
	`56`	`+ api("androidx.annotation:annotation:1.9.1")`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,10 @@ kotlin {`
`41`	`41`	`commonMain {`
`42`	`42`	`dependencies {`
`43`	`43`	`implementation(libs.kotlinStdlib)`
`44`		`- implementation(project(":compose:ui:ui-util"))`
`45`		`- api(project(":compose:runtime:runtime"))`
`46`		`- api(project(":compose:ui:ui"))`
`47`		`- api(project(":compose:ui:ui-unit"))`
	`44`	`+ implementation("org.jetbrains.compose.ui:ui-util:1.9.3")`
	`45`	`+ api("org.jetbrains.compose.runtime:runtime:1.9.3")`
	`46`	`+ api("org.jetbrains.compose.ui:ui:1.9.3")`
	`47`	`+ api("org.jetbrains.compose.ui:ui-unit:1.9.3")`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,8 @@ kotlin {`
`60`	`60`	`// Keep direct references to fork versions to correctly resolve`
`61`	`61`	`// New redirections to Google's artifacts`
`62`	`62`	`api(project(":compose:runtime:runtime"))`
`63`		`- implementation("org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.5")`
`64`		`- api("org.jetbrains.androidx.savedstate:savedstate-compose:1.3.5")`
	`63`	`+ implementation("org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.6")`
	`64`	`+ api("org.jetbrains.androidx.savedstate:savedstate-compose:1.3.6")`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ kotlin {`
`65`	`65`	`// New redirections to Google's artifacts`
`66`	`66`	`implementation(project(":lifecycle:lifecycle-common"))`
`67`	`67`	`api(project(":lifecycle:lifecycle-runtime"))`
`68`		`- api(project(":compose:runtime:runtime"))`
	`68`	`+ api("org.jetbrains.compose.runtime:runtime:1.9.3")`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`}`