From 5b54c0524b9303204a13493e8d844ed7e4c91c0f Mon Sep 17 00:00:00 2001 From: compose-devrel-github-bot Date: Thu, 18 Apr 2024 13:10:15 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A4=96=20Update=20Dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Crane/gradle/libs.versions.toml | 8 +-- JetLagged/gradle/libs.versions.toml | 8 +-- JetNews/gradle/libs.versions.toml | 8 +-- Jetcaster/gradle/libs.versions.toml | 88 ++++++----------------------- Jetchat/gradle/libs.versions.toml | 8 +-- Jetsnack/gradle/libs.versions.toml | 8 +-- Jetsurvey/gradle/libs.versions.toml | 8 +-- Owl/gradle/libs.versions.toml | 8 +-- Reply/gradle/libs.versions.toml | 8 +-- scripts/libs.versions.toml | 8 +-- 10 files changed, 54 insertions(+), 106 deletions(-) diff --git a/Crane/gradle/libs.versions.toml b/Crane/gradle/libs.versions.toml index 4231a34163..e6b58c6544 100644 --- a/Crane/gradle/libs.versions.toml +++ b/Crane/gradle/libs.versions.toml @@ -4,14 +4,14 @@ ##### [versions] accompanist = "0.34.0" -androidGradlePlugin = "8.3.1" -androidx-activity-compose = "1.8.2" +androidGradlePlugin = "8.3.2" +androidx-activity-compose = "1.9.0" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.04.00" +androidx-compose-bom = "2024.04.01" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-rc01" +androidx-corektx = "1.13.0" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index 4231a34163..e6b58c6544 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -4,14 +4,14 @@ ##### [versions] accompanist = "0.34.0" -androidGradlePlugin = "8.3.1" -androidx-activity-compose = "1.8.2" +androidGradlePlugin = "8.3.2" +androidx-activity-compose = "1.9.0" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.04.00" +androidx-compose-bom = "2024.04.01" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-rc01" +androidx-corektx = "1.13.0" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index 4231a34163..e6b58c6544 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -4,14 +4,14 @@ ##### [versions] accompanist = "0.34.0" -androidGradlePlugin = "8.3.1" -androidx-activity-compose = "1.8.2" +androidGradlePlugin = "8.3.2" +androidx-activity-compose = "1.9.0" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.04.00" +androidx-compose-bom = "2024.04.01" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-rc01" +androidx-corektx = "1.13.0" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index 9e2e8a8c9a..e6b58c6544 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -4,17 +4,15 @@ ##### [versions] accompanist = "0.34.0" -androidGradlePlugin = "8.3.1" -androidx-activity-compose = "1.8.2" +androidGradlePlugin = "8.3.2" +androidx-activity-compose = "1.9.0" androidx-appcompat = "1.6.1" -androidx-benchmark = "1.2.3" -androidx-benchmark-junit4 = "1.2.3" -androidx-compose-bom = "2024.04.00" -androidx-compose-material3-adaptive = "1.0.0-alpha10" +androidx-benchmark = "1.2.0" +androidx-benchmark-junit4 = "1.2.1" +androidx-compose-bom = "2024.04.01" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-rc01" +androidx-corektx = "1.13.0" androidx-glance = "1.0.0" -androidx-lifecycle-runtime = "2.7.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" androidx-navigation = "2.7.7" @@ -23,22 +21,20 @@ androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-tv-foundation = "1.0.0-alpha10" -androidx-tv-material = "1.0.0-alpha10" androidx-window = "1.3.0-beta01" -androidxHiltNavigationCompose = "1.2.0" -androix-test-uiautomator = "2.3.0" -coil = "2.5.0" +androidxHiltNavigationCompose = "1.1.0" +androix-test-uiautomator = "2.2.0" +coil = "2.4.0" # @keep compileSdk = "34" compose-compiler = "1.5.4" coroutines = "1.8.0" google-maps = "18.2.0" gradle-versions = "0.51.0" -hilt = "2.51" -hiltExt = "1.2.0" +hilt = "2.48.1" +hiltExt = "1.1.0" # @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 = "2.0.4" +jdkDesugar = "1.2.2" junit = "4.13.2" # @pin Update in conjuction with Compose Compiler kotlin = "1.9.20" @@ -48,25 +44,14 @@ maps-compose = "3.1.1" material = "1.11.0" # @keep minSdk = "21" -okhttp = "4.12.0" +okhttp = "4.11.0" robolectric = "4.12.1" rome = "1.18.0" -room = "2.6.1" +room = "2.6.0" secrets = "2.0.1" # @keep targetSdk = "33" version-catalog-update = "0.8.4" -playServicesWearable = "18.1.0" -composeMaterial = "1.2.1" -composeFoundation = "1.2.1" -coreSplashscreen = "1.0.1" -horologistComposeTools = "0.4.8" -horologist = "0.6.6" -roborazzi = "1.11.0" -androidx-wear-compose = "1.3.0" -wear-compose-ui-tooling = "1.3.0" -ui-test-manifest = "1.6.3" -ui-test-junit4 = "1.6.3" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } @@ -84,20 +69,17 @@ 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" } androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" } +androidx-compose-material = { module = "androidx.compose.material:material" } androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended" } androidx-compose-material3 = { module = "androidx.compose.material3:material3" } -androidx-compose-material3-adaptive = { group = "androidx.compose.material3.adaptive", name = "adaptive", version.ref = "androidx-compose-material3-adaptive" } -androidx-compose-material3-adaptive-layout = { group = "androidx.compose.material3.adaptive", name = "adaptive-layout", version.ref = "androidx-compose-material3-adaptive" } -androidx-compose-material3-adaptive-navigation = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation", version.ref = "androidx-compose-material3-adaptive" } +androidx-compose-materialWindow = { module = "androidx.compose.material3:material3-window-size-class" } androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" } androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" } -androidx-compose-ui = { module = "androidx.compose.ui:ui"} +androidx-compose-ui = { module = "androidx.compose.ui:ui" } androidx-compose-ui-googlefonts = { module = "androidx.compose.ui:ui-text-google-fonts" } -androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" } androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test" } androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" } androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" } -androidx-compose-ui-text = { module = "androidx.compose.ui:ui-text" } androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" } @@ -109,7 +91,7 @@ androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", versi androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance" } androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" } -androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle-runtime" } +androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha04" androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle-runtime-compose" } androidx-lifecycle-viewModelCompose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle-compose" } androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" } @@ -128,10 +110,7 @@ androidx-test-ext-truth = { module = "androidx.test.ext:truth", version.ref = "a androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" } androidx-test-runner = "androidx.test:runner:1.5.2" androidx-test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androix-test-uiautomator" } -androidx-tv-foundation = { module = "androidx.tv:tv-foundation", version.ref = "androidx-tv-foundation" } -androidx-tv-material = { module = "androidx.tv:tv-material", version.ref = "androidx-tv-material" } androidx-window = { module = "androidx.window:window", version.ref = "androidx-window" } -androidx-window-core = { module = "androidx.window:window-core", version.ref = "androidx-window" } coil-kt-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" } core-jdk-desugaring = { module = "com.android.tools:desugar_jdk_libs", version.ref = "jdkDesugar" } google-android-material = { module = "com.google.android.material:material", version.ref = "material" } @@ -140,7 +119,6 @@ googlemaps-maps = { module = "com.google.android.gms:play-services-maps", versio hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" } hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" } hilt-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" } -dagger-hiltandroidplugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" } hilt-ext-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hiltExt" } junit = { module = "junit:junit", version.ref = "junit" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } @@ -152,39 +130,10 @@ okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" } robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" } rometools-modules = { module = "com.rometools:rome-modules", version.ref = "rome" } rometools-rome = { module = "com.rometools:rome", version.ref = "rome" } -play-services-wearable = { group = "com.google.android.gms", name = "play-services-wearable", version.ref = "playServicesWearable" } -compose-material = { group = "androidx.wear.compose", name = "compose-material", version.ref = "composeMaterial" } -compose-foundation = { group = "androidx.wear.compose", name = "compose-foundation", version.ref = "composeFoundation" } -androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "coreSplashscreen" } -horologist-compose-tools = { group = "com.google.android.horologist", name = "horologist-compose-tools", version.ref = "horologistComposeTools" } -horologist-composables = { module = "com.google.android.horologist:horologist-composables", version.ref = "horologist" } -horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" } -horologist-compose-material = { module = "com.google.android.horologist:horologist-compose-material", version.ref = "horologist" } -horologist-media-ui = { module = "com.google.android.horologist:horologist-media-ui", version.ref = "horologist" } -horologist-audio-ui = { module = "com.google.android.horologist:horologist-audio-ui", version.ref = "horologist" } -horologist-media-data = { module = "com.google.android.horologist:horologist-media-data", version.ref = "horologist" } -horologist-images-coil = { module = "com.google.android.horologist:horologist-images-coil", version.ref = "horologist" } -horologist-roboscreenshots = { module = "com.google.android.horologist:horologist-roboscreenshots", version.ref = "horologist" } -roborazzi = { group = "io.github.takahirom.roborazzi", name = "roborazzi", version.ref = "roborazzi" } -roborazzi-compose = { group = "io.github.takahirom.roborazzi", name = "roborazzi-compose", version.ref = "roborazzi" } -roborazzi-rule = { group = "io.github.takahirom.roborazzi", name = "roborazzi-junit-rule", version.ref = "roborazzi" } -androidx-splashscreen = "androidx.core:core-splashscreen:1.0.1" -wear-compose-foundation = { module = "androidx.wear.compose:compose-foundation", version.ref = "androidx-wear-compose" } -wear-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "androidx-wear-compose" } -wear-compose-navigation = { module = "androidx.wear.compose:compose-navigation", version.ref = "androidx-wear-compose" } -androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core" } -androidx-wear-compose-ui-tooling = { module = "androidx.wear.compose:compose-ui-tooling", version.ref = "wear-compose-ui-tooling" } -compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } -androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "ui-test-manifest" } -androidx-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "ui-test-junit4" } -test-ext-junit = "androidx.test.ext:junit:1.1.5" -test-espresso-core = "androidx.test.espresso:espresso-core:3.5.1" -compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" } [plugins] android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" } -android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" } gradle-versions = { id = "com.github.ben-manes.versions", version.ref = "gradle-versions" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } @@ -193,4 +142,3 @@ kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" } version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "version-catalog-update" } -roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" } diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index 4231a34163..e6b58c6544 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -4,14 +4,14 @@ ##### [versions] accompanist = "0.34.0" -androidGradlePlugin = "8.3.1" -androidx-activity-compose = "1.8.2" +androidGradlePlugin = "8.3.2" +androidx-activity-compose = "1.9.0" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.04.00" +androidx-compose-bom = "2024.04.01" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-rc01" +androidx-corektx = "1.13.0" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index 4231a34163..e6b58c6544 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -4,14 +4,14 @@ ##### [versions] accompanist = "0.34.0" -androidGradlePlugin = "8.3.1" -androidx-activity-compose = "1.8.2" +androidGradlePlugin = "8.3.2" +androidx-activity-compose = "1.9.0" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.04.00" +androidx-compose-bom = "2024.04.01" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-rc01" +androidx-corektx = "1.13.0" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" diff --git a/Jetsurvey/gradle/libs.versions.toml b/Jetsurvey/gradle/libs.versions.toml index 4231a34163..e6b58c6544 100644 --- a/Jetsurvey/gradle/libs.versions.toml +++ b/Jetsurvey/gradle/libs.versions.toml @@ -4,14 +4,14 @@ ##### [versions] accompanist = "0.34.0" -androidGradlePlugin = "8.3.1" -androidx-activity-compose = "1.8.2" +androidGradlePlugin = "8.3.2" +androidx-activity-compose = "1.9.0" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.04.00" +androidx-compose-bom = "2024.04.01" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-rc01" +androidx-corektx = "1.13.0" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" diff --git a/Owl/gradle/libs.versions.toml b/Owl/gradle/libs.versions.toml index 4231a34163..e6b58c6544 100644 --- a/Owl/gradle/libs.versions.toml +++ b/Owl/gradle/libs.versions.toml @@ -4,14 +4,14 @@ ##### [versions] accompanist = "0.34.0" -androidGradlePlugin = "8.3.1" -androidx-activity-compose = "1.8.2" +androidGradlePlugin = "8.3.2" +androidx-activity-compose = "1.9.0" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.04.00" +androidx-compose-bom = "2024.04.01" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-rc01" +androidx-corektx = "1.13.0" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index 4231a34163..e6b58c6544 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -4,14 +4,14 @@ ##### [versions] accompanist = "0.34.0" -androidGradlePlugin = "8.3.1" -androidx-activity-compose = "1.8.2" +androidGradlePlugin = "8.3.2" +androidx-activity-compose = "1.9.0" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.04.00" +androidx-compose-bom = "2024.04.01" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-rc01" +androidx-corektx = "1.13.0" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml index 4231a34163..e6b58c6544 100644 --- a/scripts/libs.versions.toml +++ b/scripts/libs.versions.toml @@ -4,14 +4,14 @@ ##### [versions] accompanist = "0.34.0" -androidGradlePlugin = "8.3.1" -androidx-activity-compose = "1.8.2" +androidGradlePlugin = "8.3.2" +androidx-activity-compose = "1.9.0" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.04.00" +androidx-compose-bom = "2024.04.01" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-rc01" +androidx-corektx = "1.13.0" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" From 339456a3766f4703605edd38e6fd0579f4b25c94 Mon Sep 17 00:00:00 2001 From: Simona Milanovic Date: Thu, 18 Apr 2024 15:05:37 +0100 Subject: [PATCH 2/2] Fix build errors --- Jetcaster/gradle/libs.versions.toml | 88 +++++++++++++++---- .../survey/question/PhotoQuestion.kt | 2 +- 2 files changed, 71 insertions(+), 19 deletions(-) diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index e6b58c6544..9e2e8a8c9a 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -4,15 +4,17 @@ ##### [versions] accompanist = "0.34.0" -androidGradlePlugin = "8.3.2" -androidx-activity-compose = "1.9.0" +androidGradlePlugin = "8.3.1" +androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" -androidx-benchmark = "1.2.0" -androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.04.01" +androidx-benchmark = "1.2.3" +androidx-benchmark-junit4 = "1.2.3" +androidx-compose-bom = "2024.04.00" +androidx-compose-material3-adaptive = "1.0.0-alpha10" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0" +androidx-corektx = "1.13.0-rc01" androidx-glance = "1.0.0" +androidx-lifecycle-runtime = "2.7.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" androidx-navigation = "2.7.7" @@ -21,20 +23,22 @@ androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" +androidx-tv-foundation = "1.0.0-alpha10" +androidx-tv-material = "1.0.0-alpha10" androidx-window = "1.3.0-beta01" -androidxHiltNavigationCompose = "1.1.0" -androix-test-uiautomator = "2.2.0" -coil = "2.4.0" +androidxHiltNavigationCompose = "1.2.0" +androix-test-uiautomator = "2.3.0" +coil = "2.5.0" # @keep compileSdk = "34" compose-compiler = "1.5.4" coroutines = "1.8.0" google-maps = "18.2.0" gradle-versions = "0.51.0" -hilt = "2.48.1" -hiltExt = "1.1.0" +hilt = "2.51" +hiltExt = "1.2.0" # @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" +jdkDesugar = "2.0.4" junit = "4.13.2" # @pin Update in conjuction with Compose Compiler kotlin = "1.9.20" @@ -44,14 +48,25 @@ maps-compose = "3.1.1" material = "1.11.0" # @keep minSdk = "21" -okhttp = "4.11.0" +okhttp = "4.12.0" robolectric = "4.12.1" rome = "1.18.0" -room = "2.6.0" +room = "2.6.1" secrets = "2.0.1" # @keep targetSdk = "33" version-catalog-update = "0.8.4" +playServicesWearable = "18.1.0" +composeMaterial = "1.2.1" +composeFoundation = "1.2.1" +coreSplashscreen = "1.0.1" +horologistComposeTools = "0.4.8" +horologist = "0.6.6" +roborazzi = "1.11.0" +androidx-wear-compose = "1.3.0" +wear-compose-ui-tooling = "1.3.0" +ui-test-manifest = "1.6.3" +ui-test-junit4 = "1.6.3" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } @@ -69,17 +84,20 @@ 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" } androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" } -androidx-compose-material = { module = "androidx.compose.material:material" } androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended" } androidx-compose-material3 = { module = "androidx.compose.material3:material3" } -androidx-compose-materialWindow = { module = "androidx.compose.material3:material3-window-size-class" } +androidx-compose-material3-adaptive = { group = "androidx.compose.material3.adaptive", name = "adaptive", version.ref = "androidx-compose-material3-adaptive" } +androidx-compose-material3-adaptive-layout = { group = "androidx.compose.material3.adaptive", name = "adaptive-layout", version.ref = "androidx-compose-material3-adaptive" } +androidx-compose-material3-adaptive-navigation = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation", version.ref = "androidx-compose-material3-adaptive" } androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" } androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" } -androidx-compose-ui = { module = "androidx.compose.ui:ui" } +androidx-compose-ui = { module = "androidx.compose.ui:ui"} androidx-compose-ui-googlefonts = { module = "androidx.compose.ui:ui-text-google-fonts" } +androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" } androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test" } androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" } androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" } +androidx-compose-ui-text = { module = "androidx.compose.ui:ui-text" } androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" } @@ -91,7 +109,7 @@ androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", versi androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance" } androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" } -androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha04" +androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle-runtime" } androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle-runtime-compose" } androidx-lifecycle-viewModelCompose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle-compose" } androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" } @@ -110,7 +128,10 @@ androidx-test-ext-truth = { module = "androidx.test.ext:truth", version.ref = "a androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" } androidx-test-runner = "androidx.test:runner:1.5.2" androidx-test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androix-test-uiautomator" } +androidx-tv-foundation = { module = "androidx.tv:tv-foundation", version.ref = "androidx-tv-foundation" } +androidx-tv-material = { module = "androidx.tv:tv-material", version.ref = "androidx-tv-material" } androidx-window = { module = "androidx.window:window", version.ref = "androidx-window" } +androidx-window-core = { module = "androidx.window:window-core", version.ref = "androidx-window" } coil-kt-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" } core-jdk-desugaring = { module = "com.android.tools:desugar_jdk_libs", version.ref = "jdkDesugar" } google-android-material = { module = "com.google.android.material:material", version.ref = "material" } @@ -119,6 +140,7 @@ googlemaps-maps = { module = "com.google.android.gms:play-services-maps", versio hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" } hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" } hilt-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" } +dagger-hiltandroidplugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" } hilt-ext-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hiltExt" } junit = { module = "junit:junit", version.ref = "junit" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } @@ -130,10 +152,39 @@ okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" } robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" } rometools-modules = { module = "com.rometools:rome-modules", version.ref = "rome" } rometools-rome = { module = "com.rometools:rome", version.ref = "rome" } +play-services-wearable = { group = "com.google.android.gms", name = "play-services-wearable", version.ref = "playServicesWearable" } +compose-material = { group = "androidx.wear.compose", name = "compose-material", version.ref = "composeMaterial" } +compose-foundation = { group = "androidx.wear.compose", name = "compose-foundation", version.ref = "composeFoundation" } +androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "coreSplashscreen" } +horologist-compose-tools = { group = "com.google.android.horologist", name = "horologist-compose-tools", version.ref = "horologistComposeTools" } +horologist-composables = { module = "com.google.android.horologist:horologist-composables", version.ref = "horologist" } +horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" } +horologist-compose-material = { module = "com.google.android.horologist:horologist-compose-material", version.ref = "horologist" } +horologist-media-ui = { module = "com.google.android.horologist:horologist-media-ui", version.ref = "horologist" } +horologist-audio-ui = { module = "com.google.android.horologist:horologist-audio-ui", version.ref = "horologist" } +horologist-media-data = { module = "com.google.android.horologist:horologist-media-data", version.ref = "horologist" } +horologist-images-coil = { module = "com.google.android.horologist:horologist-images-coil", version.ref = "horologist" } +horologist-roboscreenshots = { module = "com.google.android.horologist:horologist-roboscreenshots", version.ref = "horologist" } +roborazzi = { group = "io.github.takahirom.roborazzi", name = "roborazzi", version.ref = "roborazzi" } +roborazzi-compose = { group = "io.github.takahirom.roborazzi", name = "roborazzi-compose", version.ref = "roborazzi" } +roborazzi-rule = { group = "io.github.takahirom.roborazzi", name = "roborazzi-junit-rule", version.ref = "roborazzi" } +androidx-splashscreen = "androidx.core:core-splashscreen:1.0.1" +wear-compose-foundation = { module = "androidx.wear.compose:compose-foundation", version.ref = "androidx-wear-compose" } +wear-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "androidx-wear-compose" } +wear-compose-navigation = { module = "androidx.wear.compose:compose-navigation", version.ref = "androidx-wear-compose" } +androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core" } +androidx-wear-compose-ui-tooling = { module = "androidx.wear.compose:compose-ui-tooling", version.ref = "wear-compose-ui-tooling" } +compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } +androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "ui-test-manifest" } +androidx-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "ui-test-junit4" } +test-ext-junit = "androidx.test.ext:junit:1.1.5" +test-espresso-core = "androidx.test.espresso:espresso-core:3.5.1" +compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" } [plugins] android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" } +android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" } gradle-versions = { id = "com.github.ben-manes.versions", version.ref = "gradle-versions" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } @@ -142,3 +193,4 @@ kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" } version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "version-catalog-update" } +roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" } diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/question/PhotoQuestion.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/question/PhotoQuestion.kt index 6827744778..df053aafb4 100644 --- a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/question/PhotoQuestion.kt +++ b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/question/PhotoQuestion.kt @@ -89,7 +89,7 @@ fun PhotoQuestion( OutlinedButton( onClick = { newImageUri = getNewImageUri() - cameraLauncher.launch(newImageUri) + cameraLauncher.launch(newImageUri!!) }, shape = MaterialTheme.shapes.small, contentPadding = PaddingValues()