Merge pull request #886 from grote/qpr2

Upgrade libs for Android 15 QPR2

Author: theimpulson

app/build.gradle.kts

@@ -185,29 +185,27 @@ dependencies {
 
     // anything less than 'implementation' fails tests run with gradlew
     testImplementation(aospLibs)
-    testImplementation("androidx.test.ext:junit:1.1.5")
-    testImplementation("org.slf4j:slf4j-simple:2.0.3")
-    testImplementation("org.robolectric:robolectric:4.12.2")
-    testImplementation("org.hamcrest:hamcrest:2.2")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:${libs.versions.junit5.get()}")
-    testImplementation("org.junit.jupiter:junit-jupiter-params:${libs.versions.junit5.get()}")
-    testImplementation("io.mockk:mockk:${libs.versions.mockk.get()}")
-    testImplementation(
-        "org.jetbrains.kotlinx:kotlinx-coroutines-test:${libs.versions.coroutines.get()}"
-    )
-    testImplementation("app.cash.turbine:turbine:1.0.0")
-    testImplementation("org.bitcoinj:bitcoinj-core:0.16.2")
-    testImplementation("com.github.luben:zstd-jni:1.5.6-5")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${libs.versions.junit5.get()}")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:${libs.versions.junit5.get()}")
+    testImplementation(libs.androidx.junit)
+    testImplementation(libs.slf4j.simple)
+    testImplementation(libs.robolectric)
+    testImplementation(libs.hamcrest)
+    testImplementation(libs.junit.jupiter.api)
+    testImplementation(libs.junit.jupiter.params)
+    testImplementation(libs.mockk)
+    testImplementation(libs.kotlinx.coroutines.test)
+    testImplementation(libs.turbine)
+    testImplementation(libs.bitcoinj.core)
+    testImplementation(libs.zstd.jni)
+    testRuntimeOnly(libs.junit.jupiter.engine)
+    testRuntimeOnly(libs.junit.vintage.engine)
 
     androidTestImplementation(aospLibs)
     androidTestImplementation(kotlin("test"))
-    androidTestImplementation("androidx.test:runner:1.4.0")
-    androidTestImplementation("androidx.test:rules:1.4.0")
-    androidTestImplementation("androidx.test.ext:junit:1.1.3")
-    androidTestImplementation("io.mockk:mockk-android:1.13.8")
-    androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
+    androidTestImplementation(libs.androidx.runner)
+    androidTestImplementation(libs.androidx.rules)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.mockk.android)
+    androidTestImplementation(libs.androidx.uiautomator)
 }
 
 gradle.projectsEvaluated {

app/src/androidTest/java/com/stevesoltys/seedvault/e2e/LargeRestoreTestBase.kt

@@ -53,7 +53,7 @@ internal interface LargeRestoreTestBase : LargeTestBase {
             waitUntilIdle()
 
             code.forEachIndexed { index, word ->
-                wordTextField(index).text = word
+                wordTextField(index).setText(word)
             }
 
             waitUntilIdle()

app/src/androidTest/java/com/stevesoltys/seedvault/e2e/LargeTestBase.kt

@@ -191,7 +191,7 @@ internal interface LargeTestBase : KoinComponent {
 
                 } else {
                     createNewFolderButton.clickAndWaitForNewWindow()
-                    textBox.text = folderName
+                    textBox.setText(folderName)
                     okButton.clickAndWaitForNewWindow()
                 }
 

contactsbackup/build.gradle.kts

@@ -61,13 +61,11 @@ dependencies {
     implementation(aospDeps)
 
     testImplementation(libs.kotlin.stdlib.jdk8)
-    testImplementation("junit:junit:${libs.versions.junit4.get()}")
-    testImplementation("io.mockk:mockk:${libs.versions.mockk.get()}")
+    testImplementation(libs.junit4)
+    testImplementation(libs.mockk)
 
     androidTestImplementation(libs.kotlin.stdlib.jdk8)
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation(
-        "androidx.test.espresso:espresso-core:${libs.versions.espresso.get()}"
-    )
-    androidTestImplementation("io.mockk:mockk-android:${libs.versions.mockk.get()}")
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+    androidTestImplementation(libs.mockk.android)
 }

core/build.gradle.kts

@@ -48,8 +48,8 @@ dependencies {
     implementation(libs.slf4j.api)
 
     testImplementation(kotlin("test"))
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${libs.versions.coroutines}")
-    testImplementation("io.mockk:mockk:${libs.versions.mockk.get()}")
-    testImplementation("org.ogce:xpp3:1.1.6")
-    testImplementation("org.slf4j:slf4j-simple:2.0.3")
+    testImplementation(libs.kotlinx.coroutines.test)
+    testImplementation(libs.mockk)
+    testImplementation(libs.xpp3)
+    testImplementation(libs.slf4j.simple)
 }

gradle/libs.versions.toml

@@ -14,12 +14,6 @@ compileSdk = "35"
 minSdk = "34"
 targetSdk = "35"
 
-# Test versions
-junit4 = "4.13.2"
-junit5 = "5.10.2" # careful, upgrading this can change a Cipher's IV size in tests!?
-mockk = "1.13.4" # newer versions require kotlin > 1.8.10
-espresso = "3.4.0"
-
 # Dependency versions below this are AOSP versions.
 # We use "strictly" to enforce the version cannot be overriden by transitive dependencies.
 # We need to enforce that the versions we use are the same as AOSP to ensure compatibility.
@@ -32,7 +26,7 @@ espresso = "3.4.0"
 # 1.9.0 Android 14 (QPR2)
 # 1.9.22 Android 14 (QPR3)
 # 1.9.23 Android 15
-# Check: https://android.googlesource.com/platform/external/kotlinc/+/refs/heads/android15-qpr1-release/build.txt
+# Check: https://android.googlesource.com/platform/external/kotlinc/+/refs/heads/android15-qpr2-release/build.txt
 kotlin = { strictly = "1.9.23" }
 ksp = "1.9.23-1.0.20" # Keep in match with kotlin version
 dokka = "1.9.20" # Dokka has no releases after 1.9.20
@@ -45,42 +39,59 @@ logging = { strictly = "6.0.3" }
 slf4j-api = { strictly = "2.0.16" }
 
 # Google versions
-# https://android.googlesource.com/platform/external/protobuf/+/refs/heads/android15-qpr1-release/java/pom.xml#7
+# https://android.googlesource.com/platform/external/protobuf/+/refs/heads/android15-qpr2-release/java/pom.xml#7
 protobuf = { strictly = "3.21.12" }
-# https://android.googlesource.com/platform/prebuilts/sdk/+/refs/heads/android15-qpr1-release/current/extras/material-design-x/Android.bp#7
-material = { strictly = "1.11.0" }
+# https://android.googlesource.com/platform/prebuilts/sdk/+/refs/heads/android15-qpr2-release/current/extras/material-design-x/Android.bp#7
+material = { strictly = "1.13.0-alpha08" }
 # careful with upgrading tink, so old backups continue to be decryptable
 # https://github.com/tink-crypto/tink-java/releases
 tink = { strictly = "1.15.0" }
 
 # Coroutines versions
-# https://android.googlesource.com/platform/external/kotlinx.coroutines/+/refs/heads/android15-qpr1-release/CHANGES.md
-coroutines = { strictly = "1.7.3" } # AOSP has 1.7.2 but several libs require 1.7.3
+# https://android.googlesource.com/platform/external/kotlinx.coroutines/+/refs/heads/android15-qpr2-release/CHANGES.md
+coroutines = { strictly = "1.8.1" }
 
 # AndroidX versions
-# https://android.googlesource.com/platform/prebuilts/sdk/+/android15-qpr1-release/current/androidx/m2repository/androidx/room/room-ktx?autodive=0
-room = { strictly = "2.7.0-alpha05" }
-# https://android.googlesource.com/platform/prebuilts/sdk/+/android15-qpr1-release/current/androidx/m2repository/androidx/core/core-ktx?autodive=0
-androidx-core = { strictly = "1.15.0-beta01" }
-# https://android.googlesource.com/platform/prebuilts/sdk/+/android15-qpr1-release/current/androidx/m2repository/androidx/fragment/fragment-ktx?autodive=0
-androidx-fragment = { strictly = "1.8.5" } # 1.9.0-alpha01 in AOSP but isn't released
-# https://android.googlesource.com/platform/prebuilts/sdk/+/android15-qpr1-release/current/androidx/m2repository/androidx/activity/activity-ktx?autodive=0
-androidx-activity = { strictly = "1.10.0-alpha02" }
+# https://android.googlesource.com/platform/prebuilts/sdk/+/android15-qpr2-release/current/androidx/m2repository/androidx/room/room-ktx?autodive=0
+room = { strictly = "2.7.0-alpha05" } # later versions require higher kotlin and up to 2.7.0-alpha12 there is a build system bug
+# https://android.googlesource.com/platform/prebuilts/sdk/+/android15-qpr2-release/current/androidx/m2repository/androidx/core/core-ktx?autodive=0
+androidx-core = { strictly = "1.16.0-alpha01" }
+# https://android.googlesource.com/platform/prebuilts/sdk/+/android15-qpr2-release/current/androidx/m2repository/androidx/fragment/fragment-ktx?autodive=0
+androidx-fragment = { strictly = "1.8.6" } # 1.9.0-alpha01 in AOSP but isn't released
+# https://android.googlesource.com/platform/prebuilts/sdk/+/android15-qpr2-release/current/androidx/m2repository/androidx/activity/activity-ktx?autodive=0
+androidx-activity = { strictly = "1.10.0-rc01" }
 # https://android.googlesource.com/platform/prebuilts/sdk/+/android-14.0.0_r29/current/androidx/m2repository/androidx/preference/preference?autodive=0
 androidx-preference = { strictly = "1.2.1" } # 1.3.0-alpha01 in AOSP but isn't released
-# https://android.googlesource.com/platform/prebuilts/sdk/+/android15-qpr1-release/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-ktx?autodive=0
-androidx-lifecycle-viewmodel-ktx = { strictly = "2.9.0-alpha03" }
-androidx-lifecycle-livedata-ktx = { strictly = "2.9.0-alpha03" }
-# https://android.googlesource.com/platform/prebuilts/sdk/+/android15-qpr1-release/current/androidx/m2repository/androidx/constraintlayout/constraintlayout?autodive=0
+# https://android.googlesource.com/platform/prebuilts/sdk/+/android15-qpr2-release/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-ktx?autodive=0
+androidx-lifecycle-viewmodel-ktx = { strictly = "2.9.0-alpha08" }
+androidx-lifecycle-livedata-ktx = { strictly = "2.9.0-alpha08" }
+# https://android.googlesource.com/platform/prebuilts/sdk/+/android15-qpr2-release/current/androidx/m2repository/androidx/constraintlayout/constraintlayout?autodive=0
 androidx-constraintlayout = { strictly = "2.2.0-beta01" }
-# https://android.googlesource.com/platform/prebuilts/sdk/+/android15-qpr1-release/current/androidx/m2repository/androidx/documentfile/documentfile?autodive=0
+# https://android.googlesource.com/platform/prebuilts/sdk/+/android15-qpr2-release/current/androidx/m2repository/androidx/documentfile/documentfile?autodive=0
 androidx-documentfile = { strictly = "1.1.0-alpha01" } # 1.1.0-alpha02 in AOSP but isn't released
-# https://android.googlesource.com/platform/prebuilts/sdk/+/android15-qpr1-release/current/androidx/m2repository/androidx/work/work-runtime-ktx?autodive=0
-androidx-work-runtime = { strictly = "2.10.0-beta01" }
+# https://android.googlesource.com/platform/prebuilts/sdk/+/android15-qpr2-release/current/androidx/m2repository/androidx/work/work-runtime-ktx?autodive=0
+androidx-work-runtime = { strictly = "2.10.0-rc01" }
 
-# https://android.googlesource.com/platform/external/okio/+/refs/heads/android15-qpr1-release/CHANGELOG.md
+# https://android.googlesource.com/platform/external/okio/+/refs/heads/android15-qpr2-release/CHANGELOG.md
 squareup-okio = { strictly = "3.7.0" }
 
+# Test versions
+junit4 = "4.13.2"
+junit5 = "5.10.2" # careful, upgrading this can change a Cipher's IV size in tests!?
+mockk = "1.13.8"
+androidXjunit = "1.2.1"
+androidXrunner = "1.6.2"
+androidXrules = "1.6.1"
+androidXuiautomator = "2.3.0"
+robolectric = "4.12.2"
+espresso = "3.6.1"
+turbine = "1.0.0"
+slf4jSimple = "2.0.3"
+hamcrest = "2.2"
+xpp3 = "1.1.6"
+zstdJni = "1.5.6-5"
+bitcoinjCore = "0.16.2"
+
 [libraries]
 # Kotlin standard dependencies
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
@@ -117,6 +128,30 @@ squareup-okio = { module= "com.squareup.okio:okio", version.ref = "squareup-okio
 kotlin-logging = { module = "io.github.oshai:kotlin-logging-jvm", version.ref = "logging" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j-api" }
 
+# Test dependencies
+junit4 = { module = "junit:junit", version.ref = "junit4" }
+kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
+junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit5" }
+junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit5" }
+junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit5" }
+junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit5" }
+androidx-junit = { module = "androidx.test.ext:junit", version.ref = "androidXjunit" }
+androidx-rules = { module = "androidx.test:rules", version.ref = "androidXrules" }
+androidx-runner = { module = "androidx.test:runner", version.ref = "androidXrunner" }
+androidx-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androidXuiautomator" }
+androidx-room-testing = { module = "androidx.room:room-testing", version.ref = "room" }
+robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
+androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
+mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
+mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockk" }
+kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
+turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
+hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" }
+slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4jSimple" }
+bitcoinj-core = { module = "org.bitcoinj:bitcoinj-core", version.ref = "bitcoinjCore" }
+xpp3 = { module = "org.ogce:xpp3", version.ref = "xpp3" }
+zstd-jni = { module = "com.github.luben:zstd-jni", version.ref = "zstdJni" }
+
 [bundles]
 kotlin = ["kotlin-stdlib", "kotlin-stdlib-jdk8", "kotlin-stdlib-common"]
 coroutines = ["kotlinx-coroutines-core-jvm", "kotlinx-coroutines-android"]

storage/lib/build.gradle.kts

@@ -107,12 +107,11 @@ dependencies {
 
     ksp(group = "androidx.room", name = "room-compiler", version = libs.versions.room.get())
     lintChecks(libs.thirdegg.lint.rules)
-    testImplementation("junit:junit:${libs.versions.junit4.get()}")
-    testImplementation("io.mockk:mockk:${libs.versions.mockk.get()}")
-    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:${libs.versions.kotlin.get()}")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.room:room-testing:${libs.versions.room.get()}")
-    androidTestImplementation(
-        "androidx.test.espresso:espresso-core:${libs.versions.espresso.get()}"
-    )
+    testImplementation(libs.junit4)
+    testImplementation(libs.mockk)
+    testImplementation(libs.kotlin.test.junit)
+
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.room.testing)
+    androidTestImplementation(libs.androidx.espresso.core)
 }