From a482c18ca80c6d2415431983e824a1e82f95398c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= Date: Tue, 30 Jan 2024 17:05:20 +0100 Subject: [PATCH] Bump AndroidX Compose BOM 2023.10.1 -> 2024.01.00 and Compose Material 1.5.4 -> 1.6.0 Changes AndroidX Compose Material and AndroidX Compose Material3 to BOM version --- .../dependencies/releaseRuntimeClasspath.txt | 79 ++++++++++--------- gradle/libs.versions.toml | 12 ++- 2 files changed, 45 insertions(+), 46 deletions(-) diff --git a/app-k9mail/dependencies/releaseRuntimeClasspath.txt b/app-k9mail/dependencies/releaseRuntimeClasspath.txt index cab260e97..abbd622d0 100644 --- a/app-k9mail/dependencies/releaseRuntimeClasspath.txt +++ b/app-k9mail/dependencies/releaseRuntimeClasspath.txt @@ -12,43 +12,44 @@ androidx.autofill:autofill:1.0.0 androidx.biometric:biometric:1.1.0 androidx.browser:browser:1.3.0 androidx.cardview:cardview:1.0.0 -androidx.collection:collection-ktx:1.1.0 -androidx.collection:collection:1.1.0 -androidx.compose.animation:animation-android:1.5.4 -androidx.compose.animation:animation-core-android:1.5.4 -androidx.compose.animation:animation-core:1.5.4 -androidx.compose.animation:animation:1.5.4 -androidx.compose.foundation:foundation-android:1.5.4 -androidx.compose.foundation:foundation-layout-android:1.5.4 -androidx.compose.foundation:foundation-layout:1.5.4 -androidx.compose.foundation:foundation:1.5.4 -androidx.compose.material:material-android:1.5.4 -androidx.compose.material:material-icons-core-android:1.5.4 -androidx.compose.material:material-icons-core:1.5.4 -androidx.compose.material:material-icons-extended-android:1.5.4 -androidx.compose.material:material-icons-extended:1.5.4 -androidx.compose.material:material-ripple-android:1.5.4 -androidx.compose.material:material-ripple:1.5.4 -androidx.compose.material:material:1.5.4 -androidx.compose.runtime:runtime-android:1.5.4 -androidx.compose.runtime:runtime-saveable-android:1.5.4 -androidx.compose.runtime:runtime-saveable:1.5.4 -androidx.compose.runtime:runtime:1.5.4 -androidx.compose.ui:ui-android:1.5.4 -androidx.compose.ui:ui-geometry-android:1.5.4 -androidx.compose.ui:ui-geometry:1.5.4 -androidx.compose.ui:ui-graphics-android:1.5.4 -androidx.compose.ui:ui-graphics:1.5.4 -androidx.compose.ui:ui-text-android:1.5.4 -androidx.compose.ui:ui-text:1.5.4 -androidx.compose.ui:ui-tooling-preview-android:1.5.4 -androidx.compose.ui:ui-tooling-preview:1.5.4 -androidx.compose.ui:ui-unit-android:1.5.4 -androidx.compose.ui:ui-unit:1.5.4 -androidx.compose.ui:ui-util-android:1.5.4 -androidx.compose.ui:ui-util:1.5.4 -androidx.compose.ui:ui:1.5.4 -androidx.compose:compose-bom:2023.10.01 +androidx.collection:collection-jvm:1.4.0 +androidx.collection:collection-ktx:1.4.0 +androidx.collection:collection:1.4.0 +androidx.compose.animation:animation-android:1.6.0 +androidx.compose.animation:animation-core-android:1.6.0 +androidx.compose.animation:animation-core:1.6.0 +androidx.compose.animation:animation:1.6.0 +androidx.compose.foundation:foundation-android:1.6.0 +androidx.compose.foundation:foundation-layout-android:1.6.0 +androidx.compose.foundation:foundation-layout:1.6.0 +androidx.compose.foundation:foundation:1.6.0 +androidx.compose.material:material-android:1.6.0 +androidx.compose.material:material-icons-core-android:1.6.0 +androidx.compose.material:material-icons-core:1.6.0 +androidx.compose.material:material-icons-extended-android:1.6.0 +androidx.compose.material:material-icons-extended:1.6.0 +androidx.compose.material:material-ripple-android:1.6.0 +androidx.compose.material:material-ripple:1.6.0 +androidx.compose.material:material:1.6.0 +androidx.compose.runtime:runtime-android:1.6.0 +androidx.compose.runtime:runtime-saveable-android:1.6.0 +androidx.compose.runtime:runtime-saveable:1.6.0 +androidx.compose.runtime:runtime:1.6.0 +androidx.compose.ui:ui-android:1.6.0 +androidx.compose.ui:ui-geometry-android:1.6.0 +androidx.compose.ui:ui-geometry:1.6.0 +androidx.compose.ui:ui-graphics-android:1.6.0 +androidx.compose.ui:ui-graphics:1.6.0 +androidx.compose.ui:ui-text-android:1.6.0 +androidx.compose.ui:ui-text:1.6.0 +androidx.compose.ui:ui-tooling-preview-android:1.6.0 +androidx.compose.ui:ui-tooling-preview:1.6.0 +androidx.compose.ui:ui-unit-android:1.6.0 +androidx.compose.ui:ui-unit:1.6.0 +androidx.compose.ui:ui-util-android:1.6.0 +androidx.compose.ui:ui-util:1.6.0 +androidx.compose.ui:ui:1.6.0 +androidx.compose:compose-bom:2024.01.00 androidx.concurrent:concurrent-futures:1.1.0 androidx.constraintlayout:constraintlayout-core:1.0.4 androidx.constraintlayout:constraintlayout:2.1.4 @@ -62,8 +63,8 @@ androidx.customview:customview:1.1.0 androidx.documentfile:documentfile:1.0.0 androidx.drawerlayout:drawerlayout:1.1.1 androidx.dynamicanimation:dynamicanimation:1.0.0 -androidx.emoji2:emoji2-views-helper:1.4.0 -androidx.emoji2:emoji2:1.4.0 +androidx.emoji2:emoji2-views-helper:1.3.0 +androidx.emoji2:emoji2:1.3.0 androidx.exifinterface:exifinterface:1.3.6 androidx.fragment:fragment-ktx:1.6.2 androidx.fragment:fragment:1.6.2 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9d4b6a328..6d68dbbc0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,10 +22,8 @@ androidxAnnotation = "1.7.1" androidxAppCompat = "1.6.1" androidxBiometric = "1.1.0" # https://developer.android.com/jetpack/compose/bom/bom-mapping -androidxComposeBom = "2023.10.01" +androidxComposeBom = "2024.01.00" androidxComposeCompiler = "1.5.8" -androidxComposeMaterial = "1.5.4" -androidxComposeMaterial3 = "1.1.2" androidxConstraintLayout = "2.1.4" androidxCoordinatorLayout = "1.2.0" androidxCore = "1.12.0" @@ -125,10 +123,10 @@ androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "a androidx-biometric = { module = "androidx.biometric:biometric", version.ref = "androidxBiometric" } androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidxComposeBom" } androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } -androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "androidxComposeMaterial" } -androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "androidxComposeMaterial" } -androidx-compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "androidxComposeMaterial3" } -androidx-compose-material3-windowSizeClass = { module = "androidx.compose.material3:material3-window-size-class", version.ref = "androidxComposeMaterial3" } +androidx-compose-material = { module = "androidx.compose.material:material" } +androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" } +androidx-compose-material3 = { module = "androidx.compose.material3:material3" } +androidx-compose-material3-windowSizeClass = { module = "androidx.compose.material3:material3-window-size-class" } androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" } androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" } androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }