From 36b8b5068492194fd2b6f4503f519ab9d700468b Mon Sep 17 00:00:00 2001 From: compose-devrel-github-bot Date: Thu, 19 Dec 2024 10:38:35 +0000 Subject: [PATCH 1/7] =?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 | 10 +++++----- JetNews/gradle/libs.versions.toml | 10 +++++----- Jetcaster/gradle/libs.versions.toml | 10 +++++----- Jetchat/gradle/libs.versions.toml | 10 +++++----- Jetsnack/gradle/libs.versions.toml | 10 +++++----- Reply/gradle/libs.versions.toml | 10 +++++----- scripts/libs.versions.toml | 10 +++++----- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index e72f661e5..021353d05 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -3,13 +3,13 @@ # Do not add a dependency to an individual sample, edit the global version instead. ##### [versions] -accompanist = "0.36.0" -androidGradlePlugin = "8.7.2" +accompanist = "0.37.0" +androidGradlePlugin = "8.7.3" androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" androidx-benchmark = "1.2.4" androidx-benchmark-junit4 = "1.2.4" -androidx-compose-bom = "2024.10.01" +androidx-compose-bom = "2024.12.01" androidx-constraintlayout = "1.1.0-alpha13" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" @@ -17,7 +17,7 @@ androidx-glance = "1.1.0" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.8.7" androidx-lifecycle-runtime-compose = "2.8.7" -androidx-navigation = "2.8.3" +androidx-navigation = "2.8.5" androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" @@ -41,7 +41,7 @@ horologist = "0.6.19" # @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 jdkDesugar = "1.2.2" junit = "4.13.2" -kotlin = "2.0.21" +kotlin = "2.1.0" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" ksp = "2.0.20-1.0.24" diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index e72f661e5..021353d05 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -3,13 +3,13 @@ # Do not add a dependency to an individual sample, edit the global version instead. ##### [versions] -accompanist = "0.36.0" -androidGradlePlugin = "8.7.2" +accompanist = "0.37.0" +androidGradlePlugin = "8.7.3" androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" androidx-benchmark = "1.2.4" androidx-benchmark-junit4 = "1.2.4" -androidx-compose-bom = "2024.10.01" +androidx-compose-bom = "2024.12.01" androidx-constraintlayout = "1.1.0-alpha13" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" @@ -17,7 +17,7 @@ androidx-glance = "1.1.0" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.8.7" androidx-lifecycle-runtime-compose = "2.8.7" -androidx-navigation = "2.8.3" +androidx-navigation = "2.8.5" androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" @@ -41,7 +41,7 @@ horologist = "0.6.19" # @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 jdkDesugar = "1.2.2" junit = "4.13.2" -kotlin = "2.0.21" +kotlin = "2.1.0" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" ksp = "2.0.20-1.0.24" diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index e72f661e5..021353d05 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -3,13 +3,13 @@ # Do not add a dependency to an individual sample, edit the global version instead. ##### [versions] -accompanist = "0.36.0" -androidGradlePlugin = "8.7.2" +accompanist = "0.37.0" +androidGradlePlugin = "8.7.3" androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" androidx-benchmark = "1.2.4" androidx-benchmark-junit4 = "1.2.4" -androidx-compose-bom = "2024.10.01" +androidx-compose-bom = "2024.12.01" androidx-constraintlayout = "1.1.0-alpha13" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" @@ -17,7 +17,7 @@ androidx-glance = "1.1.0" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.8.7" androidx-lifecycle-runtime-compose = "2.8.7" -androidx-navigation = "2.8.3" +androidx-navigation = "2.8.5" androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" @@ -41,7 +41,7 @@ horologist = "0.6.19" # @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 jdkDesugar = "1.2.2" junit = "4.13.2" -kotlin = "2.0.21" +kotlin = "2.1.0" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" ksp = "2.0.20-1.0.24" diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index e72f661e5..021353d05 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -3,13 +3,13 @@ # Do not add a dependency to an individual sample, edit the global version instead. ##### [versions] -accompanist = "0.36.0" -androidGradlePlugin = "8.7.2" +accompanist = "0.37.0" +androidGradlePlugin = "8.7.3" androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" androidx-benchmark = "1.2.4" androidx-benchmark-junit4 = "1.2.4" -androidx-compose-bom = "2024.10.01" +androidx-compose-bom = "2024.12.01" androidx-constraintlayout = "1.1.0-alpha13" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" @@ -17,7 +17,7 @@ androidx-glance = "1.1.0" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.8.7" androidx-lifecycle-runtime-compose = "2.8.7" -androidx-navigation = "2.8.3" +androidx-navigation = "2.8.5" androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" @@ -41,7 +41,7 @@ horologist = "0.6.19" # @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 jdkDesugar = "1.2.2" junit = "4.13.2" -kotlin = "2.0.21" +kotlin = "2.1.0" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" ksp = "2.0.20-1.0.24" diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index e72f661e5..021353d05 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -3,13 +3,13 @@ # Do not add a dependency to an individual sample, edit the global version instead. ##### [versions] -accompanist = "0.36.0" -androidGradlePlugin = "8.7.2" +accompanist = "0.37.0" +androidGradlePlugin = "8.7.3" androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" androidx-benchmark = "1.2.4" androidx-benchmark-junit4 = "1.2.4" -androidx-compose-bom = "2024.10.01" +androidx-compose-bom = "2024.12.01" androidx-constraintlayout = "1.1.0-alpha13" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" @@ -17,7 +17,7 @@ androidx-glance = "1.1.0" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.8.7" androidx-lifecycle-runtime-compose = "2.8.7" -androidx-navigation = "2.8.3" +androidx-navigation = "2.8.5" androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" @@ -41,7 +41,7 @@ horologist = "0.6.19" # @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 jdkDesugar = "1.2.2" junit = "4.13.2" -kotlin = "2.0.21" +kotlin = "2.1.0" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" ksp = "2.0.20-1.0.24" diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index e72f661e5..021353d05 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -3,13 +3,13 @@ # Do not add a dependency to an individual sample, edit the global version instead. ##### [versions] -accompanist = "0.36.0" -androidGradlePlugin = "8.7.2" +accompanist = "0.37.0" +androidGradlePlugin = "8.7.3" androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" androidx-benchmark = "1.2.4" androidx-benchmark-junit4 = "1.2.4" -androidx-compose-bom = "2024.10.01" +androidx-compose-bom = "2024.12.01" androidx-constraintlayout = "1.1.0-alpha13" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" @@ -17,7 +17,7 @@ androidx-glance = "1.1.0" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.8.7" androidx-lifecycle-runtime-compose = "2.8.7" -androidx-navigation = "2.8.3" +androidx-navigation = "2.8.5" androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" @@ -41,7 +41,7 @@ horologist = "0.6.19" # @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 jdkDesugar = "1.2.2" junit = "4.13.2" -kotlin = "2.0.21" +kotlin = "2.1.0" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" ksp = "2.0.20-1.0.24" diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml index e72f661e5..021353d05 100644 --- a/scripts/libs.versions.toml +++ b/scripts/libs.versions.toml @@ -3,13 +3,13 @@ # Do not add a dependency to an individual sample, edit the global version instead. ##### [versions] -accompanist = "0.36.0" -androidGradlePlugin = "8.7.2" +accompanist = "0.37.0" +androidGradlePlugin = "8.7.3" androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" androidx-benchmark = "1.2.4" androidx-benchmark-junit4 = "1.2.4" -androidx-compose-bom = "2024.10.01" +androidx-compose-bom = "2024.12.01" androidx-constraintlayout = "1.1.0-alpha13" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" @@ -17,7 +17,7 @@ androidx-glance = "1.1.0" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.8.7" androidx-lifecycle-runtime-compose = "2.8.7" -androidx-navigation = "2.8.3" +androidx-navigation = "2.8.5" androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" @@ -41,7 +41,7 @@ horologist = "0.6.19" # @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 jdkDesugar = "1.2.2" junit = "4.13.2" -kotlin = "2.0.21" +kotlin = "2.1.0" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" ksp = "2.0.20-1.0.24" From e9424c9d00f754100a8d684e1013b2a6d23aeb88 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Thu, 19 Dec 2024 12:42:23 +0000 Subject: [PATCH 2/7] =?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 | 8 ++------ JetNews/gradle/libs.versions.toml | 8 ++------ Jetcaster/gradle/libs.versions.toml | 8 ++------ Jetchat/gradle/libs.versions.toml | 8 ++------ Jetsnack/gradle/libs.versions.toml | 8 ++------ Reply/gradle/libs.versions.toml | 8 ++------ scripts/libs.versions.toml | 8 ++------ scripts/updateDeps.sh | 4 ++-- 8 files changed, 16 insertions(+), 44 deletions(-) diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index 021353d05..05de117ed 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -7,10 +7,8 @@ accompanist = "0.37.0" androidGradlePlugin = "8.7.3" androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" -androidx-benchmark = "1.2.4" -androidx-benchmark-junit4 = "1.2.4" androidx-compose-bom = "2024.12.01" -androidx-constraintlayout = "1.1.0-alpha13" +androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" androidx-glance = "1.1.0" @@ -29,7 +27,7 @@ androidx-wear-compose = "1.3.1" androidx-window = "1.3.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" -coil = "2.6.0" +coil = "2.7.0" # @keep compileSdk = "35" coroutines = "1.9.0" @@ -66,8 +64,6 @@ accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiper androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } -androidx-benchmark-macrobenchmark = { module = "androidx.benchmark:benchmark-macro", version.ref = "androidx-benchmark" } -androidx-benchmark-macrobenchmark-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark-junit4" } androidx-compose-animation = { module = "androidx.compose.animation:animation" } androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" } androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index 021353d05..05de117ed 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -7,10 +7,8 @@ accompanist = "0.37.0" androidGradlePlugin = "8.7.3" androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" -androidx-benchmark = "1.2.4" -androidx-benchmark-junit4 = "1.2.4" androidx-compose-bom = "2024.12.01" -androidx-constraintlayout = "1.1.0-alpha13" +androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" androidx-glance = "1.1.0" @@ -29,7 +27,7 @@ androidx-wear-compose = "1.3.1" androidx-window = "1.3.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" -coil = "2.6.0" +coil = "2.7.0" # @keep compileSdk = "35" coroutines = "1.9.0" @@ -66,8 +64,6 @@ accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiper androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } -androidx-benchmark-macrobenchmark = { module = "androidx.benchmark:benchmark-macro", version.ref = "androidx-benchmark" } -androidx-benchmark-macrobenchmark-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark-junit4" } androidx-compose-animation = { module = "androidx.compose.animation:animation" } androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" } androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index 021353d05..05de117ed 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -7,10 +7,8 @@ accompanist = "0.37.0" androidGradlePlugin = "8.7.3" androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" -androidx-benchmark = "1.2.4" -androidx-benchmark-junit4 = "1.2.4" androidx-compose-bom = "2024.12.01" -androidx-constraintlayout = "1.1.0-alpha13" +androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" androidx-glance = "1.1.0" @@ -29,7 +27,7 @@ androidx-wear-compose = "1.3.1" androidx-window = "1.3.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" -coil = "2.6.0" +coil = "2.7.0" # @keep compileSdk = "35" coroutines = "1.9.0" @@ -66,8 +64,6 @@ accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiper androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } -androidx-benchmark-macrobenchmark = { module = "androidx.benchmark:benchmark-macro", version.ref = "androidx-benchmark" } -androidx-benchmark-macrobenchmark-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark-junit4" } androidx-compose-animation = { module = "androidx.compose.animation:animation" } androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" } androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index 021353d05..05de117ed 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -7,10 +7,8 @@ accompanist = "0.37.0" androidGradlePlugin = "8.7.3" androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" -androidx-benchmark = "1.2.4" -androidx-benchmark-junit4 = "1.2.4" androidx-compose-bom = "2024.12.01" -androidx-constraintlayout = "1.1.0-alpha13" +androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" androidx-glance = "1.1.0" @@ -29,7 +27,7 @@ androidx-wear-compose = "1.3.1" androidx-window = "1.3.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" -coil = "2.6.0" +coil = "2.7.0" # @keep compileSdk = "35" coroutines = "1.9.0" @@ -66,8 +64,6 @@ accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiper androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } -androidx-benchmark-macrobenchmark = { module = "androidx.benchmark:benchmark-macro", version.ref = "androidx-benchmark" } -androidx-benchmark-macrobenchmark-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark-junit4" } androidx-compose-animation = { module = "androidx.compose.animation:animation" } androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" } androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index 021353d05..05de117ed 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -7,10 +7,8 @@ accompanist = "0.37.0" androidGradlePlugin = "8.7.3" androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" -androidx-benchmark = "1.2.4" -androidx-benchmark-junit4 = "1.2.4" androidx-compose-bom = "2024.12.01" -androidx-constraintlayout = "1.1.0-alpha13" +androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" androidx-glance = "1.1.0" @@ -29,7 +27,7 @@ androidx-wear-compose = "1.3.1" androidx-window = "1.3.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" -coil = "2.6.0" +coil = "2.7.0" # @keep compileSdk = "35" coroutines = "1.9.0" @@ -66,8 +64,6 @@ accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiper androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } -androidx-benchmark-macrobenchmark = { module = "androidx.benchmark:benchmark-macro", version.ref = "androidx-benchmark" } -androidx-benchmark-macrobenchmark-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark-junit4" } androidx-compose-animation = { module = "androidx.compose.animation:animation" } androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" } androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index 021353d05..05de117ed 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -7,10 +7,8 @@ accompanist = "0.37.0" androidGradlePlugin = "8.7.3" androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" -androidx-benchmark = "1.2.4" -androidx-benchmark-junit4 = "1.2.4" androidx-compose-bom = "2024.12.01" -androidx-constraintlayout = "1.1.0-alpha13" +androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" androidx-glance = "1.1.0" @@ -29,7 +27,7 @@ androidx-wear-compose = "1.3.1" androidx-window = "1.3.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" -coil = "2.6.0" +coil = "2.7.0" # @keep compileSdk = "35" coroutines = "1.9.0" @@ -66,8 +64,6 @@ accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiper androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } -androidx-benchmark-macrobenchmark = { module = "androidx.benchmark:benchmark-macro", version.ref = "androidx-benchmark" } -androidx-benchmark-macrobenchmark-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark-junit4" } androidx-compose-animation = { module = "androidx.compose.animation:animation" } androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" } androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml index 021353d05..05de117ed 100644 --- a/scripts/libs.versions.toml +++ b/scripts/libs.versions.toml @@ -7,10 +7,8 @@ accompanist = "0.37.0" androidGradlePlugin = "8.7.3" androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" -androidx-benchmark = "1.2.4" -androidx-benchmark-junit4 = "1.2.4" androidx-compose-bom = "2024.12.01" -androidx-constraintlayout = "1.1.0-alpha13" +androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" androidx-glance = "1.1.0" @@ -29,7 +27,7 @@ androidx-wear-compose = "1.3.1" androidx-window = "1.3.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" -coil = "2.6.0" +coil = "2.7.0" # @keep compileSdk = "35" coroutines = "1.9.0" @@ -66,8 +64,6 @@ accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiper androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } -androidx-benchmark-macrobenchmark = { module = "androidx.benchmark:benchmark-macro", version.ref = "androidx-benchmark" } -androidx-benchmark-macrobenchmark-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark-junit4" } androidx-compose-animation = { module = "androidx.compose.animation:animation" } androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" } androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } diff --git a/scripts/updateDeps.sh b/scripts/updateDeps.sh index c23e552ee..02a32bc0c 100755 --- a/scripts/updateDeps.sh +++ b/scripts/updateDeps.sh @@ -26,7 +26,7 @@ set -xe -./Reply/gradlew -p ./Reply versionCatalogUpdate +./Jetsnack/gradlew -p ./Jetsnack versionCatalogUpdate -cp Reply/gradle/libs.versions.toml scripts/libs.versions.toml +cp Jetsnack/gradle/libs.versions.toml scripts/libs.versions.toml ./scripts/duplicate_version_config.sh From 3b079f59fddd9cd29ee19c6a0a4cdb5e2557f23b Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Thu, 19 Dec 2024 13:40:27 +0000 Subject: [PATCH 3/7] Use Jetcaster as source of truth --- JetLagged/gradle/libs.versions.toml | 22 +++++++++++----------- JetNews/gradle/libs.versions.toml | 22 +++++++++++----------- Jetcaster/gradle/libs.versions.toml | 22 +++++++++++----------- Jetchat/gradle/libs.versions.toml | 22 +++++++++++----------- Jetsnack/gradle/libs.versions.toml | 22 +++++++++++----------- Reply/gradle/libs.versions.toml | 22 +++++++++++----------- scripts/libs.versions.toml | 22 +++++++++++----------- scripts/updateDeps.sh | 4 ++-- 8 files changed, 79 insertions(+), 79 deletions(-) diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index 05de117ed..aa6e4f6be 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -11,7 +11,7 @@ androidx-compose-bom = "2024.12.01" androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" -androidx-glance = "1.1.0" +androidx-glance = "1.1.1" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.8.7" androidx-lifecycle-runtime-compose = "2.8.7" @@ -20,10 +20,10 @@ androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" androidx-test-ext-junit = "1.2.1" -androidx-test-ext-truth = "1.5.0" +androidx-test-ext-truth = "1.6.0" androidx-tv-foundation = "1.0.0-alpha11" androidx-tv-material = "1.0.0" -androidx-wear-compose = "1.3.1" +androidx-wear-compose = "1.4.0" androidx-window = "1.3.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" @@ -33,25 +33,25 @@ compileSdk = "35" coroutines = "1.9.0" google-maps = "18.2.0" gradle-versions = "0.51.0" -hilt = "2.51.1" +hilt = "2.53.1" hiltExt = "1.2.0" -horologist = "0.6.19" +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 jdkDesugar = "1.2.2" junit = "4.13.2" kotlin = "2.1.0" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" -ksp = "2.0.20-1.0.24" +ksp = "2.1.0-1.0.29" maps-compose = "3.1.1" # @keep minSdk = "21" -okhttp = "4.11.0" +okhttp = "4.12.0" play-services-wearable = "18.1.0" -robolectric = "4.13" -roborazzi = "1.12.0" -rome = "1.18.0" -room = "2.6.0" +robolectric = "4.14.1" +roborazzi = "1.37.0" +rome = "2.1.0" +room = "2.6.1" secrets = "2.0.1" # @keep targetSdk = "33" diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index 05de117ed..aa6e4f6be 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -11,7 +11,7 @@ androidx-compose-bom = "2024.12.01" androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" -androidx-glance = "1.1.0" +androidx-glance = "1.1.1" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.8.7" androidx-lifecycle-runtime-compose = "2.8.7" @@ -20,10 +20,10 @@ androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" androidx-test-ext-junit = "1.2.1" -androidx-test-ext-truth = "1.5.0" +androidx-test-ext-truth = "1.6.0" androidx-tv-foundation = "1.0.0-alpha11" androidx-tv-material = "1.0.0" -androidx-wear-compose = "1.3.1" +androidx-wear-compose = "1.4.0" androidx-window = "1.3.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" @@ -33,25 +33,25 @@ compileSdk = "35" coroutines = "1.9.0" google-maps = "18.2.0" gradle-versions = "0.51.0" -hilt = "2.51.1" +hilt = "2.53.1" hiltExt = "1.2.0" -horologist = "0.6.19" +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 jdkDesugar = "1.2.2" junit = "4.13.2" kotlin = "2.1.0" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" -ksp = "2.0.20-1.0.24" +ksp = "2.1.0-1.0.29" maps-compose = "3.1.1" # @keep minSdk = "21" -okhttp = "4.11.0" +okhttp = "4.12.0" play-services-wearable = "18.1.0" -robolectric = "4.13" -roborazzi = "1.12.0" -rome = "1.18.0" -room = "2.6.0" +robolectric = "4.14.1" +roborazzi = "1.37.0" +rome = "2.1.0" +room = "2.6.1" secrets = "2.0.1" # @keep targetSdk = "33" diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index 05de117ed..aa6e4f6be 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -11,7 +11,7 @@ androidx-compose-bom = "2024.12.01" androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" -androidx-glance = "1.1.0" +androidx-glance = "1.1.1" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.8.7" androidx-lifecycle-runtime-compose = "2.8.7" @@ -20,10 +20,10 @@ androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" androidx-test-ext-junit = "1.2.1" -androidx-test-ext-truth = "1.5.0" +androidx-test-ext-truth = "1.6.0" androidx-tv-foundation = "1.0.0-alpha11" androidx-tv-material = "1.0.0" -androidx-wear-compose = "1.3.1" +androidx-wear-compose = "1.4.0" androidx-window = "1.3.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" @@ -33,25 +33,25 @@ compileSdk = "35" coroutines = "1.9.0" google-maps = "18.2.0" gradle-versions = "0.51.0" -hilt = "2.51.1" +hilt = "2.53.1" hiltExt = "1.2.0" -horologist = "0.6.19" +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 jdkDesugar = "1.2.2" junit = "4.13.2" kotlin = "2.1.0" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" -ksp = "2.0.20-1.0.24" +ksp = "2.1.0-1.0.29" maps-compose = "3.1.1" # @keep minSdk = "21" -okhttp = "4.11.0" +okhttp = "4.12.0" play-services-wearable = "18.1.0" -robolectric = "4.13" -roborazzi = "1.12.0" -rome = "1.18.0" -room = "2.6.0" +robolectric = "4.14.1" +roborazzi = "1.37.0" +rome = "2.1.0" +room = "2.6.1" secrets = "2.0.1" # @keep targetSdk = "33" diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index 05de117ed..aa6e4f6be 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -11,7 +11,7 @@ androidx-compose-bom = "2024.12.01" androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" -androidx-glance = "1.1.0" +androidx-glance = "1.1.1" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.8.7" androidx-lifecycle-runtime-compose = "2.8.7" @@ -20,10 +20,10 @@ androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" androidx-test-ext-junit = "1.2.1" -androidx-test-ext-truth = "1.5.0" +androidx-test-ext-truth = "1.6.0" androidx-tv-foundation = "1.0.0-alpha11" androidx-tv-material = "1.0.0" -androidx-wear-compose = "1.3.1" +androidx-wear-compose = "1.4.0" androidx-window = "1.3.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" @@ -33,25 +33,25 @@ compileSdk = "35" coroutines = "1.9.0" google-maps = "18.2.0" gradle-versions = "0.51.0" -hilt = "2.51.1" +hilt = "2.53.1" hiltExt = "1.2.0" -horologist = "0.6.19" +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 jdkDesugar = "1.2.2" junit = "4.13.2" kotlin = "2.1.0" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" -ksp = "2.0.20-1.0.24" +ksp = "2.1.0-1.0.29" maps-compose = "3.1.1" # @keep minSdk = "21" -okhttp = "4.11.0" +okhttp = "4.12.0" play-services-wearable = "18.1.0" -robolectric = "4.13" -roborazzi = "1.12.0" -rome = "1.18.0" -room = "2.6.0" +robolectric = "4.14.1" +roborazzi = "1.37.0" +rome = "2.1.0" +room = "2.6.1" secrets = "2.0.1" # @keep targetSdk = "33" diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index 05de117ed..aa6e4f6be 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -11,7 +11,7 @@ androidx-compose-bom = "2024.12.01" androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" -androidx-glance = "1.1.0" +androidx-glance = "1.1.1" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.8.7" androidx-lifecycle-runtime-compose = "2.8.7" @@ -20,10 +20,10 @@ androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" androidx-test-ext-junit = "1.2.1" -androidx-test-ext-truth = "1.5.0" +androidx-test-ext-truth = "1.6.0" androidx-tv-foundation = "1.0.0-alpha11" androidx-tv-material = "1.0.0" -androidx-wear-compose = "1.3.1" +androidx-wear-compose = "1.4.0" androidx-window = "1.3.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" @@ -33,25 +33,25 @@ compileSdk = "35" coroutines = "1.9.0" google-maps = "18.2.0" gradle-versions = "0.51.0" -hilt = "2.51.1" +hilt = "2.53.1" hiltExt = "1.2.0" -horologist = "0.6.19" +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 jdkDesugar = "1.2.2" junit = "4.13.2" kotlin = "2.1.0" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" -ksp = "2.0.20-1.0.24" +ksp = "2.1.0-1.0.29" maps-compose = "3.1.1" # @keep minSdk = "21" -okhttp = "4.11.0" +okhttp = "4.12.0" play-services-wearable = "18.1.0" -robolectric = "4.13" -roborazzi = "1.12.0" -rome = "1.18.0" -room = "2.6.0" +robolectric = "4.14.1" +roborazzi = "1.37.0" +rome = "2.1.0" +room = "2.6.1" secrets = "2.0.1" # @keep targetSdk = "33" diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index 05de117ed..aa6e4f6be 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -11,7 +11,7 @@ androidx-compose-bom = "2024.12.01" androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" -androidx-glance = "1.1.0" +androidx-glance = "1.1.1" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.8.7" androidx-lifecycle-runtime-compose = "2.8.7" @@ -20,10 +20,10 @@ androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" androidx-test-ext-junit = "1.2.1" -androidx-test-ext-truth = "1.5.0" +androidx-test-ext-truth = "1.6.0" androidx-tv-foundation = "1.0.0-alpha11" androidx-tv-material = "1.0.0" -androidx-wear-compose = "1.3.1" +androidx-wear-compose = "1.4.0" androidx-window = "1.3.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" @@ -33,25 +33,25 @@ compileSdk = "35" coroutines = "1.9.0" google-maps = "18.2.0" gradle-versions = "0.51.0" -hilt = "2.51.1" +hilt = "2.53.1" hiltExt = "1.2.0" -horologist = "0.6.19" +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 jdkDesugar = "1.2.2" junit = "4.13.2" kotlin = "2.1.0" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" -ksp = "2.0.20-1.0.24" +ksp = "2.1.0-1.0.29" maps-compose = "3.1.1" # @keep minSdk = "21" -okhttp = "4.11.0" +okhttp = "4.12.0" play-services-wearable = "18.1.0" -robolectric = "4.13" -roborazzi = "1.12.0" -rome = "1.18.0" -room = "2.6.0" +robolectric = "4.14.1" +roborazzi = "1.37.0" +rome = "2.1.0" +room = "2.6.1" secrets = "2.0.1" # @keep targetSdk = "33" diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml index 05de117ed..aa6e4f6be 100644 --- a/scripts/libs.versions.toml +++ b/scripts/libs.versions.toml @@ -11,7 +11,7 @@ androidx-compose-bom = "2024.12.01" androidx-constraintlayout = "1.1.0" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.15.0" -androidx-glance = "1.1.0" +androidx-glance = "1.1.1" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.8.7" androidx-lifecycle-runtime-compose = "2.8.7" @@ -20,10 +20,10 @@ androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" androidx-test-ext-junit = "1.2.1" -androidx-test-ext-truth = "1.5.0" +androidx-test-ext-truth = "1.6.0" androidx-tv-foundation = "1.0.0-alpha11" androidx-tv-material = "1.0.0" -androidx-wear-compose = "1.3.1" +androidx-wear-compose = "1.4.0" androidx-window = "1.3.0" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" @@ -33,25 +33,25 @@ compileSdk = "35" coroutines = "1.9.0" google-maps = "18.2.0" gradle-versions = "0.51.0" -hilt = "2.51.1" +hilt = "2.53.1" hiltExt = "1.2.0" -horologist = "0.6.19" +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 jdkDesugar = "1.2.2" junit = "4.13.2" kotlin = "2.1.0" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" -ksp = "2.0.20-1.0.24" +ksp = "2.1.0-1.0.29" maps-compose = "3.1.1" # @keep minSdk = "21" -okhttp = "4.11.0" +okhttp = "4.12.0" play-services-wearable = "18.1.0" -robolectric = "4.13" -roborazzi = "1.12.0" -rome = "1.18.0" -room = "2.6.0" +robolectric = "4.14.1" +roborazzi = "1.37.0" +rome = "2.1.0" +room = "2.6.1" secrets = "2.0.1" # @keep targetSdk = "33" diff --git a/scripts/updateDeps.sh b/scripts/updateDeps.sh index 02a32bc0c..d0fc36d77 100755 --- a/scripts/updateDeps.sh +++ b/scripts/updateDeps.sh @@ -26,7 +26,7 @@ set -xe -./Jetsnack/gradlew -p ./Jetsnack versionCatalogUpdate +./Jetcaster/gradlew -p ./Jetcaster versionCatalogUpdate -cp Jetsnack/gradle/libs.versions.toml scripts/libs.versions.toml +cp Jetcaster/gradle/libs.versions.toml scripts/libs.versions.toml ./scripts/duplicate_version_config.sh From 41830dcd056ff5785523ce0f4d40dd2875d5d28f Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Thu, 19 Dec 2024 14:59:22 +0000 Subject: [PATCH 4/7] Remove Swipe to dismiss on JetNews, replace with PullToRefresh --- JetLagged/gradle/libs.versions.toml | 1 - JetNews/app/build.gradle.kts | 2 -- .../example/jetnews/ui/home/HomeScreens.kt | 33 +++++++++++++++---- JetNews/gradle/libs.versions.toml | 1 - Jetcaster/gradle/libs.versions.toml | 1 - Jetchat/gradle/libs.versions.toml | 1 - Jetsnack/gradle/libs.versions.toml | 1 - Reply/gradle/libs.versions.toml | 1 - scripts/libs.versions.toml | 1 - 9 files changed, 26 insertions(+), 16 deletions(-) diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index aa6e4f6be..f6a54e568 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -60,7 +60,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } -accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } diff --git a/JetNews/app/build.gradle.kts b/JetNews/app/build.gradle.kts index 725b9f48c..f8bb76ed5 100644 --- a/JetNews/app/build.gradle.kts +++ b/JetNews/app/build.gradle.kts @@ -99,8 +99,6 @@ dependencies { debugImplementation(libs.androidx.compose.ui.test.manifest) debugImplementation(libs.androidx.compose.ui.tooling) - implementation(libs.accompanist.swiperefresh) - implementation(libs.androidx.appcompat) implementation(libs.androidx.activity.ktx) implementation(libs.androidx.core.ktx) diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreens.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreens.kt index d898962be..68ce0350c 100644 --- a/JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreens.kt +++ b/JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreens.kt @@ -67,6 +67,10 @@ import androidx.compose.material3.TextButton import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarScrollBehavior import androidx.compose.material3.TopAppBarState +import androidx.compose.material3.pulltorefresh.PullToRefreshBox +import androidx.compose.material3.pulltorefresh.PullToRefreshDefaults.Indicator +import androidx.compose.material3.pulltorefresh.PullToRefreshState +import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState import androidx.compose.material3.rememberTopAppBarState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -110,8 +114,6 @@ import com.example.jetnews.ui.utils.BookmarkButton import com.example.jetnews.ui.utils.FavoriteButton import com.example.jetnews.ui.utils.ShareButton import com.example.jetnews.ui.utils.TextSettingsButton -import com.google.accompanist.swiperefresh.SwipeRefresh -import com.google.accompanist.swiperefresh.rememberSwipeRefreshState import kotlinx.coroutines.currentCoroutineContext import kotlinx.coroutines.isActive import kotlinx.coroutines.runBlocking @@ -306,6 +308,7 @@ private fun HomeScreenWithList( val contentModifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection) LoadingContent( + modifier = Modifier.padding(innerPadding), empty = when (uiState) { is HomeUiState.HasPosts -> false is HomeUiState.NoPosts -> uiState.isLoading @@ -317,12 +320,15 @@ private fun HomeScreenWithList( when (uiState) { is HomeUiState.HasPosts -> hasPostsContent(uiState, innerPadding, contentModifier) + is HomeUiState.NoPosts -> { if (uiState.errorMessages.isEmpty()) { // if there are no posts, and no error, let the user refresh manually TextButton( onClick = onRefreshPosts, - modifier.padding(innerPadding).fillMaxSize() + modifier + .padding(innerPadding) + .fillMaxSize() ) { Text( stringResource(id = R.string.home_tap_to_load_content), @@ -383,21 +389,34 @@ private fun HomeScreenWithList( * @param onRefresh (event) event to request refresh * @param content (slot) the main content to show */ +@OptIn(ExperimentalMaterial3Api::class) @Composable private fun LoadingContent( empty: Boolean, emptyContent: @Composable () -> Unit, loading: Boolean, onRefresh: () -> Unit, - content: @Composable () -> Unit + content: @Composable () -> Unit, + modifier : Modifier = Modifier ) { if (empty) { emptyContent() } else { - SwipeRefresh( - state = rememberSwipeRefreshState(loading), + val refreshState = rememberPullToRefreshState() + PullToRefreshBox( + isRefreshing = loading, onRefresh = onRefresh, - content = content, + content = { content() }, + state = refreshState, + indicator = { + Indicator( + modifier = modifier + .align(Alignment.TopCenter) + .padding(), + isRefreshing = loading, + state = refreshState + ) + } ) } } diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index aa6e4f6be..f6a54e568 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -60,7 +60,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } -accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index aa6e4f6be..f6a54e568 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -60,7 +60,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } -accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index aa6e4f6be..f6a54e568 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -60,7 +60,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } -accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index aa6e4f6be..f6a54e568 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -60,7 +60,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } -accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index aa6e4f6be..f6a54e568 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -60,7 +60,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } -accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml index aa6e4f6be..f6a54e568 100644 --- a/scripts/libs.versions.toml +++ b/scripts/libs.versions.toml @@ -60,7 +60,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } -accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } From 0062e84561c754322d08c5b070a40b41f885515e Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Thu, 19 Dec 2024 15:04:48 +0000 Subject: [PATCH 5/7] Fix formatting --- .../main/java/com/example/jetnews/ui/home/HomeScreens.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreens.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreens.kt index 68ce0350c..0a1722a91 100644 --- a/JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreens.kt +++ b/JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreens.kt @@ -52,8 +52,8 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Search import androidx.compose.material3.CenterAlignedTopAppBar import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.Divider import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -397,7 +397,7 @@ private fun LoadingContent( loading: Boolean, onRefresh: () -> Unit, content: @Composable () -> Unit, - modifier : Modifier = Modifier + modifier: Modifier = Modifier ) { if (empty) { emptyContent() @@ -601,7 +601,7 @@ private fun PostListHistorySection( */ @Composable private fun PostListDivider() { - Divider( + HorizontalDivider( modifier = Modifier.padding(horizontal = 14.dp), color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.08f) ) From 85fca39deb58093a3de6b10b7ce6159cd703f813 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Thu, 19 Dec 2024 15:10:29 +0000 Subject: [PATCH 6/7] fix formatting --- .../app/src/main/java/com/example/jetnews/ui/home/HomeScreens.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreens.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreens.kt index 0a1722a91..113e8f790 100644 --- a/JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreens.kt +++ b/JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreens.kt @@ -69,7 +69,6 @@ import androidx.compose.material3.TopAppBarScrollBehavior import androidx.compose.material3.TopAppBarState import androidx.compose.material3.pulltorefresh.PullToRefreshBox import androidx.compose.material3.pulltorefresh.PullToRefreshDefaults.Indicator -import androidx.compose.material3.pulltorefresh.PullToRefreshState import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState import androidx.compose.material3.rememberTopAppBarState import androidx.compose.runtime.Composable From 7da743b138a2b4e9700e1e7a161f3884352d38b8 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Thu, 19 Dec 2024 16:04:26 +0000 Subject: [PATCH 7/7] downgrade rome --- JetLagged/gradle/libs.versions.toml | 2 +- JetNews/gradle/libs.versions.toml | 2 +- Jetcaster/gradle/libs.versions.toml | 2 +- Jetchat/gradle/libs.versions.toml | 2 +- Jetsnack/gradle/libs.versions.toml | 2 +- Reply/gradle/libs.versions.toml | 2 +- scripts/libs.versions.toml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index f6a54e568..d8c03af8f 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -50,7 +50,7 @@ okhttp = "4.12.0" play-services-wearable = "18.1.0" robolectric = "4.14.1" roborazzi = "1.37.0" -rome = "2.1.0" +rome = "1.18.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 f6a54e568..d8c03af8f 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -50,7 +50,7 @@ okhttp = "4.12.0" play-services-wearable = "18.1.0" robolectric = "4.14.1" roborazzi = "1.37.0" -rome = "2.1.0" +rome = "1.18.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 f6a54e568..d8c03af8f 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -50,7 +50,7 @@ okhttp = "4.12.0" play-services-wearable = "18.1.0" robolectric = "4.14.1" roborazzi = "1.37.0" -rome = "2.1.0" +rome = "1.18.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 f6a54e568..d8c03af8f 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -50,7 +50,7 @@ okhttp = "4.12.0" play-services-wearable = "18.1.0" robolectric = "4.14.1" roborazzi = "1.37.0" -rome = "2.1.0" +rome = "1.18.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 f6a54e568..d8c03af8f 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -50,7 +50,7 @@ okhttp = "4.12.0" play-services-wearable = "18.1.0" robolectric = "4.14.1" roborazzi = "1.37.0" -rome = "2.1.0" +rome = "1.18.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 f6a54e568..d8c03af8f 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -50,7 +50,7 @@ okhttp = "4.12.0" play-services-wearable = "18.1.0" robolectric = "4.14.1" roborazzi = "1.37.0" -rome = "2.1.0" +rome = "1.18.0" room = "2.6.1" secrets = "2.0.1" # @keep diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml index f6a54e568..d8c03af8f 100644 --- a/scripts/libs.versions.toml +++ b/scripts/libs.versions.toml @@ -50,7 +50,7 @@ okhttp = "4.12.0" play-services-wearable = "18.1.0" robolectric = "4.14.1" roborazzi = "1.37.0" -rome = "2.1.0" +rome = "1.18.0" room = "2.6.1" secrets = "2.0.1" # @keep