From 7471d013bc06c4721388cca9bc9ca6057ab8b7bf Mon Sep 17 00:00:00 2001 From: compose-devrel-github-bot Date: Thu, 16 Jan 2025 14:51:57 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=A4=96=20Update=20Dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JetLagged/gradle/libs.versions.toml | 14 +++++++------- JetNews/gradle/libs.versions.toml | 14 +++++++------- Jetcaster/gradle/libs.versions.toml | 14 +++++++------- Jetchat/gradle/libs.versions.toml | 14 +++++++------- Jetsnack/gradle/libs.versions.toml | 14 +++++++------- Reply/gradle/libs.versions.toml | 14 +++++++------- scripts/libs.versions.toml | 14 +++++++------- 7 files changed, 49 insertions(+), 49 deletions(-) diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index d8c03af8f..a9750a419 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -4,10 +4,10 @@ ##### [versions] accompanist = "0.37.0" -androidGradlePlugin = "8.7.3" -androidx-activity-compose = "1.9.3" +androidGradlePlugin = "8.8.0" +androidx-activity-compose = "1.10.0" androidx-appcompat = "1.7.0" -androidx-compose-bom = "2024.12.01" +androidx-compose-bom = "2025.01.00" androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" @@ -30,10 +30,10 @@ androix-test-uiautomator = "2.3.0" coil = "2.7.0" # @keep compileSdk = "35" -coroutines = "1.9.0" +coroutines = "1.10.1" google-maps = "18.2.0" gradle-versions = "0.51.0" -hilt = "2.53.1" +hilt = "2.55" hiltExt = "1.2.0" horologist = "0.6.22" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions @@ -49,8 +49,8 @@ minSdk = "21" okhttp = "4.12.0" play-services-wearable = "18.1.0" robolectric = "4.14.1" -roborazzi = "1.37.0" -rome = "1.18.0" +roborazzi = "1.39.0" +rome = "2.1.0" room = "2.6.1" secrets = "2.0.1" # @keep diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index d8c03af8f..a9750a419 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -4,10 +4,10 @@ ##### [versions] accompanist = "0.37.0" -androidGradlePlugin = "8.7.3" -androidx-activity-compose = "1.9.3" +androidGradlePlugin = "8.8.0" +androidx-activity-compose = "1.10.0" androidx-appcompat = "1.7.0" -androidx-compose-bom = "2024.12.01" +androidx-compose-bom = "2025.01.00" androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" @@ -30,10 +30,10 @@ androix-test-uiautomator = "2.3.0" coil = "2.7.0" # @keep compileSdk = "35" -coroutines = "1.9.0" +coroutines = "1.10.1" google-maps = "18.2.0" gradle-versions = "0.51.0" -hilt = "2.53.1" +hilt = "2.55" hiltExt = "1.2.0" horologist = "0.6.22" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions @@ -49,8 +49,8 @@ minSdk = "21" okhttp = "4.12.0" play-services-wearable = "18.1.0" robolectric = "4.14.1" -roborazzi = "1.37.0" -rome = "1.18.0" +roborazzi = "1.39.0" +rome = "2.1.0" room = "2.6.1" secrets = "2.0.1" # @keep diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index d8c03af8f..a9750a419 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -4,10 +4,10 @@ ##### [versions] accompanist = "0.37.0" -androidGradlePlugin = "8.7.3" -androidx-activity-compose = "1.9.3" +androidGradlePlugin = "8.8.0" +androidx-activity-compose = "1.10.0" androidx-appcompat = "1.7.0" -androidx-compose-bom = "2024.12.01" +androidx-compose-bom = "2025.01.00" androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" @@ -30,10 +30,10 @@ androix-test-uiautomator = "2.3.0" coil = "2.7.0" # @keep compileSdk = "35" -coroutines = "1.9.0" +coroutines = "1.10.1" google-maps = "18.2.0" gradle-versions = "0.51.0" -hilt = "2.53.1" +hilt = "2.55" hiltExt = "1.2.0" horologist = "0.6.22" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions @@ -49,8 +49,8 @@ minSdk = "21" okhttp = "4.12.0" play-services-wearable = "18.1.0" robolectric = "4.14.1" -roborazzi = "1.37.0" -rome = "1.18.0" +roborazzi = "1.39.0" +rome = "2.1.0" room = "2.6.1" secrets = "2.0.1" # @keep diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index d8c03af8f..a9750a419 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -4,10 +4,10 @@ ##### [versions] accompanist = "0.37.0" -androidGradlePlugin = "8.7.3" -androidx-activity-compose = "1.9.3" +androidGradlePlugin = "8.8.0" +androidx-activity-compose = "1.10.0" androidx-appcompat = "1.7.0" -androidx-compose-bom = "2024.12.01" +androidx-compose-bom = "2025.01.00" androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" @@ -30,10 +30,10 @@ androix-test-uiautomator = "2.3.0" coil = "2.7.0" # @keep compileSdk = "35" -coroutines = "1.9.0" +coroutines = "1.10.1" google-maps = "18.2.0" gradle-versions = "0.51.0" -hilt = "2.53.1" +hilt = "2.55" hiltExt = "1.2.0" horologist = "0.6.22" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions @@ -49,8 +49,8 @@ minSdk = "21" okhttp = "4.12.0" play-services-wearable = "18.1.0" robolectric = "4.14.1" -roborazzi = "1.37.0" -rome = "1.18.0" +roborazzi = "1.39.0" +rome = "2.1.0" room = "2.6.1" secrets = "2.0.1" # @keep diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index d8c03af8f..a9750a419 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -4,10 +4,10 @@ ##### [versions] accompanist = "0.37.0" -androidGradlePlugin = "8.7.3" -androidx-activity-compose = "1.9.3" +androidGradlePlugin = "8.8.0" +androidx-activity-compose = "1.10.0" androidx-appcompat = "1.7.0" -androidx-compose-bom = "2024.12.01" +androidx-compose-bom = "2025.01.00" androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" @@ -30,10 +30,10 @@ androix-test-uiautomator = "2.3.0" coil = "2.7.0" # @keep compileSdk = "35" -coroutines = "1.9.0" +coroutines = "1.10.1" google-maps = "18.2.0" gradle-versions = "0.51.0" -hilt = "2.53.1" +hilt = "2.55" hiltExt = "1.2.0" horologist = "0.6.22" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions @@ -49,8 +49,8 @@ minSdk = "21" okhttp = "4.12.0" play-services-wearable = "18.1.0" robolectric = "4.14.1" -roborazzi = "1.37.0" -rome = "1.18.0" +roborazzi = "1.39.0" +rome = "2.1.0" room = "2.6.1" secrets = "2.0.1" # @keep diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index d8c03af8f..a9750a419 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -4,10 +4,10 @@ ##### [versions] accompanist = "0.37.0" -androidGradlePlugin = "8.7.3" -androidx-activity-compose = "1.9.3" +androidGradlePlugin = "8.8.0" +androidx-activity-compose = "1.10.0" androidx-appcompat = "1.7.0" -androidx-compose-bom = "2024.12.01" +androidx-compose-bom = "2025.01.00" androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" @@ -30,10 +30,10 @@ androix-test-uiautomator = "2.3.0" coil = "2.7.0" # @keep compileSdk = "35" -coroutines = "1.9.0" +coroutines = "1.10.1" google-maps = "18.2.0" gradle-versions = "0.51.0" -hilt = "2.53.1" +hilt = "2.55" hiltExt = "1.2.0" horologist = "0.6.22" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions @@ -49,8 +49,8 @@ minSdk = "21" okhttp = "4.12.0" play-services-wearable = "18.1.0" robolectric = "4.14.1" -roborazzi = "1.37.0" -rome = "1.18.0" +roborazzi = "1.39.0" +rome = "2.1.0" room = "2.6.1" secrets = "2.0.1" # @keep diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml index d8c03af8f..a9750a419 100644 --- a/scripts/libs.versions.toml +++ b/scripts/libs.versions.toml @@ -4,10 +4,10 @@ ##### [versions] accompanist = "0.37.0" -androidGradlePlugin = "8.7.3" -androidx-activity-compose = "1.9.3" +androidGradlePlugin = "8.8.0" +androidx-activity-compose = "1.10.0" androidx-appcompat = "1.7.0" -androidx-compose-bom = "2024.12.01" +androidx-compose-bom = "2025.01.00" androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" @@ -30,10 +30,10 @@ androix-test-uiautomator = "2.3.0" coil = "2.7.0" # @keep compileSdk = "35" -coroutines = "1.9.0" +coroutines = "1.10.1" google-maps = "18.2.0" gradle-versions = "0.51.0" -hilt = "2.53.1" +hilt = "2.55" hiltExt = "1.2.0" horologist = "0.6.22" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions @@ -49,8 +49,8 @@ minSdk = "21" okhttp = "4.12.0" play-services-wearable = "18.1.0" robolectric = "4.14.1" -roborazzi = "1.37.0" -rome = "1.18.0" +roborazzi = "1.39.0" +rome = "2.1.0" room = "2.6.1" secrets = "2.0.1" # @keep From 0c15656835b77d2fa2ea9a9a85d7403c4952378c Mon Sep 17 00:00:00 2001 From: Meghan Date: Tue, 21 Jan 2025 12:32:47 -0500 Subject: [PATCH 2/3] Update gradle version --- JetLagged/gradle/wrapper/gradle-wrapper.properties | 2 +- JetNews/gradle/wrapper/gradle-wrapper.properties | 2 +- Jetcaster/gradle/wrapper/gradle-wrapper.properties | 2 +- Jetchat/gradle/wrapper/gradle-wrapper.properties | 2 +- Jetsnack/gradle/wrapper/gradle-wrapper.properties | 2 +- Reply/gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/JetLagged/gradle/wrapper/gradle-wrapper.properties b/JetLagged/gradle/wrapper/gradle-wrapper.properties index 4e6e184aa..ba11905c1 100644 --- a/JetLagged/gradle/wrapper/gradle-wrapper.properties +++ b/JetLagged/gradle/wrapper/gradle-wrapper.properties @@ -14,6 +14,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/JetNews/gradle/wrapper/gradle-wrapper.properties b/JetNews/gradle/wrapper/gradle-wrapper.properties index 4e6e184aa..ba11905c1 100644 --- a/JetNews/gradle/wrapper/gradle-wrapper.properties +++ b/JetNews/gradle/wrapper/gradle-wrapper.properties @@ -14,6 +14,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Jetcaster/gradle/wrapper/gradle-wrapper.properties b/Jetcaster/gradle/wrapper/gradle-wrapper.properties index 4e6e184aa..ba11905c1 100644 --- a/Jetcaster/gradle/wrapper/gradle-wrapper.properties +++ b/Jetcaster/gradle/wrapper/gradle-wrapper.properties @@ -14,6 +14,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Jetchat/gradle/wrapper/gradle-wrapper.properties b/Jetchat/gradle/wrapper/gradle-wrapper.properties index 4e6e184aa..ba11905c1 100644 --- a/Jetchat/gradle/wrapper/gradle-wrapper.properties +++ b/Jetchat/gradle/wrapper/gradle-wrapper.properties @@ -14,6 +14,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Jetsnack/gradle/wrapper/gradle-wrapper.properties b/Jetsnack/gradle/wrapper/gradle-wrapper.properties index 4e6e184aa..ba11905c1 100644 --- a/Jetsnack/gradle/wrapper/gradle-wrapper.properties +++ b/Jetsnack/gradle/wrapper/gradle-wrapper.properties @@ -14,6 +14,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Reply/gradle/wrapper/gradle-wrapper.properties b/Reply/gradle/wrapper/gradle-wrapper.properties index 4e6e184aa..ba11905c1 100644 --- a/Reply/gradle/wrapper/gradle-wrapper.properties +++ b/Reply/gradle/wrapper/gradle-wrapper.properties @@ -14,6 +14,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From cb22ef15b7bde1c9bb5d75fa0c55d2635bedb04b Mon Sep 17 00:00:00 2001 From: Ben Trengrove Date: Fri, 24 Jan 2025 11:36:56 +1100 Subject: [PATCH 3/3] Fix rome tools failure --- Jetcaster/wear/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jetcaster/wear/build.gradle b/Jetcaster/wear/build.gradle index 4b10f6f8e..a37f63456 100644 --- a/Jetcaster/wear/build.gradle +++ b/Jetcaster/wear/build.gradle @@ -65,7 +65,7 @@ android { packagingOptions { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" - excludes += "rome-utils-1.18.0.jar" + excludes += "rome-utils-" + libs.rometools.rome.get().version + ".jar" } } }