From 26b2c7b2fdb229be1b6a583f5e7208f6ff02fb79 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 31 Jul 2023 11:10:04 +0200 Subject: [PATCH] Upgrade test dependencies and fix instrumentation test issue --- app/build.gradle | 24 ++--- gradle/verification-metadata.xml | 145 +++++++++++++++++++++++++++++++ libs/database/build.gradle | 14 +-- libs/download/build.gradle | 4 +- libs/index/build.gradle | 4 +- 5 files changed, 169 insertions(+), 22 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f37ff806b..037cda4f5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -188,7 +188,9 @@ dependencies { implementation 'io.reactivex.rxjava3:rxjava:3.0.9' implementation "com.github.bumptech.glide:glide:4.14.2" - implementation "com.github.bumptech.glide:compose:1.0.0-alpha.1" + implementation("com.github.bumptech.glide:compose:1.0.0-alpha.1") { + exclude group: "androidx.test" + } annotationProcessor "com.github.bumptech.glide:compiler:4.14.2" implementation 'org.bouncycastle:bcprov-jdk15to18:1.71' @@ -206,21 +208,21 @@ dependencies { implementation "com.google.accompanist:accompanist-themeadapter-material:0.30.1" debugImplementation 'androidx.compose.ui:ui-tooling' - testImplementation 'androidx.test:core:1.4.0' + testImplementation 'androidx.test:core:1.5.0' testImplementation 'junit:junit:4.13.2' - testImplementation 'org.robolectric:robolectric:4.8.1' + testImplementation 'org.robolectric:robolectric:4.8.2' testImplementation 'org.mockito:mockito-core:3.9.0' testImplementation 'org.hamcrest:hamcrest:2.2' - androidTestImplementation 'androidx.arch.core:core-testing:2.1.0' - androidTestImplementation 'androidx.test:core:1.4.0' - androidTestImplementation 'androidx.test:runner:1.4.0' - androidTestImplementation 'androidx.test:rules:1.4.0' - androidTestImplementation 'androidx.test:monitor:1.4.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation 'androidx.test:core:1.5.0' + androidTestImplementation 'androidx.arch.core:core-testing:2.2.0' + androidTestImplementation 'androidx.test:runner:1.5.2' + androidTestImplementation 'androidx.test:rules:1.5.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test:monitor:1.6.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' - androidTestImplementation 'androidx.work:work-testing:2.7.1' + androidTestImplementation 'androidx.work:work-testing:2.8.1' } // org.fdroid.fdroid.updater.UpdateServiceTest needs app-full-debug.apk diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 6426c6619..dff1a7dd6 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -404,6 +404,11 @@ + + + + + @@ -1513,6 +1518,11 @@ + + + + + @@ -1531,6 +1541,11 @@ + + + + + @@ -1559,6 +1574,16 @@ + + + + + + + + + + @@ -1577,6 +1602,11 @@ + + + + + @@ -1595,6 +1625,16 @@ + + + + + + + + + + @@ -1613,6 +1653,11 @@ + + + + + @@ -1631,6 +1676,11 @@ + + + + + @@ -1649,11 +1699,26 @@ + + + + + + + + + + + + + + + @@ -1755,6 +1820,11 @@ + + + + + @@ -1765,6 +1835,11 @@ + + + + + @@ -3656,6 +3731,11 @@ + + + + + @@ -9789,6 +9869,11 @@ + + + + + @@ -10007,6 +10092,11 @@ + + + + + @@ -10025,11 +10115,21 @@ + + + + + + + + + + @@ -10048,6 +10148,11 @@ + + + + + @@ -10066,6 +10171,11 @@ + + + + + @@ -10084,6 +10194,11 @@ + + + + + @@ -10102,6 +10217,11 @@ + + + + + @@ -10120,6 +10240,11 @@ + + + + + @@ -10138,6 +10263,11 @@ + + + + + @@ -10156,6 +10286,11 @@ + + + + + @@ -10174,6 +10309,11 @@ + + + + + @@ -10192,6 +10332,11 @@ + + + + + diff --git a/libs/database/build.gradle b/libs/database/build.gradle index e9858e657..cee21463f 100644 --- a/libs/database/build.gradle +++ b/libs/database/build.gradle @@ -82,10 +82,10 @@ dependencies { testImplementation 'junit:junit:4.13.2' testImplementation 'io.mockk:mockk:1.12.4' testImplementation 'org.jetbrains.kotlin:kotlin-test' - testImplementation 'androidx.test:core:1.4.0' - testImplementation 'androidx.test.ext:junit:1.1.3' - testImplementation 'androidx.arch.core:core-testing:2.1.0' - testImplementation 'org.robolectric:robolectric:4.8.1' + testImplementation 'androidx.test:core:1.5.0' + testImplementation 'androidx.test.ext:junit:1.1.5' + testImplementation 'androidx.arch.core:core-testing:2.2.0' + testImplementation 'org.robolectric:robolectric:4.8.2' testImplementation 'commons-io:commons-io:2.6' testImplementation 'ch.qos.logback:logback-classic:1.2.11' testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.2' @@ -94,9 +94,9 @@ dependencies { androidTestImplementation project(":libs:sharedTest") androidTestImplementation 'io.mockk:mockk-android:1.12.3' // 1.12.4 has strange error androidTestImplementation 'org.jetbrains.kotlin:kotlin-test' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.arch.core:core-testing:2.1.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.arch.core:core-testing:2.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' androidTestImplementation 'commons-io:commons-io:2.6' } diff --git a/libs/download/build.gradle b/libs/download/build.gradle index baa81511b..6d955d73b 100644 --- a/libs/download/build.gradle +++ b/libs/download/build.gradle @@ -74,8 +74,8 @@ kotlin { dependsOn(commonTest) dependencies { implementation project(":libs:sharedTest") - implementation 'androidx.test:runner:1.4.0' - implementation 'androidx.test.ext:junit:1.1.3' + implementation 'androidx.test:runner:1.5.2' + implementation 'androidx.test.ext:junit:1.1.5' } } nativeMain { diff --git a/libs/index/build.gradle b/libs/index/build.gradle index 47e98730a..04bf69eaf 100644 --- a/libs/index/build.gradle +++ b/libs/index/build.gradle @@ -75,8 +75,8 @@ kotlin { dependencies { implementation project(":libs:sharedTest") implementation kotlin('test') - implementation 'androidx.test:runner:1.4.0' - implementation 'androidx.test.ext:junit:1.1.3' + implementation 'androidx.test:runner:1.5.2' + implementation 'androidx.test.ext:junit:1.1.5' } } nativeMain {