Skip to content

Commit

Permalink
Fix dependency updates (#1479)
Browse files Browse the repository at this point in the history 
Fixed #1478 by using the correct version variable for
`kotlinx-coroutines-test`

Also changed the master project used for version updates from `JetNews`
to `Reply`.

Why? `JetNews` doesn't use the `kotlinx-serialization` plugin so this
was automatically removed when running `versionCatalogUpdate` gradle
task. This meant that `Reply` would fail to build because it depends on
this plugin.
  • Loading branch information
@dturner
dturner authored Oct 3, 2024
2 parents 0323c93 + a4a8ceb commit d2e3e7b
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 24 deletions.
6 changes: 3 additions & 3 deletions JetLagged/gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ horologist = "0.6.19"
jdkDesugar = "1.2.2"
junit = "4.13.2"
kotlin = "2.0.20"
kotlinx-serialization-json = "1.7.3"
kotlinx_immutable = "0.3.8"
kotlinx-serialization-json = "1.6.3"
ksp = "2.0.20-1.0.24"
maps-compose = "3.1.1"
# @keep
Expand Down Expand Up @@ -153,8 +153,8 @@ junit = { module = "junit:junit", version.ref = "junit" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinx_immutable" }
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx_immutable" }
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
play-services-wearable = { module = "com.google.android.gms:play-services-wearable", version.ref = "play-services-wearable" }
Expand Down
6 changes: 3 additions & 3 deletions JetNews/gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ horologist = "0.6.19"
jdkDesugar = "1.2.2"
junit = "4.13.2"
kotlin = "2.0.20"
kotlinx-serialization-json = "1.7.3"
kotlinx_immutable = "0.3.8"
kotlinx-serialization-json = "1.6.3"
ksp = "2.0.20-1.0.24"
maps-compose = "3.1.1"
# @keep
Expand Down Expand Up @@ -153,8 +153,8 @@ junit = { module = "junit:junit", version.ref = "junit" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinx_immutable" }
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx_immutable" }
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
play-services-wearable = { module = "com.google.android.gms:play-services-wearable", version.ref = "play-services-wearable" }
Expand Down
6 changes: 3 additions & 3 deletions Jetcaster/gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ horologist = "0.6.19"
jdkDesugar = "1.2.2"
junit = "4.13.2"
kotlin = "2.0.20"
kotlinx-serialization-json = "1.7.3"
kotlinx_immutable = "0.3.8"
kotlinx-serialization-json = "1.6.3"
ksp = "2.0.20-1.0.24"
maps-compose = "3.1.1"
# @keep
Expand Down Expand Up @@ -153,8 +153,8 @@ junit = { module = "junit:junit", version.ref = "junit" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinx_immutable" }
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx_immutable" }
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
play-services-wearable = { module = "com.google.android.gms:play-services-wearable", version.ref = "play-services-wearable" }
Expand Down
6 changes: 3 additions & 3 deletions Jetchat/gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ horologist = "0.6.19"
jdkDesugar = "1.2.2"
junit = "4.13.2"
kotlin = "2.0.20"
kotlinx-serialization-json = "1.7.3"
kotlinx_immutable = "0.3.8"
kotlinx-serialization-json = "1.6.3"
ksp = "2.0.20-1.0.24"
maps-compose = "3.1.1"
# @keep
Expand Down Expand Up @@ -153,8 +153,8 @@ junit = { module = "junit:junit", version.ref = "junit" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinx_immutable" }
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx_immutable" }
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
play-services-wearable = { module = "com.google.android.gms:play-services-wearable", version.ref = "play-services-wearable" }
Expand Down
6 changes: 3 additions & 3 deletions Jetsnack/gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ horologist = "0.6.19"
jdkDesugar = "1.2.2"
junit = "4.13.2"
kotlin = "2.0.20"
kotlinx-serialization-json = "1.7.3"
kotlinx_immutable = "0.3.8"
kotlinx-serialization-json = "1.6.3"
ksp = "2.0.20-1.0.24"
maps-compose = "3.1.1"
# @keep
Expand Down Expand Up @@ -153,8 +153,8 @@ junit = { module = "junit:junit", version.ref = "junit" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinx_immutable" }
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx_immutable" }
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
play-services-wearable = { module = "com.google.android.gms:play-services-wearable", version.ref = "play-services-wearable" }
Expand Down
6 changes: 3 additions & 3 deletions Reply/gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ horologist = "0.6.19"
jdkDesugar = "1.2.2"
junit = "4.13.2"
kotlin = "2.0.20"
kotlinx-serialization-json = "1.7.3"
kotlinx_immutable = "0.3.8"
kotlinx-serialization-json = "1.6.3"
ksp = "2.0.20-1.0.24"
maps-compose = "3.1.1"
# @keep
Expand Down Expand Up @@ -153,8 +153,8 @@ junit = { module = "junit:junit", version.ref = "junit" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinx_immutable" }
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx_immutable" }
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
play-services-wearable = { module = "com.google.android.gms:play-services-wearable", version.ref = "play-services-wearable" }
Expand Down
6 changes: 3 additions & 3 deletions scripts/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ horologist = "0.6.19"
jdkDesugar = "1.2.2"
junit = "4.13.2"
kotlin = "2.0.20"
kotlinx-serialization-json = "1.7.3"
kotlinx_immutable = "0.3.8"
kotlinx-serialization-json = "1.6.3"
ksp = "2.0.20-1.0.24"
maps-compose = "3.1.1"
# @keep
Expand Down Expand Up @@ -153,8 +153,8 @@ junit = { module = "junit:junit", version.ref = "junit" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinx_immutable" }
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx_immutable" }
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
play-services-wearable = { module = "com.google.android.gms:play-services-wearable", version.ref = "play-services-wearable" }
Expand Down
6 changes: 3 additions & 3 deletions scripts/updateDeps.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

########################################################################
#
# Updates dependencies using JetNews as the source of truth (then copies JetNews's
# Updates dependencies using Reply as the source of truth (then copies Reply's
# output into each sample)
#
# Example: To run build over all projects run:
Expand All @@ -26,7 +26,7 @@

set -xe

./JetNews/gradlew -p ./JetNews versionCatalogUpdate
./Reply/gradlew -p ./Reply versionCatalogUpdate

cp JetNews/gradle/libs.versions.toml scripts/libs.versions.toml
cp Reply/gradle/libs.versions.toml scripts/libs.versions.toml
./scripts/duplicate_version_config.sh

0 comments on commit d2e3e7b

Please sign in to comment.