From e05afab096e30b29ceebd3746f6eefd757a8edad Mon Sep 17 00:00:00 2001 From: Rob Orgiu Date: Mon, 18 Nov 2024 15:26:57 +0100 Subject: [PATCH 1/5] Simplify Drag&Drop implementation --- .../nowinandroid/core/ui/NewsResourceCard.kt | 21 +++++++------------ gradle/libs.versions.toml | 4 ++-- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt index 2395eb156..ff10b8d38 100644 --- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt +++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt @@ -24,7 +24,6 @@ import androidx.compose.foundation.Canvas import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.Image import androidx.compose.foundation.draganddrop.dragAndDropSource -import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -140,18 +139,14 @@ fun NewsResourceCardExpanded( modifier = Modifier .fillMaxWidth((.8f)) .dragAndDropSource { - detectTapGestures( - onLongPress = { - startTransfer( - DragAndDropTransferData( - ClipData.newPlainText( - sharingLabel, - sharingContent, - ), - flags = dragAndDropFlags, - ), - ) - }, + startTransfer( + DragAndDropTransferData( + ClipData.newPlainText( + sharingLabel, + sharingContent, + ), + flags = dragAndDropFlags, + ), ) }, ) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b1d9232ee..61ac0ee05 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,12 +2,12 @@ accompanist = "0.34.0" androidDesugarJdkLibs = "2.0.4" # AGP and tools should be updated together -androidGradlePlugin = "8.6.1" +androidGradlePlugin = "8.7.2" androidTools = "31.7.2" androidxActivity = "1.9.3" androidxAppCompat = "1.7.0" androidxBrowser = "1.8.0" -androidxComposeBom = "2024.09.00" +androidxComposeBom = "2024.11.00" androidxComposeRuntimeTracing = "1.0.0-beta01" androidxCore = "1.13.1" androidxCoreSplashscreen = "1.0.1" From a9e9c96e44744fd0c50b7f8033a8b6cae8b87738 Mon Sep 17 00:00:00 2001 From: Rob Orgiu Date: Tue, 7 Jan 2025 17:36:21 +0100 Subject: [PATCH 2/5] Simplify Drag&Drop implementation --- .../dependencies/releaseRuntimeClasspath.txt | 100 +++++++++--------- .../prodReleaseRuntimeClasspath.txt | 68 ++++++------ .../nowinandroid/core/ui/NewsResourceCard.kt | 6 +- gradle/libs.versions.toml | 3 +- 4 files changed, 88 insertions(+), 89 deletions(-) diff --git a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt index f36981625..4e0b3ef48 100644 --- a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt +++ b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt @@ -2,24 +2,24 @@ androidx.activity:activity-compose:1.9.3 androidx.activity:activity-ktx:1.9.3 androidx.activity:activity:1.9.3 androidx.annotation:annotation-experimental:1.4.1 -androidx.annotation:annotation-jvm:1.8.1 -androidx.annotation:annotation:1.8.1 +androidx.annotation:annotation-jvm:1.9.1 +androidx.annotation:annotation:1.9.1 androidx.appcompat:appcompat-resources:1.6.1 androidx.arch.core:core-common:2.2.0 androidx.arch.core:core-runtime:2.2.0 androidx.autofill:autofill:1.0.0 androidx.browser:browser:1.8.0 -androidx.collection:collection-jvm:1.4.4 -androidx.collection:collection-ktx:1.4.4 -androidx.collection:collection:1.4.4 -androidx.compose.animation:animation-android:1.7.6 -androidx.compose.animation:animation-core-android:1.7.6 -androidx.compose.animation:animation-core:1.7.6 -androidx.compose.animation:animation:1.7.6 -androidx.compose.foundation:foundation-android:1.7.6 -androidx.compose.foundation:foundation-layout-android:1.7.6 -androidx.compose.foundation:foundation-layout:1.7.6 -androidx.compose.foundation:foundation:1.7.6 +androidx.collection:collection-jvm:1.5.0-alpha06 +androidx.collection:collection-ktx:1.5.0-alpha06 +androidx.collection:collection:1.5.0-alpha06 +androidx.compose.animation:animation-android:1.8.0-alpha06 +androidx.compose.animation:animation-core-android:1.8.0-alpha06 +androidx.compose.animation:animation-core:1.8.0-alpha06 +androidx.compose.animation:animation:1.8.0-alpha06 +androidx.compose.foundation:foundation-android:1.8.0-alpha06 +androidx.compose.foundation:foundation-layout-android:1.8.0-alpha06 +androidx.compose.foundation:foundation-layout:1.8.0-alpha06 +androidx.compose.foundation:foundation:1.8.0-alpha06 androidx.compose.material3.adaptive:adaptive-android:1.0.0 androidx.compose.material3.adaptive:adaptive:1.0.0 androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.1 @@ -32,55 +32,55 @@ androidx.compose.material:material-icons-extended-android:1.7.6 androidx.compose.material:material-icons-extended:1.7.6 androidx.compose.material:material-ripple-android:1.7.6 androidx.compose.material:material-ripple:1.7.6 -androidx.compose.runtime:runtime-android:1.7.6 -androidx.compose.runtime:runtime-saveable-android:1.7.6 -androidx.compose.runtime:runtime-saveable:1.7.6 -androidx.compose.runtime:runtime:1.7.6 -androidx.compose.ui:ui-android:1.7.6 -androidx.compose.ui:ui-geometry-android:1.7.6 -androidx.compose.ui:ui-geometry:1.7.6 -androidx.compose.ui:ui-graphics-android:1.7.6 -androidx.compose.ui:ui-graphics:1.7.6 -androidx.compose.ui:ui-text-android:1.7.6 -androidx.compose.ui:ui-text:1.7.6 -androidx.compose.ui:ui-tooling-preview-android:1.7.6 -androidx.compose.ui:ui-tooling-preview:1.7.6 -androidx.compose.ui:ui-unit-android:1.7.6 -androidx.compose.ui:ui-unit:1.7.6 -androidx.compose.ui:ui-util-android:1.7.6 -androidx.compose.ui:ui-util:1.7.6 -androidx.compose.ui:ui:1.7.6 +androidx.compose.runtime:runtime-android:1.8.0-alpha06 +androidx.compose.runtime:runtime-saveable-android:1.8.0-alpha06 +androidx.compose.runtime:runtime-saveable:1.8.0-alpha06 +androidx.compose.runtime:runtime:1.8.0-alpha06 +androidx.compose.ui:ui-android:1.8.0-alpha06 +androidx.compose.ui:ui-geometry-android:1.8.0-alpha06 +androidx.compose.ui:ui-geometry:1.8.0-alpha06 +androidx.compose.ui:ui-graphics-android:1.8.0-alpha06 +androidx.compose.ui:ui-graphics:1.8.0-alpha06 +androidx.compose.ui:ui-text-android:1.8.0-alpha06 +androidx.compose.ui:ui-text:1.8.0-alpha06 +androidx.compose.ui:ui-tooling-preview-android:1.8.0-alpha06 +androidx.compose.ui:ui-tooling-preview:1.8.0-alpha06 +androidx.compose.ui:ui-unit-android:1.8.0-alpha06 +androidx.compose.ui:ui-unit:1.8.0-alpha06 +androidx.compose.ui:ui-util-android:1.8.0-alpha06 +androidx.compose.ui:ui-util:1.8.0-alpha06 +androidx.compose.ui:ui:1.8.0-alpha06 androidx.compose:compose-bom:2024.12.01 androidx.concurrent:concurrent-futures:1.1.0 androidx.core:core-ktx:1.13.1 androidx.core:core:1.13.1 androidx.customview:customview-poolingcontainer:1.0.0 androidx.customview:customview:1.0.0 -androidx.emoji2:emoji2:1.3.0 +androidx.emoji2:emoji2:1.4.0 androidx.exifinterface:exifinterface:1.3.7 androidx.fragment:fragment:1.5.1 androidx.graphics:graphics-path:1.0.1 androidx.interpolator:interpolator:1.0.0 -androidx.lifecycle:lifecycle-common-java8:2.8.3 -androidx.lifecycle:lifecycle-common-jvm:2.8.3 -androidx.lifecycle:lifecycle-common:2.8.3 -androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.3 -androidx.lifecycle:lifecycle-livedata-core:2.8.3 -androidx.lifecycle:lifecycle-livedata:2.8.3 -androidx.lifecycle:lifecycle-process:2.8.3 -androidx.lifecycle:lifecycle-runtime-android:2.8.3 -androidx.lifecycle:lifecycle-runtime-compose-android:2.8.3 -androidx.lifecycle:lifecycle-runtime-compose:2.8.3 -androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.3 -androidx.lifecycle:lifecycle-runtime-ktx:2.8.3 -androidx.lifecycle:lifecycle-runtime:2.8.3 -androidx.lifecycle:lifecycle-viewmodel-android:2.8.3 -androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3 -androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.3 -androidx.lifecycle:lifecycle-viewmodel:2.8.3 +androidx.lifecycle:lifecycle-common-java8:2.8.7 +androidx.lifecycle:lifecycle-common-jvm:2.8.7 +androidx.lifecycle:lifecycle-common:2.8.7 +androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.7 +androidx.lifecycle:lifecycle-livedata-core:2.8.7 +androidx.lifecycle:lifecycle-livedata:2.8.7 +androidx.lifecycle:lifecycle-process:2.8.7 +androidx.lifecycle:lifecycle-runtime-android:2.8.7 +androidx.lifecycle:lifecycle-runtime-compose-android:2.8.7 +androidx.lifecycle:lifecycle-runtime-compose:2.8.7 +androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7 +androidx.lifecycle:lifecycle-runtime-ktx:2.8.7 +androidx.lifecycle:lifecycle-runtime:2.8.7 +androidx.lifecycle:lifecycle-viewmodel-android:2.8.7 +androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7 +androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7 +androidx.lifecycle:lifecycle-viewmodel:2.8.7 androidx.loader:loader:1.0.0 androidx.metrics:metrics-performance:1.0.0-beta01 -androidx.profileinstaller:profileinstaller:1.3.1 +androidx.profileinstaller:profileinstaller:1.4.0 androidx.savedstate:savedstate-ktx:1.2.1 androidx.savedstate:savedstate:1.2.1 androidx.startup:startup-runtime:1.1.1 diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt index e334aa676..f1cafaad0 100644 --- a/app/dependencies/prodReleaseRuntimeClasspath.txt +++ b/app/dependencies/prodReleaseRuntimeClasspath.txt @@ -2,25 +2,25 @@ androidx.activity:activity-compose:1.9.3 androidx.activity:activity-ktx:1.9.3 androidx.activity:activity:1.9.3 androidx.annotation:annotation-experimental:1.4.1 -androidx.annotation:annotation-jvm:1.8.1 -androidx.annotation:annotation:1.8.1 +androidx.annotation:annotation-jvm:1.9.1 +androidx.annotation:annotation:1.9.1 androidx.appcompat:appcompat-resources:1.7.0 androidx.appcompat:appcompat:1.7.0 androidx.arch.core:core-common:2.2.0 androidx.arch.core:core-runtime:2.2.0 androidx.autofill:autofill:1.0.0 androidx.browser:browser:1.8.0 -androidx.collection:collection-jvm:1.4.4 -androidx.collection:collection-ktx:1.4.4 -androidx.collection:collection:1.4.4 -androidx.compose.animation:animation-android:1.7.6 -androidx.compose.animation:animation-core-android:1.7.6 -androidx.compose.animation:animation-core:1.7.6 -androidx.compose.animation:animation:1.7.6 -androidx.compose.foundation:foundation-android:1.7.6 -androidx.compose.foundation:foundation-layout-android:1.7.6 -androidx.compose.foundation:foundation-layout:1.7.6 -androidx.compose.foundation:foundation:1.7.6 +androidx.collection:collection-jvm:1.5.0-alpha06 +androidx.collection:collection-ktx:1.5.0-alpha06 +androidx.collection:collection:1.5.0-alpha06 +androidx.compose.animation:animation-android:1.8.0-alpha06 +androidx.compose.animation:animation-core-android:1.8.0-alpha06 +androidx.compose.animation:animation-core:1.8.0-alpha06 +androidx.compose.animation:animation:1.8.0-alpha06 +androidx.compose.foundation:foundation-android:1.8.0-alpha06 +androidx.compose.foundation:foundation-layout-android:1.8.0-alpha06 +androidx.compose.foundation:foundation-layout:1.8.0-alpha06 +androidx.compose.foundation:foundation:1.8.0-alpha06 androidx.compose.material3.adaptive:adaptive-android:1.0.0 androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0 androidx.compose.material3.adaptive:adaptive-layout:1.0.0 @@ -39,25 +39,25 @@ androidx.compose.material:material-icons-extended-android:1.7.6 androidx.compose.material:material-icons-extended:1.7.6 androidx.compose.material:material-ripple-android:1.7.6 androidx.compose.material:material-ripple:1.7.6 -androidx.compose.runtime:runtime-android:1.7.6 -androidx.compose.runtime:runtime-saveable-android:1.7.6 -androidx.compose.runtime:runtime-saveable:1.7.6 -androidx.compose.runtime:runtime-tracing:1.7.6 -androidx.compose.runtime:runtime:1.7.6 -androidx.compose.ui:ui-android:1.7.6 -androidx.compose.ui:ui-geometry-android:1.7.6 -androidx.compose.ui:ui-geometry:1.7.6 -androidx.compose.ui:ui-graphics-android:1.7.6 -androidx.compose.ui:ui-graphics:1.7.6 -androidx.compose.ui:ui-text-android:1.7.6 -androidx.compose.ui:ui-text:1.7.6 -androidx.compose.ui:ui-tooling-preview-android:1.7.6 -androidx.compose.ui:ui-tooling-preview:1.7.6 -androidx.compose.ui:ui-unit-android:1.7.6 -androidx.compose.ui:ui-unit:1.7.6 -androidx.compose.ui:ui-util-android:1.7.6 -androidx.compose.ui:ui-util:1.7.6 -androidx.compose.ui:ui:1.7.6 +androidx.compose.runtime:runtime-android:1.8.0-alpha06 +androidx.compose.runtime:runtime-saveable-android:1.8.0-alpha06 +androidx.compose.runtime:runtime-saveable:1.8.0-alpha06 +androidx.compose.runtime:runtime-tracing:1.8.0-alpha06 +androidx.compose.runtime:runtime:1.8.0-alpha06 +androidx.compose.ui:ui-android:1.8.0-alpha06 +androidx.compose.ui:ui-geometry-android:1.8.0-alpha06 +androidx.compose.ui:ui-geometry:1.8.0-alpha06 +androidx.compose.ui:ui-graphics-android:1.8.0-alpha06 +androidx.compose.ui:ui-graphics:1.8.0-alpha06 +androidx.compose.ui:ui-text-android:1.8.0-alpha06 +androidx.compose.ui:ui-text:1.8.0-alpha06 +androidx.compose.ui:ui-tooling-preview-android:1.8.0-alpha06 +androidx.compose.ui:ui-tooling-preview:1.8.0-alpha06 +androidx.compose.ui:ui-unit-android:1.8.0-alpha06 +androidx.compose.ui:ui-unit:1.8.0-alpha06 +androidx.compose.ui:ui-util-android:1.8.0-alpha06 +androidx.compose.ui:ui-util:1.8.0-alpha06 +androidx.compose.ui:ui:1.8.0-alpha06 androidx.compose:compose-bom:2024.12.01 androidx.concurrent:concurrent-futures-ktx:1.1.0 androidx.concurrent:concurrent-futures:1.1.0 @@ -79,8 +79,8 @@ androidx.datastore:datastore-preferences:1.1.1 androidx.datastore:datastore:1.1.1 androidx.documentfile:documentfile:1.0.0 androidx.drawerlayout:drawerlayout:1.0.0 -androidx.emoji2:emoji2-views-helper:1.3.0 -androidx.emoji2:emoji2:1.3.0 +androidx.emoji2:emoji2-views-helper:1.4.0 +androidx.emoji2:emoji2:1.4.0 androidx.exifinterface:exifinterface:1.3.7 androidx.fragment:fragment:1.5.4 androidx.graphics:graphics-path:1.0.1 diff --git a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt index ff10b8d38..f6e446be0 100644 --- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt +++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt @@ -138,16 +138,14 @@ fun NewsResourceCardExpanded( userNewsResource.title, modifier = Modifier .fillMaxWidth((.8f)) - .dragAndDropSource { - startTransfer( + .dragAndDropSource { _ -> DragAndDropTransferData( ClipData.newPlainText( sharingLabel, sharingContent, ), flags = dragAndDropFlags, - ), - ) + ) }, ) Spacer(modifier = Modifier.weight(1f)) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ce4bd2c64..1936fe5c1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -57,6 +57,7 @@ room = "2.6.1" secrets = "2.0.1" truth = "1.4.4" turbine = "1.2.0" +composeFoundation = "1.8.0-alpha06" [bundles] androidx-compose-ui-test = ["androidx-compose-ui-test", "androidx-compose-ui-testManifest"] @@ -69,7 +70,7 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version androidx-benchmark-macro = { group = "androidx.benchmark", name = "benchmark-macro-junit4", version.ref = "androidxMacroBenchmark" } androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "androidxBrowser" } androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" } -androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" } +androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "composeFoundation" } androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" } androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" } androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" } From c4c9c9f728cb94f74ccd4d1f494c8ce83875ffc2 Mon Sep 17 00:00:00 2001 From: Rob Orgiu Date: Tue, 7 Jan 2025 17:44:54 +0100 Subject: [PATCH 3/5] Reformat NewsResourceCard --- .../apps/nowinandroid/core/ui/NewsResourceCard.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt index f6e446be0..862aec6b2 100644 --- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt +++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt @@ -139,13 +139,13 @@ fun NewsResourceCardExpanded( modifier = Modifier .fillMaxWidth((.8f)) .dragAndDropSource { _ -> - DragAndDropTransferData( - ClipData.newPlainText( - sharingLabel, - sharingContent, - ), - flags = dragAndDropFlags, - ) + DragAndDropTransferData( + ClipData.newPlainText( + sharingLabel, + sharingContent, + ), + flags = dragAndDropFlags, + ) }, ) Spacer(modifier = Modifier.weight(1f)) From 510984587a796ff01b57c08f5e454efa24e51baf Mon Sep 17 00:00:00 2001 From: Rob Orgiu Date: Wed, 8 Jan 2025 09:20:03 +0100 Subject: [PATCH 4/5] Reformat androidxComposeFoundation in alphabetical order --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1936fe5c1..9357809b0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,6 +8,7 @@ androidxActivity = "1.9.3" androidxAppCompat = "1.7.0" androidxBrowser = "1.8.0" androidxComposeBom = "2024.12.01" +androidxComposeFoundation = "1.8.0-alpha07" androidxComposeRuntimeTracing = "1.7.6" androidxCore = "1.15.0" androidxCoreSplashscreen = "1.0.1" @@ -57,7 +58,6 @@ room = "2.6.1" secrets = "2.0.1" truth = "1.4.4" turbine = "1.2.0" -composeFoundation = "1.8.0-alpha06" [bundles] androidx-compose-ui-test = ["androidx-compose-ui-test", "androidx-compose-ui-testManifest"] @@ -70,7 +70,7 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version androidx-benchmark-macro = { group = "androidx.benchmark", name = "benchmark-macro-junit4", version.ref = "androidxMacroBenchmark" } androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "androidxBrowser" } androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" } -androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "composeFoundation" } +androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "androidxComposeFoundation" } androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" } androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" } androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" } From 266c73a2237a28ffa7bfb39cd003c12cee4637d1 Mon Sep 17 00:00:00 2001 From: Rob Orgiu Date: Wed, 8 Jan 2025 12:09:46 +0100 Subject: [PATCH 5/5] Updates dependencies baseline --- .../dependencies/releaseRuntimeClasspath.txt | 58 +++++++++--------- .../prodReleaseRuntimeClasspath.txt | 60 +++++++++---------- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt index 4e0b3ef48..04a864e86 100644 --- a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt +++ b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt @@ -9,17 +9,17 @@ androidx.arch.core:core-common:2.2.0 androidx.arch.core:core-runtime:2.2.0 androidx.autofill:autofill:1.0.0 androidx.browser:browser:1.8.0 -androidx.collection:collection-jvm:1.5.0-alpha06 -androidx.collection:collection-ktx:1.5.0-alpha06 -androidx.collection:collection:1.5.0-alpha06 -androidx.compose.animation:animation-android:1.8.0-alpha06 -androidx.compose.animation:animation-core-android:1.8.0-alpha06 -androidx.compose.animation:animation-core:1.8.0-alpha06 -androidx.compose.animation:animation:1.8.0-alpha06 -androidx.compose.foundation:foundation-android:1.8.0-alpha06 -androidx.compose.foundation:foundation-layout-android:1.8.0-alpha06 -androidx.compose.foundation:foundation-layout:1.8.0-alpha06 -androidx.compose.foundation:foundation:1.8.0-alpha06 +androidx.collection:collection-jvm:1.5.0-beta01 +androidx.collection:collection-ktx:1.5.0-beta01 +androidx.collection:collection:1.5.0-beta01 +androidx.compose.animation:animation-android:1.8.0-alpha07 +androidx.compose.animation:animation-core-android:1.8.0-alpha07 +androidx.compose.animation:animation-core:1.8.0-alpha07 +androidx.compose.animation:animation:1.8.0-alpha07 +androidx.compose.foundation:foundation-android:1.8.0-alpha07 +androidx.compose.foundation:foundation-layout-android:1.8.0-alpha07 +androidx.compose.foundation:foundation-layout:1.8.0-alpha07 +androidx.compose.foundation:foundation:1.8.0-alpha07 androidx.compose.material3.adaptive:adaptive-android:1.0.0 androidx.compose.material3.adaptive:adaptive:1.0.0 androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.1 @@ -32,24 +32,24 @@ androidx.compose.material:material-icons-extended-android:1.7.6 androidx.compose.material:material-icons-extended:1.7.6 androidx.compose.material:material-ripple-android:1.7.6 androidx.compose.material:material-ripple:1.7.6 -androidx.compose.runtime:runtime-android:1.8.0-alpha06 -androidx.compose.runtime:runtime-saveable-android:1.8.0-alpha06 -androidx.compose.runtime:runtime-saveable:1.8.0-alpha06 -androidx.compose.runtime:runtime:1.8.0-alpha06 -androidx.compose.ui:ui-android:1.8.0-alpha06 -androidx.compose.ui:ui-geometry-android:1.8.0-alpha06 -androidx.compose.ui:ui-geometry:1.8.0-alpha06 -androidx.compose.ui:ui-graphics-android:1.8.0-alpha06 -androidx.compose.ui:ui-graphics:1.8.0-alpha06 -androidx.compose.ui:ui-text-android:1.8.0-alpha06 -androidx.compose.ui:ui-text:1.8.0-alpha06 -androidx.compose.ui:ui-tooling-preview-android:1.8.0-alpha06 -androidx.compose.ui:ui-tooling-preview:1.8.0-alpha06 -androidx.compose.ui:ui-unit-android:1.8.0-alpha06 -androidx.compose.ui:ui-unit:1.8.0-alpha06 -androidx.compose.ui:ui-util-android:1.8.0-alpha06 -androidx.compose.ui:ui-util:1.8.0-alpha06 -androidx.compose.ui:ui:1.8.0-alpha06 +androidx.compose.runtime:runtime-android:1.8.0-alpha07 +androidx.compose.runtime:runtime-saveable-android:1.8.0-alpha07 +androidx.compose.runtime:runtime-saveable:1.8.0-alpha07 +androidx.compose.runtime:runtime:1.8.0-alpha07 +androidx.compose.ui:ui-android:1.8.0-alpha07 +androidx.compose.ui:ui-geometry-android:1.8.0-alpha07 +androidx.compose.ui:ui-geometry:1.8.0-alpha07 +androidx.compose.ui:ui-graphics-android:1.8.0-alpha07 +androidx.compose.ui:ui-graphics:1.8.0-alpha07 +androidx.compose.ui:ui-text-android:1.8.0-alpha07 +androidx.compose.ui:ui-text:1.8.0-alpha07 +androidx.compose.ui:ui-tooling-preview-android:1.8.0-alpha07 +androidx.compose.ui:ui-tooling-preview:1.8.0-alpha07 +androidx.compose.ui:ui-unit-android:1.8.0-alpha07 +androidx.compose.ui:ui-unit:1.8.0-alpha07 +androidx.compose.ui:ui-util-android:1.8.0-alpha07 +androidx.compose.ui:ui-util:1.8.0-alpha07 +androidx.compose.ui:ui:1.8.0-alpha07 androidx.compose:compose-bom:2024.12.01 androidx.concurrent:concurrent-futures:1.1.0 androidx.core:core-ktx:1.13.1 diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt index f1cafaad0..6fca688a1 100644 --- a/app/dependencies/prodReleaseRuntimeClasspath.txt +++ b/app/dependencies/prodReleaseRuntimeClasspath.txt @@ -10,17 +10,17 @@ androidx.arch.core:core-common:2.2.0 androidx.arch.core:core-runtime:2.2.0 androidx.autofill:autofill:1.0.0 androidx.browser:browser:1.8.0 -androidx.collection:collection-jvm:1.5.0-alpha06 -androidx.collection:collection-ktx:1.5.0-alpha06 -androidx.collection:collection:1.5.0-alpha06 -androidx.compose.animation:animation-android:1.8.0-alpha06 -androidx.compose.animation:animation-core-android:1.8.0-alpha06 -androidx.compose.animation:animation-core:1.8.0-alpha06 -androidx.compose.animation:animation:1.8.0-alpha06 -androidx.compose.foundation:foundation-android:1.8.0-alpha06 -androidx.compose.foundation:foundation-layout-android:1.8.0-alpha06 -androidx.compose.foundation:foundation-layout:1.8.0-alpha06 -androidx.compose.foundation:foundation:1.8.0-alpha06 +androidx.collection:collection-jvm:1.5.0-beta01 +androidx.collection:collection-ktx:1.5.0-beta01 +androidx.collection:collection:1.5.0-beta01 +androidx.compose.animation:animation-android:1.8.0-alpha07 +androidx.compose.animation:animation-core-android:1.8.0-alpha07 +androidx.compose.animation:animation-core:1.8.0-alpha07 +androidx.compose.animation:animation:1.8.0-alpha07 +androidx.compose.foundation:foundation-android:1.8.0-alpha07 +androidx.compose.foundation:foundation-layout-android:1.8.0-alpha07 +androidx.compose.foundation:foundation-layout:1.8.0-alpha07 +androidx.compose.foundation:foundation:1.8.0-alpha07 androidx.compose.material3.adaptive:adaptive-android:1.0.0 androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0 androidx.compose.material3.adaptive:adaptive-layout:1.0.0 @@ -39,25 +39,25 @@ androidx.compose.material:material-icons-extended-android:1.7.6 androidx.compose.material:material-icons-extended:1.7.6 androidx.compose.material:material-ripple-android:1.7.6 androidx.compose.material:material-ripple:1.7.6 -androidx.compose.runtime:runtime-android:1.8.0-alpha06 -androidx.compose.runtime:runtime-saveable-android:1.8.0-alpha06 -androidx.compose.runtime:runtime-saveable:1.8.0-alpha06 -androidx.compose.runtime:runtime-tracing:1.8.0-alpha06 -androidx.compose.runtime:runtime:1.8.0-alpha06 -androidx.compose.ui:ui-android:1.8.0-alpha06 -androidx.compose.ui:ui-geometry-android:1.8.0-alpha06 -androidx.compose.ui:ui-geometry:1.8.0-alpha06 -androidx.compose.ui:ui-graphics-android:1.8.0-alpha06 -androidx.compose.ui:ui-graphics:1.8.0-alpha06 -androidx.compose.ui:ui-text-android:1.8.0-alpha06 -androidx.compose.ui:ui-text:1.8.0-alpha06 -androidx.compose.ui:ui-tooling-preview-android:1.8.0-alpha06 -androidx.compose.ui:ui-tooling-preview:1.8.0-alpha06 -androidx.compose.ui:ui-unit-android:1.8.0-alpha06 -androidx.compose.ui:ui-unit:1.8.0-alpha06 -androidx.compose.ui:ui-util-android:1.8.0-alpha06 -androidx.compose.ui:ui-util:1.8.0-alpha06 -androidx.compose.ui:ui:1.8.0-alpha06 +androidx.compose.runtime:runtime-android:1.8.0-alpha07 +androidx.compose.runtime:runtime-saveable-android:1.8.0-alpha07 +androidx.compose.runtime:runtime-saveable:1.8.0-alpha07 +androidx.compose.runtime:runtime-tracing:1.8.0-alpha07 +androidx.compose.runtime:runtime:1.8.0-alpha07 +androidx.compose.ui:ui-android:1.8.0-alpha07 +androidx.compose.ui:ui-geometry-android:1.8.0-alpha07 +androidx.compose.ui:ui-geometry:1.8.0-alpha07 +androidx.compose.ui:ui-graphics-android:1.8.0-alpha07 +androidx.compose.ui:ui-graphics:1.8.0-alpha07 +androidx.compose.ui:ui-text-android:1.8.0-alpha07 +androidx.compose.ui:ui-text:1.8.0-alpha07 +androidx.compose.ui:ui-tooling-preview-android:1.8.0-alpha07 +androidx.compose.ui:ui-tooling-preview:1.8.0-alpha07 +androidx.compose.ui:ui-unit-android:1.8.0-alpha07 +androidx.compose.ui:ui-unit:1.8.0-alpha07 +androidx.compose.ui:ui-util-android:1.8.0-alpha07 +androidx.compose.ui:ui-util:1.8.0-alpha07 +androidx.compose.ui:ui:1.8.0-alpha07 androidx.compose:compose-bom:2024.12.01 androidx.concurrent:concurrent-futures-ktx:1.1.0 androidx.concurrent:concurrent-futures:1.1.0