Add direct references to fork modules in stubs (#2371)

sekater · web-flow · commit 5f971a21db71 · 2025-08-29T17:17:55.000+02:00
[CMP-8797](https://youtrack.jetbrains.com/issue/CMP-8797) IllegalStateException: IrPropertySymbolImpl is already bound. Signature: androidx.savedstate.serialization/intListDescriptor [CMP-8640](https://youtrack.jetbrains.com/issue/CMP-8640) Drive Navigation 2 to stable Partially cherry-pick from #2370 ## Release Notes N/A
diff --git a/compose/material/material-navigation/build.gradle b/compose/material/material-navigation/build.gradle
@@ -44,6 +44,13 @@ kotlin {
                 implementation(project(":navigation:navigation-compose"))
                 implementation(project(":compose:material:material"))
                 implementation(libs.kotlinStdlib)
+
+                // Align navigation dependencies with Compose ones
+                // https://youtrack.jetbrains.com/issue/CMP-8704 workaround
+                implementation(project(":lifecycle:lifecycle-runtime-compose"))
+                implementation(project(":lifecycle:lifecycle-viewmodel-compose"))
+                implementation(project(":lifecycle:lifecycle-viewmodel-savedstate"))
+                implementation(project(":savedstate:savedstate-compose"))
             }
         }
 
diff --git a/lifecycle/lifecycle-runtime-compatibility-stub/build.gradle b/lifecycle/lifecycle-runtime-compatibility-stub/build.gradle
@@ -52,6 +52,10 @@ androidXMultiplatform {
             dependencies {
                 def version = project.findProperty('artifactRedirection.version.androidx.lifecycle')
                 api("androidx.lifecycle:lifecycle-runtime:$version")
+
+                // Keep direct references to fork versions to correctly resolve
+                // New redirections to Google's artifacts
+                implementation(project(":lifecycle:lifecycle-common"))
             }
         }
     }
diff --git a/lifecycle/lifecycle-runtime-compose-compatibility-stub/build.gradle b/lifecycle/lifecycle-runtime-compose-compatibility-stub/build.gradle
@@ -62,8 +62,10 @@ kotlin {
                 def version = project.findProperty('artifactRedirection.version.androidx.lifecycle')
                 api("androidx.lifecycle:lifecycle-runtime-compose:$version")
 
-                // Keep direct reference to Compose multiplatform 1.9.x to correctly resolve
+                // Keep direct references to fork versions to correctly resolve
                 // New redirections to Google's artifacts
+                implementation(project(":lifecycle:lifecycle-common"))
+                implementation(project(":lifecycle:lifecycle-runtime"))
                 implementation(project(":compose:runtime:runtime"))
             }
         }
diff --git a/lifecycle/lifecycle-viewmodel-savedstate-compatibility-stub/build.gradle b/lifecycle/lifecycle-viewmodel-savedstate-compatibility-stub/build.gradle
@@ -47,6 +47,12 @@ androidXMultiplatform {
             dependencies {
                 def version = project.findProperty('artifactRedirection.version.androidx.lifecycle')
                 api("androidx.lifecycle:lifecycle-viewmodel-savedstate:$version")
+
+                // Keep direct references to fork versions to correctly resolve
+                // New redirections to Google's artifacts
+                implementation(project(":savedstate:savedstate"))
+                implementation(project(":lifecycle:lifecycle-common"))
+                implementation(project(":lifecycle:lifecycle-viewmodel"))
             }
         }
     }
diff --git a/navigation/navigation-common/build.gradle b/navigation/navigation-common/build.gradle
@@ -59,11 +59,11 @@ androidXMultiplatform {
             dependencies {
                 api "androidx.annotation:annotation:1.9.1"
                 api "androidx.collection:collection:1.5.0"
-                api project(":lifecycle:lifecycle-common")
-                api project(":lifecycle:lifecycle-runtime")
-                api project(":lifecycle:lifecycle-viewmodel")
-                api project(":lifecycle:lifecycle-viewmodel-savedstate")
-                api project(":savedstate:savedstate")
+                api "org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.3"
+                api "org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.3"
+                api "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.3"
+                api "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.3"
+                api "org.jetbrains.androidx.savedstate:savedstate:1.3.3"
 
                 api(libs.kotlinStdlib)
                 implementation(libs.kotlinSerializationCore)
diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle
@@ -57,13 +57,13 @@ kotlin {
 
                 implementation "org.jetbrains.compose.animation:animation-core:1.8.2"
                 implementation "org.jetbrains.compose.foundation:foundation-layout:1.8.2"
-                implementation(project(":lifecycle:lifecycle-common"))
-                implementation(project(":lifecycle:lifecycle-runtime-compose"))
-                implementation(project(":lifecycle:lifecycle-viewmodel"))
-                implementation(project(":lifecycle:lifecycle-viewmodel-compose"))
-                implementation(project(":lifecycle:lifecycle-viewmodel-savedstate"))
-                implementation project(":savedstate:savedstate")
-                implementation project(":savedstate:savedstate-compose")
+                implementation "org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.3"
+                implementation "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.3"
+                implementation "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.3"
+                implementation "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.3"
+                implementation "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.3"
+                implementation "org.jetbrains.androidx.savedstate:savedstate:1.3.3"
+                implementation "org.jetbrains.androidx.savedstate:savedstate-compose:1.3.3"
             }
         }
 
diff --git a/navigation/navigation-runtime/build.gradle b/navigation/navigation-runtime/build.gradle
@@ -52,11 +52,11 @@ androidXMultiplatform {
             dependencies {
                 api "androidx.annotation:annotation:1.9.1"
                 api "androidx.collection:collection:1.5.0"
-                api project(":lifecycle:lifecycle-common")
-                api project(":lifecycle:lifecycle-runtime")
-                api project(":lifecycle:lifecycle-viewmodel")
-                api project(":lifecycle:lifecycle-viewmodel-savedstate")
-                api project(":savedstate:savedstate")
+                api "org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.3"
+                api "org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.3"
+                api "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.3"
+                api "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.3"
+                api "org.jetbrains.androidx.savedstate:savedstate:1.3.3"
                 api project(":navigation:navigation-common")
 
                 api(libs.kotlinStdlib)
diff --git a/savedstate/savedstate-compatibility-stub/build.gradle b/savedstate/savedstate-compatibility-stub/build.gradle
@@ -31,6 +31,10 @@ androidXMultiplatform {
             dependencies {
                 def version = project.findProperty('artifactRedirection.version.androidx.savedstate')
                 api("androidx.savedstate:savedstate:$version")
+
+                // Keep direct references to fork versions to correctly resolve
+                // New redirections to Google's artifacts
+                implementation(project(":lifecycle:lifecycle-common"))
             }
         }
     }
diff --git a/savedstate/savedstate-compose-compatibility-stub/build.gradle b/savedstate/savedstate-compose-compatibility-stub/build.gradle
@@ -62,8 +62,9 @@ kotlin {
                 def version = project.findProperty('artifactRedirection.version.androidx.savedstate')
                 api("androidx.savedstate:savedstate-compose:$version")
 
-                // Keep direct reference to Compose multiplatform 1.9.x to correctly resolve
+                // Keep direct references to fork versions to correctly resolve
                 // New redirections to Google's artifacts
+                implementation(project(":savedstate:savedstate"))
                 implementation(project(":compose:runtime:runtime"))
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,13 @@ kotlin {`
`44`	`44`	`implementation(project(":navigation:navigation-compose"))`
`45`	`45`	`implementation(project(":compose:material:material"))`
`46`	`46`	`implementation(libs.kotlinStdlib)`
	`47`	`+`
	`48`	`+ // Align navigation dependencies with Compose ones`
	`49`	`+ // https://youtrack.jetbrains.com/issue/CMP-8704 workaround`
	`50`	`+ implementation(project(":lifecycle:lifecycle-runtime-compose"))`
	`51`	`+ implementation(project(":lifecycle:lifecycle-viewmodel-compose"))`
	`52`	`+ implementation(project(":lifecycle:lifecycle-viewmodel-savedstate"))`
	`53`	`+ implementation(project(":savedstate:savedstate-compose"))`
`47`	`54`	`}`
`48`	`55`	`}`
`49`	`56`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,10 @@ androidXMultiplatform {`
`52`	`52`	`dependencies {`
`53`	`53`	`def version = project.findProperty('artifactRedirection.version.androidx.lifecycle')`
`54`	`54`	`api("androidx.lifecycle:lifecycle-runtime:$version")`
	`55`	`+`
	`56`	`+ // Keep direct references to fork versions to correctly resolve`
	`57`	`+ // New redirections to Google's artifacts`
	`58`	`+ implementation(project(":lifecycle:lifecycle-common"))`
`55`	`59`	`}`
`56`	`60`	`}`
`57`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,10 @@ kotlin {`
`62`	`62`	`def version = project.findProperty('artifactRedirection.version.androidx.lifecycle')`
`63`	`63`	`api("androidx.lifecycle:lifecycle-runtime-compose:$version")`
`64`	`64`
`65`		`- // Keep direct reference to Compose multiplatform 1.9.x to correctly resolve`
	`65`	`+ // Keep direct references to fork versions to correctly resolve`
`66`	`66`	`// New redirections to Google's artifacts`
	`67`	`+ implementation(project(":lifecycle:lifecycle-common"))`
	`68`	`+ implementation(project(":lifecycle:lifecycle-runtime"))`
`67`	`69`	`implementation(project(":compose:runtime:runtime"))`
`68`	`70`	`}`
`69`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,12 @@ androidXMultiplatform {`
`47`	`47`	`dependencies {`
`48`	`48`	`def version = project.findProperty('artifactRedirection.version.androidx.lifecycle')`
`49`	`49`	`api("androidx.lifecycle:lifecycle-viewmodel-savedstate:$version")`
	`50`	`+`
	`51`	`+ // Keep direct references to fork versions to correctly resolve`
	`52`	`+ // New redirections to Google's artifacts`
	`53`	`+ implementation(project(":savedstate:savedstate"))`
	`54`	`+ implementation(project(":lifecycle:lifecycle-common"))`
	`55`	`+ implementation(project(":lifecycle:lifecycle-viewmodel"))`
`50`	`56`	`}`
`51`	`57`	`}`
`52`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,10 @@ androidXMultiplatform {`
`31`	`31`	`dependencies {`
`32`	`32`	`def version = project.findProperty('artifactRedirection.version.androidx.savedstate')`
`33`	`33`	`api("androidx.savedstate:savedstate:$version")`
	`34`	`+`
	`35`	`+ // Keep direct references to fork versions to correctly resolve`
	`36`	`+ // New redirections to Google's artifacts`
	`37`	`+ implementation(project(":lifecycle:lifecycle-common"))`
`34`	`38`	`}`
`35`	`39`	`}`
`36`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,9 @@ kotlin {`
`62`	`62`	`def version = project.findProperty('artifactRedirection.version.androidx.savedstate')`
`63`	`63`	`api("androidx.savedstate:savedstate-compose:$version")`
`64`	`64`
`65`		`- // Keep direct reference to Compose multiplatform 1.9.x to correctly resolve`
	`65`	`+ // Keep direct references to fork versions to correctly resolve`
`66`	`66`	`// New redirections to Google's artifacts`
	`67`	`+ implementation(project(":savedstate:savedstate"))`
`67`	`68`	`implementation(project(":compose:runtime:runtime"))`
`68`	`69`	`}`
`69`	`70`	`}`