Skip to content

Add direct references to fork modules in stubs #2371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 29, 2025
Merged

Add direct references to fork modules in stubs #2371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c9c1ed7
Add direct references to fork modules to lifecycle-runtime
MatkovIvan Aug 29, 2025
a8984e3
Add direct references to fork modules to lifecycle-runtime-compose
MatkovIvan Aug 29, 2025
a65caf1
Add direct references to fork modules to lifecycle-viewmodel-savedstate
MatkovIvan Aug 29, 2025
c6a2edd
Add direct references to fork modules to savedstate
MatkovIvan Aug 29, 2025
292e574
Add direct references to fork modules to savedstate-compose
MatkovIvan Aug 29, 2025
e0f1534
Pin navigation dependencies: lifecycle:2.9.3, savedstate:1.3.3
MatkovIvan Aug 29, 2025
7ab1fbd
Add CMP-8704 workaround
MatkovIvan Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions compose/material/material-navigation/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
}

Expand Down
4 changes: 4 additions & 0 deletions lifecycle/lifecycle-runtime-compatibility-stub/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion lifecycle/lifecycle-runtime-compose-compatibility-stub/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
}
Expand Down
6 changes: 6 additions & 0 deletions lifecycle/lifecycle-viewmodel-savedstate-compatibility-stub/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions navigation/navigation-common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
14 changes: 7 additions & 7 deletions navigation/navigation-compose/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

Expand Down
10 changes: 5 additions & 5 deletions navigation/navigation-runtime/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions savedstate/savedstate-compatibility-stub/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion savedstate/savedstate-compose-compatibility-stub/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
}
Expand Down