From 5494eb6229a193d45c27421301adb96ebb44e449 Mon Sep 17 00:00:00 2001 From: Fabian Bender Date: Mon, 15 Sep 2025 16:08:17 +0200 Subject: [PATCH] update dependencies --- CHANGELOG.md | 30 +++++++++++++++++-- gradle/libs.versions.toml | 30 +++++++++---------- .../ui/remotetheme/SnabbleSecondaryButton.kt | 2 +- 3 files changed, 43 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e24c763e..b4e3d55ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,13 +3,37 @@ All notable changes to this project will be documented in this file. ## UNRELEASED ### Added -* core: provide links for external usage (APPS-2426) + ### Changed ### Removed -* ui: Remove ProductConfirmationDialog (APPS-2411) -* ui: Fix multiple cancellation events in RoutingTargetGateKeeperView (APPS-2441) ### Fixed +## [0.82.1] +### Changed +* Dependency updates + +## [0.82.0] +### Changed +* Dependency updates and upgrade for new target sdk 36 + +## [0.81.1] +### Fixed +* ui: Fix multiple cancellation events in RoutingTargetGateKeeperView (APPS-2441) +* core: provide links for external usage (APPS-2426) + +## [0.81.0] +### Removed +* ui: Remove ProductConfirmationDialog (APPS-2411) + +## [0.80.19] +### Changed +* Dependency updates + +## [0.80.18] +### Changed +* Update compile and target sdk to 35 + + ## [0.80.17] ### Changed * core / ui: replace headless fragment with different result launcher for google pay diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a1bec1c93..0b3ac5cbb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,23 +1,23 @@ [versions] compileSdk = "36" targetSdk = "36" -minSdk = "21" -gradlePlugin = "8.12.1" -kotlin = "2.2.10" -navigation = "2.9.3" +minSdk = "24" +gradlePlugin = "8.13.0" +kotlin = "2.2.20" +navigation = "2.9.4" snabbleSdk = "0.69.6" -androidx-camera = "1.4.2" -androidx-compose-ui = "1.9.0" +androidx-camera = "1.5.0" +androidx-compose-ui = "1.9.1" com-squareup-okhttp3 = "5.1.0" -io-kotest = "5.9.1" +io-kotest = "6.0.3" dokka = "1.9.20" -androidx-compose-material = "1.9.0" -android-lifecycle = "2.9.2" -koin = "4.1.0" +androidx-compose-material = "1.9.1" +android-lifecycle = "2.9.3" +koin = "4.1.1" [libraries] airbnb-lottie = "com.airbnb.android:lottie:6.6.7" -androidx-activityCompose = "androidx.activity:activity-compose:1.10.1" +androidx-activityCompose = "androidx.activity:activity-compose:1.11.0" androidx-appcompat = "androidx.appcompat:appcompat:1.7.1" androidx-biometric = "androidx.biometric:biometric:1.2.0-alpha05" androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "androidx-camera" } @@ -40,7 +40,7 @@ androidx-lifecycle-process = {module = "androidx.lifecycle:lifecycle-process", v androidx-lifecycleRuntimeKtx = {module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "android-lifecycle"} androidx-lifecycleRuntimeCompose = {module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "android-lifecycle"} androidx-lifecycleViewmodelCompose = {module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "android-lifecycle"} -android-material = "com.google.android.material:material:1.12.0" +android-material = "com.google.android.material:material:1.13.0" androidx-navigation-fragmentKtx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigation" } androidx-navigation-runtimeKtx = { module = "androidx.navigation:navigation-runtime-ktx", version.ref = "navigation" } androidx-navigation-uiKtx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigation" } @@ -72,7 +72,7 @@ googlePlayServices-maps = "com.google.android.gms:play-services-maps:19.2.0" googlePlayServices-wallet = "com.google.android.gms:play-services-wallet:19.4.0" google-mlkit-barcodeScanning = "com.google.mlkit:barcode-scanning:17.3.0" google-zxing-core = "com.google.zxing:core:3.5.3" -gson = "com.google.code.gson:gson:2.13.1" +gson = "com.google.code.gson:gson:2.13.2" iban4j = "org.iban4j:iban4j:3.2.10-RELEASE" jakewhartonProcessPhoenix = "com.jakewharton:process-phoenix:3.0.0" picasso = "com.squareup.picasso:picasso:2.71828" @@ -97,9 +97,9 @@ kotlinx-serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1. mockk = "io.mockk:mockk:1.14.5" # @pin requires higher target mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:6.0.0" -roboletric = "org.robolectric:robolectric:4.15.1" +roboletric = "org.robolectric:robolectric:4.16" roboletric-androidAll = "org.robolectric:android-all:13-robolectric-9030017" -sebaslogen-resaca = "io.github.sebaslogen:resaca:4.5.0" +sebaslogen-resaca = "io.github.sebaslogen:resaca:4.6.0" squareup-okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "com-squareup-okhttp3" } test-espressoCore = "androidx.test.espresso:espresso-core:3.7.0" test-ext-junit = "androidx.test.ext:junit:1.3.0" diff --git a/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabbleSecondaryButton.kt b/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabbleSecondaryButton.kt index ffd176af3..06e5deb45 100644 --- a/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabbleSecondaryButton.kt +++ b/ui/src/main/java/io/snabble/sdk/ui/remotetheme/SnabbleSecondaryButton.kt @@ -41,7 +41,7 @@ class SnabbleSecondaryButton @JvmOverloads constructor( private fun setRippleColor(project: Project?) { val highlightColor = MaterialColors.getColor( context, - com.google.android.material.R.attr.colorControlHighlight, + R.attr.colorControlHighlight, Color.TRANSPARENT )