Dependency updates and upgrade for new target sdk (#259)

Author: Fabtron

accessibility-toolbox/src/main/kotlin/io/snabble/accessibility/AccessibilityToolBox.kt

@@ -128,7 +128,6 @@ class AccessibilityToolBox(private val target: View): AccessibilityDelegateCompa
         AccessibilityEvent.TYPE_VIEW_HOVER_EXIT, AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_START,
         AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_END, AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED,
         AccessibilityEvent.TYPE_VIEW_SCROLLED, AccessibilityEvent.TYPE_VIEW_TEXT_SELECTION_CHANGED,
-        AccessibilityEvent.TYPE_ANNOUNCEMENT, AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED,
         AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED,
         AccessibilityEvent.TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY,
         AccessibilityEvent.TYPE_GESTURE_DETECTION_START, AccessibilityEvent.TYPE_GESTURE_DETECTION_END,
@@ -231,4 +230,4 @@ fun <T> Iterable<T>.forEachWindow(iterator: (last: T?, current: T, next: T?) ->
             }
         }
     }
-}
+}

core/src/main/java/io/snabble/sdk/SdkCompat.kt

@@ -0,0 +1,43 @@
+package io.snabble.sdk
+
+import android.os.Build
+import android.view.View
+import java.util.Locale
+
+fun localeOf(language: String): Locale {
+    return when {
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA -> Locale.of(language)
+        else -> {
+            @Suppress("DEPRECATION")
+            Locale(language)
+        }
+    }
+}
+
+fun localeOf(language: String, country: String): Locale {
+    return when {
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA -> Locale.of(language, country)
+        else -> {
+            @Suppress("DEPRECATION")
+            Locale(language, country)
+        }
+    }
+}
+
+fun Thread.compatId(): Long {
+    return when {
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA -> threadId()
+        else -> {
+            (@Suppress("DEPRECATION")
+            id)
+        }
+    }
+}
+fun View.announceAccessibiltyEvent(event: String) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        stateDescription = event
+    } else {
+        @Suppress("DEPRECATION")
+        announceForAccessibility(event)
+    }
+}

core/src/main/java/io/snabble/sdk/TermsOfService.kt

@@ -18,7 +18,7 @@ data class TermsOfService(
         get() {
             val defaultLocale = Locale.getDefault()
             variants.forEach {
-                if (Locale(it.language).language == defaultLocale.language) {
+                if (localeOf(it.language).language == defaultLocale.language) {
                     return Snabble.absoluteUrl(it.url)
                 }
             }
@@ -75,4 +75,4 @@ data class TermsOfService(
          */
         val href: String
     )
-}
+}

core/src/main/java/io/snabble/sdk/coupons/Coupons.kt

@@ -8,6 +8,7 @@ import com.google.gson.GsonBuilder
 import io.snabble.sdk.MutableAccessibleLiveData
 import io.snabble.sdk.Project
 import io.snabble.sdk.Snabble
+import io.snabble.sdk.compatId
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.Request
@@ -97,7 +98,7 @@ class Coupons (
     @JvmName("setInternalProjectCoupons")
     @RestrictTo(RestrictTo.Scope.LIBRARY)
     internal fun setProjectCoupons(coupons: List<Coupon>) {
-        if (Looper.getMainLooper().thread.id == Thread.currentThread().id) {
+        if (Looper.getMainLooper().thread.compatId() == Thread.currentThread().compatId()) {
             value = coupons
         } else {
             postValue(coupons)

gradle/libs.versions.toml

@@ -1,18 +1,18 @@
 [versions]
-compileSdk = "35"
-targetSdk = "35"
+compileSdk = "36"
+targetSdk = "36"
 minSdk = "21"
-gradlePlugin = "8.11.0"
-kotlin = "2.2.0"
-navigation = "2.9.1"
+gradlePlugin = "8.12.1"
+kotlin = "2.2.10"
+navigation = "2.9.3"
 snabbleSdk = "0.69.6"
 androidx-camera = "1.4.2"
-androidx-compose-ui = "1.8.3"
-com-squareup-okhttp3 = "4.12.0"
+androidx-compose-ui = "1.9.0"
+com-squareup-okhttp3 = "5.1.0"
 io-kotest = "5.9.1"
 dokka = "1.9.20"
-androidx-compose-material = "1.8.3"
-android-lifecycle = "2.9.1"
+androidx-compose-material = "1.9.0"
+android-lifecycle = "2.9.2"
 koin = "4.1.0"
 
 [libraries]
@@ -26,7 +26,7 @@ androidx-camera-extension = { module = "androidx.camera:camera-extensions", vers
 androidx-camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "androidx-camera" }
 androidx-camera-view = { module = "androidx.camera:camera-view", version.ref = "androidx-camera" }
 androidx-cardview = "androidx.cardview:cardview:1.0.0"
-androidx-core-ktx = "androidx.core:core-ktx:1.16.0"
+androidx-core-ktx = "androidx.core:core-ktx:1.17.0"
 androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.1"
 androidx-constraintlayoutCompose = "androidx.constraintlayout:constraintlayout-compose:1.1.1"
 # Compose previews won't work w/o this: https://issuetracker.google.com/issues/227767363
@@ -50,7 +50,7 @@ androidx-startupRuntime = "androidx.startup:startup-runtime:1.2.0"
 androidx-swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
 androidx-viewpager2 = "androidx.viewpager2:viewpager2:1.1.0"
 androidx-webkit = "androidx.webkit:webkit:1.14.0"
-apache-commonsLang3 = "org.apache.commons:commons-lang3:3.17.0"
+apache-commonsLang3 = "org.apache.commons:commons-lang3:3.18.0"
 caverock-androidsvgAar = "com.caverock:androidsvg-aar:1.4"
 compose-iconsExtended = { module = "androidx.compose.material:material-icons-extended", version = "1.7.8" }
 compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "navigation" }
@@ -64,7 +64,7 @@ compose-uiTooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "
 compose-uiToolingPreview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-compose-ui" }
 compose-uiUtil = { module = "androidx.compose.ui:ui-util", version.ref = "androidx-compose-ui" }
 compose-uiViewBinding = { module = "androidx.compose.ui:ui-viewbinding", version.ref = "androidx-compose-ui" }
-commonsIo = "commons-io:commons-io:2.19.0"
+commonsIo = "commons-io:commons-io:2.20.0"
 datatrans-androidSdk = "ch.datatrans:android-sdk:3.7.0"
 desugarJdkLibsNio = "com.android.tools:desugar_jdk_libs_nio:2.1.5"
 glide-compose = "com.github.bumptech.glide:compose:1.0.0-beta01"
@@ -94,16 +94,16 @@ kotest-assertionsCore = { module = "io.kotest:kotest-assertions-core", version.r
 koltin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlinx-serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0"
-mockk = "io.mockk:mockk:1.14.4"
+mockk = "io.mockk:mockk:1.14.5"
 # @pin requires higher target
-mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:5.4.0"
+mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:6.0.0"
 roboletric = "org.robolectric:robolectric:4.15.1"
 roboletric-androidAll = "org.robolectric:android-all:13-robolectric-9030017"
-sebaslogen-resaca = "io.github.sebaslogen:resaca:4.4.8"
+sebaslogen-resaca = "io.github.sebaslogen:resaca:4.5.0"
 squareup-okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "com-squareup-okhttp3" }
-test-espressoCore = "androidx.test.espresso:espresso-core:3.6.1"
-test-ext-junit = "androidx.test.ext:junit:1.2.1"
-test-runner = "androidx.test:runner:1.6.2"
+test-espressoCore = "androidx.test.espresso:espresso-core:3.7.0"
+test-ext-junit = "androidx.test.ext:junit:1.3.0"
+test-runner = "androidx.test:runner:1.7.0"
 # Classpath dependencies
 classpath-androidGradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "gradlePlugin" }
 classpath-kotlinAndroidPlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -13,7 +13,7 @@ import android.webkit.WebViewClient
 import androidx.fragment.app.Fragment
 import io.snabble.sdk.ui.toolkit.R
 import io.snabble.sdk.utils.getColorByAttribute
-import okhttp3.internal.toHexString
+import androidx.core.net.toUri
 
 /** Displays any given HTML in a [WebView] */
 abstract class RawHtmlFragment : Fragment() {
@@ -40,7 +40,7 @@ abstract class RawHtmlFragment : Fragment() {
 
             @Deprecated("Legacy code for Android 5 & 6", replaceWith = ReplaceWith(""))
             override fun shouldOverrideUrlLoading(view: WebView?, url: String?) =
-                shouldOverrideUrlLoading(Uri.parse(url.orEmpty()))
+                shouldOverrideUrlLoading(url.orEmpty().toUri())
         }
 
         showHtml(html)
@@ -91,5 +91,5 @@ abstract class RawHtmlFragment : Fragment() {
     }
 
     private fun Fragment.openUrl(url: String) =
-        startActivity(Intent(Intent.ACTION_VIEW).apply { data = Uri.parse(url) })
+        startActivity(Intent(Intent.ACTION_VIEW).apply { data = url.toUri() })
 }