Skip to content
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

Set the default version to 9999.0.0-SNAPSHOT, pin all dependencies #1696

Merged
merged 3 commits into from
Dec 2, 2024
Merged

Set the default version to 9999.0.0-SNAPSHOT, pin all dependencies #1696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cfb6dc
Set the default version to 9999.0.0-SNAPSHOT, pin lifecycle in Compos…
igordmn Nov 26, 2024
6d4a098
Pin all dependencies.
igordmn Dec 2, 2024
1f0684d
Pin all dependencies.
igordmn Dec 2, 2024
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
8 changes: 7 additions & 1 deletion buildSrc/private/src/main/kotlin/androidx/build/LibraryVersionsService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,13 @@ abstract class LibraryVersionsService : BuildService<LibraryVersionsService.Para
versionForTag
} else {
// Do not use version from toml to about accidentally publish "stable" version
"0.0.0-SNAPSHOT"
//
// We use a big version, so it will win in case of version conflict during
// local runs:
// project("compose:ui") -> lifecycle-runtime-compose:2.8.4 -> compose.runtime:runtime:1.6.11
// project("compose:ui") -> project("compose:runtime")
// project("compose:runtime") should override compose.runtime:runtime:1.6.11 by default
"9999.0.0-SNAPSHOT"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems too dangerous for me.

Move versioning from CI to libraryversions.toml

Sounds much better

}
Version.parseOrNull(versionValue)
?: throw GradleException(
Expand Down
2 changes: 1 addition & 1 deletion collection/collection/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ kotlin {
commonMain {
dependencies {
api(libs.kotlinStdlib)
implementation(project(":annotation:annotation"))
implementation("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
implementation(libs.atomicFu)
}
}
Expand Down
2 changes: 1 addition & 1 deletion compose/animation/animation-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
implementation(project(":compose:ui:ui-util"))
implementation(libs.kotlinStdlibCommon)
api(libs.kotlinCoroutinesCore)
implementation(project(":annotation:annotation"))
implementation("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
}

commonTest {
Expand Down
2 changes: 1 addition & 1 deletion compose/foundation/foundation-layout/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
api(project(":compose:ui:ui"))
implementation(project(":compose:runtime:runtime"))
implementation(project(":compose:ui:ui-util"))
implementation(project(":annotation:annotation"))
implementation("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
}

androidMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion compose/foundation/foundation/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
implementation(project(":compose:ui:ui-text"))
implementation(project(":compose:ui:ui-util"))
implementation(project(':compose:foundation:foundation-layout'))
implementation(project(":annotation:annotation"))
implementation("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
}
androidMain.dependencies {
api("androidx.annotation:annotation:1.1.0")
Expand Down
2 changes: 1 addition & 1 deletion compose/material/material/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
implementation(project(":compose:animation:animation"))
implementation(project(":compose:foundation:foundation-layout"))
implementation(project(":compose:ui:ui-util"))
implementation(project(":annotation:annotation"))
implementation("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
}

androidMain.dependencies {
Expand Down
4 changes: 2 additions & 2 deletions compose/material3/adaptive/adaptive-layout/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ kotlin {
implementation(project(":compose:foundation:foundation-layout"))
implementation(project(":compose:ui:ui-geometry"))
implementation(project(":compose:ui:ui-util"))
implementation(project(":window:window-core"))
implementation("org.jetbrains.androidx.window:window-core:1.3.1")
implementation(project(":collection:collection"))
}
}

commonTest {
dependencies {
implementation(libs.kotlinTest)
api(project(":annotation:annotation"))
api("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
implementation(project(":kruth:kruth"))
}
}
Expand Down
2 changes: 1 addition & 1 deletion compose/material3/adaptive/adaptive/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ kotlin {
implementation(libs.kotlinStdlibCommon)
api(project(":compose:foundation:foundation"))
api(project(":compose:ui:ui-geometry"))
api(project(":window:window-core"))
api("org.jetbrains.androidx.window:window-core:1.3.1")
}
}

Expand Down
4 changes: 2 additions & 2 deletions compose/material3/material3-adaptive-navigation-suite/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ kotlin {
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.androidx.window:window-core:1.3.1")
api("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
}
}

Expand Down
2 changes: 1 addition & 1 deletion compose/material3/material3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {

implementation(project(":compose:ui:ui-util"))
implementation(project(":compose:foundation:foundation-layout"))
implementation(project(":annotation:annotation"))
implementation("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
implementation(project(":collection:collection"))
}

Expand Down
2 changes: 1 addition & 1 deletion compose/runtime/runtime/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
implementation(libs.kotlinStdlibCommon)
implementation(libs.kotlinCoroutinesCore)
implementation(libs.atomicFu)
implementation(project(":annotation:annotation"))
implementation("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
implementation(project(":collection:collection"))
}
jvmMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion compose/ui/ui-graphics/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
implementation(project(":compose:ui:ui-util"))
implementation(project(":compose:ui:ui-geometry"))
implementation(project(":collection:collection"))
implementation(project(":annotation:annotation"))
implementation("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
}

androidMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion compose/ui/ui-test-junit4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
api(libs.kotlinStdlib)
api(libs.kotlinStdlibCommon)

implementation(project(":annotation:annotation"))
implementation("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
}

androidMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion compose/ui/ui-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
api(libs.kotlinCoroutinesTest)
api(libs.kotlinStdlibCommon)

implementation(project(":annotation:annotation"))
implementation("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
}

androidMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion compose/ui/ui-text/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
implementation(project(":compose:ui:ui-geometry"))

implementation(project(":collection:collection"))
implementation(project(":annotation:annotation"))
implementation("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
}

jvmMain.dependencies {
Expand Down
2 changes: 1 addition & 1 deletion compose/ui/ui-unit/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {

implementation(project(":compose:runtime:runtime"))
implementation(project(":compose:ui:ui-util"))
implementation(project(":annotation:annotation"))
implementation("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
}
jvmMain.dependencies {
implementation(libs.kotlinStdlib)
Expand Down
10 changes: 5 additions & 5 deletions compose/ui/ui/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,11 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
api project(":compose:ui:ui-text")
api project(":compose:ui:ui-unit")
api project(":compose:ui:ui-util")
implementation(project(":annotation:annotation"))
implementation(project(":lifecycle:lifecycle-common"))
implementation(project(":lifecycle:lifecycle-runtime"))
implementation(project(":lifecycle:lifecycle-runtime-compose"))
implementation(project(":lifecycle:lifecycle-viewmodel"))
implementation("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
implementation("org.jetbrains.androidx.lifecycle:lifecycle-common:2.8.4")
implementation("org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.8.4")
implementation("org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.8.4")
implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.8.4")
}

androidMain.dependencies {
Expand Down
4 changes: 2 additions & 2 deletions graphics/graphics-shapes/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ kotlin {
commonMain {
dependencies {
implementation(libs.kotlinStdlibCommon)
implementation(project(":collection:collection"))
implementation(project(":annotation:annotation"))
implementation("org.jetbrains.compose.collection-internal:collection:1.7.1")
implementation("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
}
}

Expand Down
2 changes: 1 addition & 1 deletion lifecycle/lifecycle-common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ kotlin {
dependencies {
api(libs.kotlinStdlib)
api(libs.kotlinCoroutinesCore)
api(project(":annotation:annotation"))
api("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
}
}

Expand Down
4 changes: 2 additions & 2 deletions lifecycle/lifecycle-runtime-compose/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ kotlin {
sourceSets {
commonMain {
dependencies {
api(project(":annotation:annotation"))
api("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
implementation(project(":lifecycle:lifecycle-common"))
api project(":lifecycle:lifecycle-runtime")
api(project(":compose:runtime:runtime"))
api("org.jetbrains.compose.runtime:runtime:1.7.1")

implementation(libs.kotlinStdlib)
}
Expand Down
2 changes: 1 addition & 1 deletion lifecycle/lifecycle-runtime/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ kotlin {
dependencies {
api(libs.kotlinStdlib)
api(project(":lifecycle:lifecycle-common"))
api(project(":annotation:annotation"))
api("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
}
}

Expand Down
8 changes: 4 additions & 4 deletions lifecycle/lifecycle-viewmodel-compose/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ kotlin {
api project(":lifecycle:lifecycle-common")
api project(":lifecycle:lifecycle-viewmodel")
api project(":lifecycle:lifecycle-viewmodel-savedstate")
api project(":savedstate:savedstate")
api project(":compose:runtime:runtime")
api project(":compose:runtime:runtime-saveable")
api project(":compose:ui:ui")
api "org.jetbrains.androidx.savedstate:savedstate:1.2.2"
api "org.jetbrains.compose.runtime:runtime:1.7.1"
api "org.jetbrains.compose.runtime:runtime-saveable:1.7.1"
api "org.jetbrains.compose.ui:ui:1.7.1"

implementation(libs.kotlinStdlib)
implementation project(":core:core-bundle")
Expand Down
4 changes: 2 additions & 2 deletions lifecycle/lifecycle-viewmodel-savedstate/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ kotlin {
sourceSets {
commonMain {
dependencies {
api(project(":annotation:annotation"))
api("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
api(project(":core:core-bundle"))
api(project(":lifecycle:lifecycle-common"))
api(project(":lifecycle:lifecycle-viewmodel"))
api(project(":savedstate:savedstate"))
api("org.jetbrains.androidx.savedstate:savedstate:1.2.2")
api(libs.kotlinStdlib)
}
}
Expand Down
2 changes: 1 addition & 1 deletion lifecycle/lifecycle-viewmodel/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ kotlin {

commonMain {
dependencies {
api(project(":annotation:annotation"))
api("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
api(libs.kotlinStdlib)
api(libs.kotlinCoroutinesCore)
}
Expand Down
6 changes: 3 additions & 3 deletions navigation/navigation-common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ androidXMultiplatform {
sourceSets {
commonMain {
dependencies {
api project(":annotation:annotation")
api project(":collection:collection")
api "org.jetbrains.compose.annotation-internal:annotation:1.7.1"
api "org.jetbrains.compose.collection-internal:collection:1.7.1"
api project(":core:core-bundle")
api project(":core:core-uri")
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.savedstate:savedstate:1.2.2"

api(libs.kotlinStdlib)
implementation(libs.kotlinSerializationCore)
Expand Down
26 changes: 13 additions & 13 deletions navigation/navigation-compose/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,21 @@ kotlin {
commonMain {
dependencies {
api project(":core:core-bundle")
implementation project(":compose:foundation:foundation-layout")
implementation project(":compose:animation:animation-core")
api project(":compose:animation:animation")
api project(":compose:runtime:runtime")
api project(":compose:runtime:runtime-saveable")
api project(":compose:ui:ui")
api project(":lifecycle:lifecycle-common")
api project(":lifecycle:lifecycle-runtime")
api project(":lifecycle:lifecycle-runtime-compose")
api project(":lifecycle:lifecycle-viewmodel")
api project(":lifecycle:lifecycle-viewmodel-compose")
api project(":lifecycle:lifecycle-viewmodel-savedstate")
implementation "org.jetbrains.compose.foundation:foundation-layout:1.7.1"
implementation "org.jetbrains.compose.animation:animation-core:1.7.1"
api "org.jetbrains.compose.animation:animation:1.7.1"
api "org.jetbrains.compose.runtime:runtime:1.7.1"
api "org.jetbrains.compose.runtime:runtime-saveable:1.7.1"
api "org.jetbrains.compose.ui:ui:1.7.1"
api "org.jetbrains.androidx.lifecycle:lifecycle-common:2.8.4"
api "org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.8.4"
api "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.8.4"
api "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.8.4"
api "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.8.4"
api "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.4"
api project(":navigation:navigation-common")
api project(":navigation:navigation-runtime")
api project(":savedstate:savedstate")
api "org.jetbrains.androidx.savedstate:savedstate:1.2.2"

implementation(libs.kotlinStdlibCommon)
implementation(libs.kotlinSerializationCore)
Expand Down
14 changes: 7 additions & 7 deletions navigation/navigation-runtime/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@ androidXMultiplatform {
sourceSets {
commonMain {
dependencies {
api project(":annotation:annotation")
implementation project(":collection:collection")
api "org.jetbrains.compose.annotation-internal:annotation:1.7.1"
implementation "org.jetbrains.compose.collection-internal:collection:1.7.1"
api project(":core:core-bundle")
api project(":core:core-uri")
api project(":lifecycle:lifecycle-common")
api project(":lifecycle:lifecycle-runtime")
api project(":lifecycle:lifecycle-viewmodel")
api project(":lifecycle:lifecycle-viewmodel-savedstate")
api "org.jetbrains.androidx.lifecycle:lifecycle-common:2.8.4"
api "org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.8.4"
api "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.8.4"
api "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.4"
api project(":navigation:navigation-common")
api project(":savedstate:savedstate")
api "org.jetbrains.androidx.savedstate:savedstate:1.2.2"

api(libs.kotlinStdlib)
implementation(libs.kotlinSerializationCore)
Expand Down
4 changes: 2 additions & 2 deletions savedstate/savedstate/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ kotlin {
commonMain {
dependencies {
api(libs.kotlinStdlib)
api(project(":annotation:annotation"))
api("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
api(project(":core:core-bundle"))
api(project(":lifecycle:lifecycle-common"))
api("org.jetbrains.androidx.lifecycle:lifecycle-common:2.8.4")
}
}
jvmMain {
Expand Down
2 changes: 1 addition & 1 deletion window/window-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ kotlin {
commonMain {
dependencies {
api(libs.kotlinStdlib)
api(project(":annotation:annotation"))
api("org.jetbrains.compose.annotation-internal:annotation:1.7.1")
}
}

Expand Down