diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-07-30 11:15:31 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-07-30 12:33:35 +0200 |
| commit | 178de608427decc65c18acdc78af814b6aebf9a1 (patch) | |
| tree | e81fb361c01d610724937c59cc587ecb1aca8a82 /android | |
| parent | c8c529c7d3b18d3239d9a8085229906efd10c0aa (diff) | |
| download | mullvadvpn-178de608427decc65c18acdc78af814b6aebf9a1.tar.xz mullvadvpn-178de608427decc65c18acdc78af814b6aebf9a1.zip | |
Bump junit
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/build.gradle.kts | 9 | ||||
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Versions.kt | 4 | ||||
| -rwxr-xr-x | android/scripts/run-instrumented-tests.sh | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index e5e577fe0a..f0c5766647 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -243,6 +243,13 @@ android { project.tasks.assemble.dependsOn("ensureValidVersionCode") } +junitPlatform { + instrumentationTests { + version.set(Versions.Android.junit) + includeExtensions.set(true) + } +} + composeCompiler { enableStrongSkippingMode = true } androidComponents { @@ -369,8 +376,6 @@ dependencies { testImplementation(Dependencies.junitParams) // UI test dependencies - // Fixes: https://github.com/android/android-test/issues/1589 - debugImplementation(Dependencies.AndroidX.testMonitor) debugImplementation(Dependencies.Compose.testManifest) androidTestImplementation(Dependencies.Koin.test) androidTestImplementation(Dependencies.Kotlin.test) diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index 9e2efcdd33..a985889254 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -15,7 +15,7 @@ object Versions { object Android { const val compileSdkVersion = 34 - const val junit = "1.4.0" + const val junit = "1.5.0" const val minSdkVersion = 26 const val targetSdkVersion = 34 const val volley = "1.2.1" @@ -64,7 +64,7 @@ object Versions { const val dependencyCheck = "10.0.3" const val detekt = "1.23.6" const val gradleVersions = "0.51.0" - const val junit5 = "1.10.0.0" + const val junit5 = "1.10.2.0" const val ktfmt = "0.17.0" // Ksp version is linked with kotlin version, find matching release here: // https://github.com/google/ksp/releases diff --git a/android/scripts/run-instrumented-tests.sh b/android/scripts/run-instrumented-tests.sh index 77e29e48fe..f966bcfa12 100755 --- a/android/scripts/run-instrumented-tests.sh +++ b/android/scripts/run-instrumented-tests.sh @@ -10,8 +10,8 @@ AUTO_FETCH_TEST_HELPER_APKS=${AUTO_FETCH_TEST_HELPER_APKS:-"false"} APK_BASE_DIR=${APK_BASE_DIR:-"$SCRIPT_DIR/.."} LOG_FAILURE_MESSAGE="FAILURES!!!" -ORCHESTRATOR_URL=https://dl.google.com/android/maven2/androidx/test/orchestrator/1.4.2/orchestrator-1.4.2.apk -TEST_SERVICES_URL=https://dl.google.com/android/maven2/androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk +ORCHESTRATOR_URL=https://dl.google.com/android/maven2/androidx/test/orchestrator/1.5.0/orchestrator-1.5.0.apk +TEST_SERVICES_URL=https://dl.google.com/android/maven2/androidx/test/services/test-services/1.5.0/test-services-1.5.0.apk PARTNER_AUTH="${PARTNER_AUTH:-}" VALID_TEST_ACCOUNT_NUMBER="${VALID_TEST_ACCOUNT_NUMBER:-}" |