From 5a4485818f6ad3fcb80bc49116761495eff11fab Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sun, 24 Sep 2023 07:43:23 -0500 Subject: [PATCH] Update dependency androidx.compose:compose-bom to v2023.09.01 --- app/build.gradle.kts | 2 +- deps_fdroid.txt | 48 +++++++++++++++++++-------------------- deps_googleplay.txt | 48 +++++++++++++++++++-------------------- gradle/libs.versions.toml | 5 ++-- 4 files changed, 51 insertions(+), 52 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c111e7d95..0bc138e33 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -211,7 +211,7 @@ dependencies { implementation(libs.persistent.cookiejar) implementation(libs.gson) implementation(libs.material) - implementation(libs.material3) + implementation(libs.androidx.compose.material3) implementation(libs.androidx.constraintlayout) implementation(libs.androidx.swiperefreshlayout) implementation(libs.androidx.preference) diff --git a/deps_fdroid.txt b/deps_fdroid.txt index c2bae63fe..2128c029e 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -577,7 +577,7 @@ +| \--- com.squareup.okhttp3:okhttp:3.1.2 -> 4.11.0 (*) ++--- com.google.code.gson:gson:2.10.1 ++--- com.google.android.material:material:1.9.0 (*) -++--- androidx.compose.material3:material3:1.1.1 +++--- androidx.compose.material3:material3 -> 1.1.2 +| +--- androidx.activity:activity-compose:1.5.0 -> 1.7.2 +| | +--- androidx.activity:activity-ktx:1.7.2 (*) +| | +--- androidx.compose.runtime:runtime:1.0.1 -> 1.5.1 @@ -878,44 +878,44 @@ +| \--- com.squareup.moshi:moshi:1.8.0 +| \--- com.squareup.okio:okio:1.16.0 -> 3.3.0 (*) ++--- androidx.recyclerview:recyclerview:1.3.1 (*) -++--- androidx.compose:compose-bom:2023.09.00 -+| +--- androidx.compose.animation:animation-core:1.5.1 (c) +++--- androidx.compose:compose-bom:2023.09.01 +| +--- androidx.compose.foundation:foundation:1.5.1 (c) -+| +--- androidx.compose.foundation:foundation-layout:1.5.1 (c) +| +--- androidx.compose.material:material:1.5.1 (c) -+| +--- androidx.compose.material:material-icons-core:1.5.1 (c) +| +--- androidx.compose.material:material-icons-extended:1.5.1 (c) -+| +--- androidx.compose.material:material-ripple:1.5.1 (c) -+| +--- androidx.compose.material3:material3:1.1.1 (c) -+| +--- androidx.compose.runtime:runtime:1.5.1 (c) ++| +--- androidx.compose.material3:material3:1.1.2 (c) +| +--- androidx.compose.runtime:runtime-livedata:1.5.1 (c) +| +--- androidx.compose.ui:ui:1.5.1 (c) -+| +--- androidx.compose.ui:ui-graphics:1.5.1 (c) -+| +--- androidx.compose.ui:ui-text:1.5.1 (c) +| +--- androidx.compose.ui:ui-tooling-preview:1.5.1 (c) -+| +--- androidx.compose.ui:ui-util:1.5.1 (c) +| +--- androidx.compose.ui:ui-viewbinding:1.5.1 (c) ++| +--- androidx.compose.runtime:runtime:1.5.1 (c) +| +--- androidx.compose.runtime:runtime-saveable:1.5.1 (c) -+| +--- androidx.compose.animation:animation-core-android:1.5.1 (c) ++| +--- androidx.compose.ui:ui-util:1.5.1 (c) +| +--- androidx.compose.foundation:foundation-android:1.5.1 (c) -+| +--- androidx.compose.foundation:foundation-layout-android:1.5.1 (c) +| +--- androidx.compose.material:material-android:1.5.1 (c) -+| +--- androidx.compose.material:material-icons-core-android:1.5.1 (c) +| +--- androidx.compose.material:material-icons-extended-android:1.5.1 (c) -+| +--- androidx.compose.material:material-ripple-android:1.5.1 (c) -+| +--- androidx.compose.runtime:runtime-android:1.5.1 (c) ++| +--- androidx.compose.animation:animation-core:1.5.1 (c) ++| +--- androidx.compose.foundation:foundation-layout:1.5.1 (c) ++| +--- androidx.compose.material:material-icons-core:1.5.1 (c) ++| +--- androidx.compose.material:material-ripple:1.5.1 (c) ++| +--- androidx.compose.ui:ui-graphics:1.5.1 (c) ++| +--- androidx.compose.ui:ui-text:1.5.1 (c) +| +--- androidx.compose.ui:ui-android:1.5.1 (c) -+| +--- androidx.compose.ui:ui-graphics-android:1.5.1 (c) -+| +--- androidx.compose.ui:ui-text-android:1.5.1 (c) +| +--- androidx.compose.ui:ui-tooling-preview-android:1.5.1 (c) -+| +--- androidx.compose.ui:ui-util-android:1.5.1 (c) ++| +--- androidx.compose.runtime:runtime-android:1.5.1 (c) +| +--- androidx.compose.runtime:runtime-saveable-android:1.5.1 (c) -+| +--- androidx.compose.ui:ui-unit:1.5.1 (c) ++| +--- androidx.compose.ui:ui-util-android:1.5.1 (c) +| +--- androidx.compose.animation:animation:1.5.1 (c) ++| +--- androidx.compose.animation:animation-core-android:1.5.1 (c) ++| +--- androidx.compose.foundation:foundation-layout-android:1.5.1 (c) ++| +--- androidx.compose.material:material-icons-core-android:1.5.1 (c) ++| +--- androidx.compose.material:material-ripple-android:1.5.1 (c) ++| +--- androidx.compose.ui:ui-graphics-android:1.5.1 (c) ++| +--- androidx.compose.ui:ui-text-android:1.5.1 (c) +| +--- androidx.compose.ui:ui-geometry:1.5.1 (c) -+| +--- androidx.compose.ui:ui-unit-android:1.5.1 (c) ++| +--- androidx.compose.ui:ui-unit:1.5.1 (c) +| +--- androidx.compose.animation:animation-android:1.5.1 (c) -+| \--- androidx.compose.ui:ui-geometry-android:1.5.1 (c) ++| +--- androidx.compose.ui:ui-geometry-android:1.5.1 (c) ++| \--- androidx.compose.ui:ui-unit-android:1.5.1 (c) ++--- androidx.compose.ui:ui -> 1.5.1 (*) ++--- androidx.compose.foundation:foundation -> 1.5.1 (*) ++--- androidx.compose.material:material -> 1.5.1 @@ -997,8 +997,8 @@ +| +--- androidx.compose.ui:ui-text:1.5.1 (c) +| +--- androidx.compose.ui:ui-tooling-preview:1.5.1 (c) +| +--- androidx.compose.ui:ui-util:1.5.1 (c) -+| +--- androidx.compose.ui:ui-unit:1.5.1 (c) -+| \--- androidx.compose.ui:ui-geometry:1.5.1 (c) ++| +--- androidx.compose.ui:ui-geometry:1.5.1 (c) ++| \--- androidx.compose.ui:ui-unit:1.5.1 (c) ++--- androidx.compose.ui:ui-tooling-preview -> 1.5.1 +| \--- androidx.compose.ui:ui-tooling-preview-android:1.5.1 +| +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 43fa093cd..fb3b8dd15 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -763,7 +763,7 @@ +| \--- com.squareup.okhttp3:okhttp:3.1.2 -> 4.11.0 (*) ++--- com.google.code.gson:gson:2.10.1 ++--- com.google.android.material:material:1.9.0 (*) -++--- androidx.compose.material3:material3:1.1.1 +++--- androidx.compose.material3:material3 -> 1.1.2 +| +--- androidx.activity:activity-compose:1.5.0 -> 1.7.2 +| | +--- androidx.activity:activity-ktx:1.7.2 (*) +| | +--- androidx.compose.runtime:runtime:1.0.1 -> 1.5.1 @@ -1064,44 +1064,44 @@ +| \--- com.squareup.moshi:moshi:1.8.0 +| \--- com.squareup.okio:okio:1.16.0 -> 3.3.0 (*) ++--- androidx.recyclerview:recyclerview:1.3.1 (*) -++--- androidx.compose:compose-bom:2023.09.00 -+| +--- androidx.compose.animation:animation-core:1.5.1 (c) +++--- androidx.compose:compose-bom:2023.09.01 +| +--- androidx.compose.foundation:foundation:1.5.1 (c) -+| +--- androidx.compose.foundation:foundation-layout:1.5.1 (c) +| +--- androidx.compose.material:material:1.5.1 (c) -+| +--- androidx.compose.material:material-icons-core:1.5.1 (c) +| +--- androidx.compose.material:material-icons-extended:1.5.1 (c) -+| +--- androidx.compose.material:material-ripple:1.5.1 (c) -+| +--- androidx.compose.material3:material3:1.1.1 (c) -+| +--- androidx.compose.runtime:runtime:1.5.1 (c) ++| +--- androidx.compose.material3:material3:1.1.2 (c) +| +--- androidx.compose.runtime:runtime-livedata:1.5.1 (c) +| +--- androidx.compose.ui:ui:1.5.1 (c) -+| +--- androidx.compose.ui:ui-graphics:1.5.1 (c) -+| +--- androidx.compose.ui:ui-text:1.5.1 (c) +| +--- androidx.compose.ui:ui-tooling-preview:1.5.1 (c) -+| +--- androidx.compose.ui:ui-util:1.5.1 (c) +| +--- androidx.compose.ui:ui-viewbinding:1.5.1 (c) ++| +--- androidx.compose.runtime:runtime:1.5.1 (c) +| +--- androidx.compose.runtime:runtime-saveable:1.5.1 (c) -+| +--- androidx.compose.animation:animation-core-android:1.5.1 (c) ++| +--- androidx.compose.ui:ui-util:1.5.1 (c) +| +--- androidx.compose.foundation:foundation-android:1.5.1 (c) -+| +--- androidx.compose.foundation:foundation-layout-android:1.5.1 (c) +| +--- androidx.compose.material:material-android:1.5.1 (c) -+| +--- androidx.compose.material:material-icons-core-android:1.5.1 (c) +| +--- androidx.compose.material:material-icons-extended-android:1.5.1 (c) -+| +--- androidx.compose.material:material-ripple-android:1.5.1 (c) -+| +--- androidx.compose.runtime:runtime-android:1.5.1 (c) ++| +--- androidx.compose.animation:animation-core:1.5.1 (c) ++| +--- androidx.compose.foundation:foundation-layout:1.5.1 (c) ++| +--- androidx.compose.material:material-icons-core:1.5.1 (c) ++| +--- androidx.compose.material:material-ripple:1.5.1 (c) ++| +--- androidx.compose.ui:ui-graphics:1.5.1 (c) ++| +--- androidx.compose.ui:ui-text:1.5.1 (c) +| +--- androidx.compose.ui:ui-android:1.5.1 (c) -+| +--- androidx.compose.ui:ui-graphics-android:1.5.1 (c) -+| +--- androidx.compose.ui:ui-text-android:1.5.1 (c) +| +--- androidx.compose.ui:ui-tooling-preview-android:1.5.1 (c) -+| +--- androidx.compose.ui:ui-util-android:1.5.1 (c) ++| +--- androidx.compose.runtime:runtime-android:1.5.1 (c) +| +--- androidx.compose.runtime:runtime-saveable-android:1.5.1 (c) -+| +--- androidx.compose.ui:ui-unit:1.5.1 (c) ++| +--- androidx.compose.ui:ui-util-android:1.5.1 (c) +| +--- androidx.compose.animation:animation:1.5.1 (c) ++| +--- androidx.compose.animation:animation-core-android:1.5.1 (c) ++| +--- androidx.compose.foundation:foundation-layout-android:1.5.1 (c) ++| +--- androidx.compose.material:material-icons-core-android:1.5.1 (c) ++| +--- androidx.compose.material:material-ripple-android:1.5.1 (c) ++| +--- androidx.compose.ui:ui-graphics-android:1.5.1 (c) ++| +--- androidx.compose.ui:ui-text-android:1.5.1 (c) +| +--- androidx.compose.ui:ui-geometry:1.5.1 (c) -+| +--- androidx.compose.ui:ui-unit-android:1.5.1 (c) ++| +--- androidx.compose.ui:ui-unit:1.5.1 (c) +| +--- androidx.compose.animation:animation-android:1.5.1 (c) -+| \--- androidx.compose.ui:ui-geometry-android:1.5.1 (c) ++| +--- androidx.compose.ui:ui-geometry-android:1.5.1 (c) ++| \--- androidx.compose.ui:ui-unit-android:1.5.1 (c) ++--- androidx.compose.ui:ui -> 1.5.1 (*) ++--- androidx.compose.foundation:foundation -> 1.5.1 (*) ++--- androidx.compose.material:material -> 1.5.1 @@ -1183,8 +1183,8 @@ +| +--- androidx.compose.ui:ui-text:1.5.1 (c) +| +--- androidx.compose.ui:ui-tooling-preview:1.5.1 (c) +| +--- androidx.compose.ui:ui-util:1.5.1 (c) -+| +--- androidx.compose.ui:ui-unit:1.5.1 (c) -+| \--- androidx.compose.ui:ui-geometry:1.5.1 (c) ++| +--- androidx.compose.ui:ui-geometry:1.5.1 (c) ++| \--- androidx.compose.ui:ui-unit:1.5.1 (c) ++--- androidx.compose.ui:ui-tooling-preview -> 1.5.1 +| \--- androidx.compose.ui:ui-tooling-preview-android:1.5.1 +| +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e8473069b..0b33b005c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ appcompat = "1.6.1" cert4android = "7814052" coil = "2.4.0" colorpicker = "0.0.15" -compose = "2023.09.00" +compose = "2023.09.01" compose-compiler = "1.5.3" compose-theme-adapter = "1.2.1" constraintlayout = "2.1.4" @@ -40,7 +40,6 @@ locale = "1.0.2" make-it-easy = "4.0.1" markwon = "4.6.2" material = "1.9.0" -material3 = "1.1.1" mockito = "5.5.0" okhttp = "4.11.0" opentasks = "562fec5" @@ -74,6 +73,7 @@ accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist- androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" } androidx-compose = { module = "androidx.compose:compose-bom", version.ref = "compose" } +androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" } androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" } androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragment-ktx" } androidx-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hilt" } @@ -140,7 +140,6 @@ markwon-strikethrough = { module = "io.noties.markwon:ext-strikethrough", versio markwon-tables = { module = "io.noties.markwon:ext-tables", version.ref = "markwon" } markwon-tasklist = { module = "io.noties.markwon:ext-tasklist", version.ref = "markwon" } material = { module = "com.google.android.material:material", version.ref = "material" } -material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" } mockito-android = { module = "org.mockito:mockito-android", version.ref = "mockito" } mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" } okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }