diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 8adadc997..0a826ae8a 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -724,17 +724,17 @@ +| | | +--- androidx.compose.animation:animation-core:1.6.0 -> 1.7.8 (*) +| | | +--- androidx.compose.foundation:foundation:1.7.0 -> 1.7.8 (*) +| | | +--- androidx.compose.foundation:foundation-layout:1.7.0 -> 1.7.8 (*) -+| | | +--- androidx.compose.material:material-icons-core:1.6.0 -> 1.7.5 -+| | | | \--- androidx.compose.material:material-icons-core-android:1.7.5 ++| | | +--- androidx.compose.material:material-icons-core:1.6.0 -> 1.7.8 ++| | | | \--- androidx.compose.material:material-icons-core-android:1.7.8 +| | | | +--- androidx.compose.ui:ui:1.6.0 -> 1.7.8 (*) +| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.10 (*) -+| | | +--- androidx.compose.material:material-ripple:1.7.0 -> 1.7.5 -+| | | | \--- androidx.compose.material:material-ripple-android:1.7.5 ++| | | +--- androidx.compose.material:material-ripple:1.7.0 -> 1.7.8 ++| | | | \--- androidx.compose.material:material-ripple-android:1.7.8 +| | | | +--- androidx.collection:collection:1.4.0 -> 1.4.4 (*) -+| | | | +--- androidx.compose.animation:animation:1.7.5 -> 1.7.8 (*) -+| | | | +--- androidx.compose.foundation:foundation:1.7.5 -> 1.7.8 (*) -+| | | | +--- androidx.compose.runtime:runtime:1.7.5 -> 1.7.8 (*) -+| | | | +--- androidx.compose.ui:ui-util:1.7.5 -> 1.7.8 (*) ++| | | | +--- androidx.compose.animation:animation:1.7.8 (*) ++| | | | +--- androidx.compose.foundation:foundation:1.7.8 (*) ++| | | | +--- androidx.compose.runtime:runtime:1.7.8 (*) ++| | | | +--- androidx.compose.ui:ui-util:1.7.8 (*) +| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.10 (*) +| | | +--- androidx.compose.runtime:runtime:1.7.0 -> 1.7.8 (*) +| | | +--- androidx.compose.ui:ui:1.6.0 -> 1.7.8 (*) @@ -763,12 +763,12 @@ +| | +--- org.jetbrains.compose.foundation:foundation:1.7.1 (*) +| | +--- org.jetbrains.compose.foundation:foundation-layout:1.7.1 (*) +| | +--- org.jetbrains.compose.material:material-icons-core:1.7.1 -+| | | +--- androidx.compose.material:material-icons-core:1.7.5 (*) ++| | | +--- androidx.compose.material:material-icons-core:1.7.5 -> 1.7.8 (*) +| | | +--- org.jetbrains.compose.ui:ui:1.7.1 (*) +| | | +--- org.jetbrains.compose.ui:ui-graphics:1.7.1 (*) +| | | \--- org.jetbrains.compose.ui:ui-unit:1.7.1 (*) +| | +--- org.jetbrains.compose.material:material-ripple:1.7.1 -+| | | +--- androidx.compose.material:material-ripple:1.7.5 (*) ++| | | +--- androidx.compose.material:material-ripple:1.7.5 -> 1.7.8 (*) +| | | +--- org.jetbrains.compose.animation:animation:1.7.1 (*) +| | | +--- org.jetbrains.compose.collection-internal:collection:1.7.1 (*) +| | | +--- org.jetbrains.compose.foundation:foundation:1.7.1 (*) @@ -779,9 +779,9 @@ +| | +--- org.jetbrains.compose.ui:ui-text:1.7.1 (*) +| | \--- org.jetbrains.compose.ui:ui-util:1.7.1 (*) +| +--- org.jetbrains.compose.material:material-icons-extended:1.7.1 -+| | +--- androidx.compose.material:material-icons-extended:1.7.5 -+| | | \--- androidx.compose.material:material-icons-extended-android:1.7.5 -+| | | \--- androidx.compose.material:material-icons-core:1.7.5 (*) ++| | +--- androidx.compose.material:material-icons-extended:1.7.5 -> 1.7.8 ++| | | \--- androidx.compose.material:material-icons-extended-android:1.7.8 ++| | | \--- androidx.compose.material:material-icons-core:1.7.8 (*) +| | +--- org.jetbrains.compose.material:material-icons-core:1.7.1 (*) +| | +--- org.jetbrains.compose.ui:ui:1.7.1 (*) +| | \--- org.jetbrains.compose.ui:ui-graphics:1.7.1 (*) @@ -1381,64 +1381,64 @@ +| \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava ++--- org.osmdroid:osmdroid-android:6.1.20 ++--- androidx.recyclerview:recyclerview:1.4.0 (*) -++--- androidx.compose:compose-bom:2024.11.00 -+| +--- androidx.compose.animation:animation:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.animation:animation-core:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.foundation:foundation:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.foundation:foundation-layout:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.material:material:1.7.5 (c) -+| +--- androidx.compose.material:material-icons-extended:1.7.5 (c) +++--- androidx.compose:compose-bom:2025.02.00 ++| +--- androidx.compose.animation:animation:1.7.8 (c) ++| +--- androidx.compose.animation:animation-core:1.7.8 (c) ++| +--- androidx.compose.foundation:foundation:1.7.8 (c) ++| +--- androidx.compose.foundation:foundation-layout:1.7.8 (c) ++| +--- androidx.compose.material:material:1.7.8 (c) ++| +--- androidx.compose.material:material-icons-extended:1.7.8 (c) +| +--- androidx.compose.material3:material3:1.3.1 (c) +| +--- androidx.compose.material3.adaptive:adaptive:1.0.0 (c) +| +--- androidx.compose.material3.adaptive:adaptive-layout:1.0.0 (c) +| +--- androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0 (c) +| +--- androidx.compose.material3.adaptive:adaptive-navigation-android:1.0.0 (c) -+| +--- androidx.compose.runtime:runtime:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.runtime:runtime-livedata:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.ui:ui:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.ui:ui-geometry:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.ui:ui-tooling-preview:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.ui:ui-tooling-preview-android:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.ui:ui-util:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.runtime:runtime-saveable:1.7.5 -> 1.7.8 (c) ++| +--- androidx.compose.runtime:runtime:1.7.8 (c) ++| +--- androidx.compose.runtime:runtime-livedata:1.7.8 (c) ++| +--- androidx.compose.ui:ui:1.7.8 (c) ++| +--- androidx.compose.ui:ui-geometry:1.7.8 (c) ++| +--- androidx.compose.ui:ui-tooling-preview:1.7.8 (c) ++| +--- androidx.compose.ui:ui-tooling-preview-android:1.7.8 (c) ++| +--- androidx.compose.ui:ui-util:1.7.8 (c) ++| +--- androidx.compose.runtime:runtime-saveable:1.7.8 (c) +| +--- androidx.compose.material3.adaptive:adaptive-android:1.0.0 (c) -+| +--- androidx.compose.material:material-android:1.7.5 (c) -+| +--- androidx.compose.material:material-icons-extended-android:1.7.5 (c) ++| +--- androidx.compose.animation:animation-android:1.7.8 (c) ++| +--- androidx.compose.animation:animation-core-android:1.7.8 (c) ++| +--- androidx.compose.foundation:foundation-android:1.7.8 (c) ++| +--- androidx.compose.foundation:foundation-layout-android:1.7.8 (c) ++| +--- androidx.compose.material:material-android:1.7.8 (c) ++| +--- androidx.compose.material:material-icons-extended-android:1.7.8 (c) +| +--- androidx.compose.material3:material3-android:1.3.1 (c) -+| +--- androidx.compose.ui:ui-text:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.material:material-icons-core:1.7.5 (c) -+| +--- androidx.compose.material:material-ripple:1.7.5 (c) -+| +--- androidx.compose.ui:ui-graphics:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.ui:ui-unit:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.ui:ui-android:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.ui:ui-util-android:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.material:material-icons-core-android:1.7.5 (c) -+| +--- androidx.compose.material:material-ripple-android:1.7.5 (c) -+| +--- androidx.compose.ui:ui-geometry-android:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.runtime:runtime-android:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.ui:ui-graphics-android:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.ui:ui-text-android:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.ui:ui-unit-android:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.runtime:runtime-saveable-android:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.foundation:foundation-android:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.animation:animation-android:1.7.5 -> 1.7.8 (c) -+| +--- androidx.compose.foundation:foundation-layout-android:1.7.5 -> 1.7.8 (c) -+| \--- androidx.compose.animation:animation-core-android:1.7.5 -> 1.7.8 (c) ++| +--- androidx.compose.runtime:runtime-android:1.7.8 (c) ++| +--- androidx.compose.ui:ui-android:1.7.8 (c) ++| +--- androidx.compose.ui:ui-geometry-android:1.7.8 (c) ++| +--- androidx.compose.ui:ui-util-android:1.7.8 (c) ++| +--- androidx.compose.runtime:runtime-saveable-android:1.7.8 (c) ++| +--- androidx.compose.ui:ui-text:1.7.8 (c) ++| +--- androidx.compose.material:material-icons-core:1.7.8 (c) ++| +--- androidx.compose.material:material-ripple:1.7.8 (c) ++| +--- androidx.compose.ui:ui-graphics:1.7.8 (c) ++| +--- androidx.compose.ui:ui-unit:1.7.8 (c) ++| +--- androidx.compose.ui:ui-text-android:1.7.8 (c) ++| +--- androidx.compose.material:material-icons-core-android:1.7.8 (c) ++| +--- androidx.compose.material:material-ripple-android:1.7.8 (c) ++| +--- androidx.compose.ui:ui-graphics-android:1.7.8 (c) ++| \--- androidx.compose.ui:ui-unit-android:1.7.8 (c) ++--- androidx.compose.ui:ui -> 1.7.8 (*) ++--- androidx.compose.foundation:foundation -> 1.7.8 (*) -++--- androidx.compose.material:material -> 1.7.5 -+| \--- androidx.compose.material:material-android:1.7.5 +++--- androidx.compose.material:material -> 1.7.8 ++| \--- androidx.compose.material:material-android:1.7.8 +| +--- androidx.annotation:annotation:1.1.0 -> 1.9.1 (*) +| +--- androidx.annotation:annotation-experimental:1.4.0 -> 1.4.1 (*) -+| +--- androidx.compose.animation:animation:1.7.5 -> 1.7.8 (*) -+| +--- androidx.compose.animation:animation-core:1.7.5 -> 1.7.8 (*) -+| +--- androidx.compose.foundation:foundation:1.7.5 -> 1.7.8 (*) -+| +--- androidx.compose.foundation:foundation-layout:1.7.5 -> 1.7.8 (*) -+| +--- androidx.compose.material:material-ripple:1.7.5 (*) -+| +--- androidx.compose.runtime:runtime:1.7.5 -> 1.7.8 (*) -+| +--- androidx.compose.ui:ui:1.7.5 -> 1.7.8 (*) -+| +--- androidx.compose.ui:ui-text:1.7.5 -> 1.7.8 (*) -+| +--- androidx.compose.ui:ui-util:1.7.5 -> 1.7.8 (*) ++| +--- androidx.compose.animation:animation:1.7.8 (*) ++| +--- androidx.compose.animation:animation-core:1.7.8 (*) ++| +--- androidx.compose.foundation:foundation:1.7.8 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.7.8 (*) ++| +--- androidx.compose.material:material-ripple:1.7.8 (*) ++| +--- androidx.compose.runtime:runtime:1.7.8 (*) ++| +--- androidx.compose.ui:ui:1.7.8 (*) ++| +--- androidx.compose.ui:ui-text:1.7.8 (*) ++| +--- androidx.compose.ui:ui-util:1.7.8 (*) +| +--- androidx.lifecycle:lifecycle-runtime:2.6.1 -> 2.8.7 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 -> 2.8.7 (*) +| +--- androidx.savedstate:savedstate:1.2.1 (*) @@ -1452,7 +1452,7 @@ +| +--- androidx.compose.runtime:runtime:1.7.8 (c) +| \--- androidx.compose.runtime:runtime-saveable:1.7.8 (c) ++--- androidx.activity:activity-compose:1.10.1 (*) -++--- androidx.compose.material:material-icons-extended -> 1.7.5 (*) +++--- androidx.compose.material:material-icons-extended -> 1.7.8 (*) ++--- androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7 (*) ++--- androidx.compose.ui:ui-tooling-preview -> 1.7.8 +| \--- androidx.compose.ui:ui-tooling-preview-android:1.7.8 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index f5ae7bfd6..7b7e65f7a 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -701,12 +701,12 @@ +| | | +--- androidx.compose.material3.adaptive:adaptive-navigation-android:1.0.0 (c) +| | | +--- androidx.compose.runtime:runtime:1.7.8 (c) +| | | +--- androidx.compose.runtime:runtime-livedata:1.7.8 (c) -+| | | +--- androidx.compose.runtime:runtime-saveable:1.7.8 (c) +| | | +--- androidx.compose.ui:ui:1.7.8 (c) +| | | +--- androidx.compose.ui:ui-geometry:1.7.8 (c) +| | | +--- androidx.compose.ui:ui-tooling-preview:1.7.8 (c) +| | | +--- androidx.compose.ui:ui-tooling-preview-android:1.7.8 (c) +| | | +--- androidx.compose.ui:ui-util:1.7.8 (c) ++| | | +--- androidx.compose.runtime:runtime-saveable:1.7.8 (c) +| | | +--- androidx.compose.material3.adaptive:adaptive-android:1.0.0 (c) +| | | +--- androidx.compose.animation:animation-android:1.7.8 (c) +| | | +--- androidx.compose.animation:animation-core-android:1.7.8 (c) @@ -716,10 +716,10 @@ +| | | +--- androidx.compose.material:material-icons-extended-android:1.7.8 (c) +| | | +--- androidx.compose.material3:material3-android:1.3.1 (c) +| | | +--- androidx.compose.runtime:runtime-android:1.7.8 (c) -+| | | +--- androidx.compose.runtime:runtime-saveable-android:1.7.8 (c) +| | | +--- androidx.compose.ui:ui-android:1.7.8 (c) +| | | +--- androidx.compose.ui:ui-geometry-android:1.7.8 (c) +| | | +--- androidx.compose.ui:ui-util-android:1.7.8 (c) ++| | | +--- androidx.compose.runtime:runtime-saveable-android:1.7.8 (c) +| | | +--- androidx.compose.ui:ui-text:1.7.8 (c) +| | | +--- androidx.compose.material:material-icons-core:1.7.8 (c) +| | | +--- androidx.compose.material:material-ripple:1.7.8 (c) @@ -1733,7 +1733,7 @@ +| \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava ++--- org.osmdroid:osmdroid-android:6.1.20 ++--- androidx.recyclerview:recyclerview:1.4.0 (*) -++--- androidx.compose:compose-bom:2024.11.00 -> 2025.02.00 (*) +++--- androidx.compose:compose-bom:2025.02.00 (*) ++--- androidx.compose.ui:ui -> 1.7.8 (*) ++--- androidx.compose.foundation:foundation -> 1.7.8 (*) ++--- androidx.compose.material:material -> 1.7.8 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c4c2ab2ca..73ef766a3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ appauth = "0.11.1" appcompat = "1.7.0" cert4android = "7814052" coil = "2.7.0" -compose = "2024.11.00" +compose = "2025.02.00" constraintlayout = "2.2.1" dagger-hilt = "2.55" dashclock-api = "2.0.0"