Move more test dependencies to use version catalogs (#4424)

* Move more test dependencies to use version catalogs

* Orchestrator to androidTestUtil

* Fix

* Fixes

Author: rbro112

buildSrc/src/main/java/Config.kt

@@ -43,7 +43,6 @@ object Config {
         private val lifecycleVersion = "2.2.0"
         val lifecycleProcess = "androidx.lifecycle:lifecycle-process:$lifecycleVersion"
         val lifecycleCommonJava8 = "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
-        val androidxCore = "androidx.core:core:1.3.2"
         val androidxSqlite = "androidx.sqlite:sqlite:2.3.1"
         val androidxRecylerView = "androidx.recyclerview:recyclerview:1.2.1"
         val androidxAnnotation = "androidx.annotation:annotation:1.9.1"
@@ -174,18 +173,7 @@ object Config {
     }
 
     object TestLibs {
-        private val espressoVersion = "3.5.0"
-
         val androidJUnitRunner = "androidx.test.runner.AndroidJUnitRunner"
-        val androidxCore = "androidx.test:core:1.6.1"
-        val androidxRunner = "androidx.test:runner:1.6.2"
-        val androidxTestCoreKtx = "androidx.test:core-ktx:1.6.1"
-        val androidxTestRules = "androidx.test:rules:1.6.1"
-        val espressoCore = "androidx.test.espresso:espresso-core:$espressoVersion"
-        val espressoIdlingResource = "androidx.test.espresso:espresso-idling-resource:$espressoVersion"
-        val androidxTestOrchestrator = "androidx.test:orchestrator:1.5.0"
-        val androidxJunit = "androidx.test.ext:junit:1.1.5"
-        val androidxCoreKtx = "androidx.core:core-ktx:1.7.0"
         val awaitility = "org.awaitility:awaitility-kotlin:4.1.1"
         val awaitility3 = "org.awaitility:awaitility-kotlin:3.1.6" // need this due to a conflict of awaitility4+ and espresso on hamcrest
         val hsqldb = "org.hsqldb:hsqldb:2.6.1"
@@ -194,7 +182,6 @@ object Config {
         val leakCanaryInstrumentation = "com.squareup.leakcanary:leakcanary-android-instrumentation:2.14"
         val composeUiTestJunit4 = "androidx.compose.ui:ui-test-junit4:1.6.8"
         val okio = "com.squareup.okio:okio:1.13.0"
-        val coroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1"
     }
 
     object QualityPlugins {

gradle/libs.versions.toml

@@ -1,8 +1,10 @@
 [versions]
+androidxTestCore = "1.6.1"
+composeVersion = "1.6.11"
+espresso = "3.5.0"
 kotlin = "1.9.24"
 # see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility
 # see https://developer.android.com/jetpack/androidx/releases/compose-kotlin
-composeVersion = "1.6.11"
 okhttp = "4.9.2"
 springTwo = "2.7.18"
 springThree = "3.4.2"
@@ -27,9 +29,20 @@ spring-boot-three = { id = "org.springframework.boot", version.ref = "springThre
 spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE" }
 
 [libraries]
+androidx-core = { module = "androidx.core:core", version = "1.3.2"}
+androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.7.0" }
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 
 # test libraries
+androidx-test-core = { module = "androidx.test:core", version.ref = "androidxTestCore" }
+androidx-test-core-ktx = { module = "androidx.test:core-ktx", version.ref = "androidxTestCore" }
+androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
+androidx-test-espresso-idling-resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "espresso" }
+androidx-test-ext-junit = { module = "androidx.test.ext:junit", version = "1.1.5" }
+androidx-test-orchestrator = { module = "androidx.test:orchestrator", version = "1.5.0" }
+androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidxTestCore" }
+androidx-test-runner = { module = "androidx.test:runner", version = "1.6.2" }
+kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.6.1" }
 mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version = "4.1.0" }
 mockito-inline = { module = "org.mockito:mockito-inline", version = "4.8.0" }
 okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }

sentry-android-core/build.gradle.kts

@@ -85,7 +85,7 @@ dependencies {
     // lifecycle processor, session tracking
     implementation(Config.Libs.lifecycleProcess)
     implementation(Config.Libs.lifecycleCommonJava8)
-    implementation(Config.Libs.androidxCore)
+    implementation(libs.androidx.core)
 
     compileOnly(Config.CompileOnly.nopen)
     errorprone(Config.CompileOnly.nopenChecker)
@@ -97,10 +97,10 @@ dependencies {
     testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
     testImplementation(libs.roboelectric)
     testImplementation(libs.kotlin.test.junit)
-    testImplementation(Config.TestLibs.androidxCore)
-    testImplementation(Config.TestLibs.androidxRunner)
-    testImplementation(Config.TestLibs.androidxJunit)
-    testImplementation(Config.TestLibs.androidxCoreKtx)
+    testImplementation(libs.androidx.core.ktx)
+    testImplementation(libs.androidx.test.core)
+    testImplementation(libs.androidx.test.ext.junit)
+    testImplementation(libs.androidx.test.runner)
     testImplementation(libs.mockito.kotlin)
     testImplementation(libs.mockito.inline)
     testImplementation(Config.TestLibs.awaitility)

sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts

@@ -89,24 +89,24 @@ dependencies {
 
     implementation(projects.sentryAndroid)
     implementation(Config.Libs.appCompat)
-    implementation(Config.Libs.androidxCore)
+    implementation(libs.androidx.core)
     implementation(Config.Libs.androidxRecylerView)
     implementation(Config.Libs.constraintLayout)
-    implementation(Config.TestLibs.espressoIdlingResource)
+    implementation(libs.androidx.test.espresso.idling.resource)
 
     compileOnly(Config.CompileOnly.nopen)
     errorprone(Config.CompileOnly.nopenChecker)
     errorprone(Config.CompileOnly.errorprone)
     errorprone(Config.CompileOnly.errorProneNullAway)
 
+    androidTestUtil(libs.androidx.test.orchestrator)
     androidTestImplementation(projects.sentryTestSupport)
     androidTestImplementation(libs.kotlin.test.junit)
-    androidTestImplementation(Config.TestLibs.espressoCore)
-    androidTestImplementation(Config.TestLibs.androidxTestCoreKtx)
-    androidTestImplementation(Config.TestLibs.androidxRunner)
-    androidTestImplementation(Config.TestLibs.androidxTestRules)
-    androidTestImplementation(Config.TestLibs.androidxJunit)
-    androidTestUtil(Config.TestLibs.androidxTestOrchestrator)
+    androidTestImplementation(libs.androidx.test.espresso.core)
+    androidTestImplementation(libs.androidx.test.core.ktx)
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.rules)
+    androidTestImplementation(libs.androidx.test.runner)
 }
 
 tasks.withType<JavaCompile>().configureEach {

sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts

@@ -49,7 +49,7 @@ android {
 
 dependencies {
     implementation(kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION))
-    implementation(Config.Libs.androidxCore)
+    implementation(libs.androidx.core)
     implementation(Config.Libs.composeActivity)
     implementation(Config.Libs.composeFoundation)
     implementation(Config.Libs.composeMaterial)

sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts

@@ -101,31 +101,31 @@ dependencies {
         implementation(projects.sentryAndroidCore)
     }
     implementation(Config.Libs.appCompat)
-    implementation(Config.Libs.androidxCore)
+    implementation(libs.androidx.core)
     implementation(Config.Libs.composeActivity)
     implementation(Config.Libs.composeFoundation)
     implementation(Config.Libs.composeMaterial)
     implementation(Config.Libs.androidxRecylerView)
     implementation(Config.Libs.constraintLayout)
-    implementation(Config.TestLibs.espressoIdlingResource)
+    implementation(libs.androidx.test.espresso.idling.resource)
     implementation(Config.Libs.leakCanary)
 
     compileOnly(Config.CompileOnly.nopen)
     errorprone(Config.CompileOnly.nopenChecker)
     errorprone(Config.CompileOnly.errorprone)
     errorprone(Config.CompileOnly.errorProneNullAway)
 
+    androidTestUtil(libs.androidx.test.orchestrator)
     androidTestImplementation(projects.sentryTestSupport)
     androidTestImplementation(libs.kotlin.test.junit)
-    androidTestImplementation(Config.TestLibs.espressoCore)
-    androidTestImplementation(Config.TestLibs.androidxRunner)
-    androidTestImplementation(Config.TestLibs.androidxTestRules)
-    androidTestImplementation(Config.TestLibs.androidxTestCoreKtx)
+    androidTestImplementation(libs.androidx.test.core.ktx)
+    androidTestImplementation(libs.androidx.test.espresso.core)
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.rules)
+    androidTestImplementation(libs.androidx.test.runner)
     androidTestImplementation(libs.okhttp.mockwebserver)
-    androidTestImplementation(Config.TestLibs.androidxJunit)
     androidTestImplementation(Config.TestLibs.leakCanaryInstrumentation)
     androidTestImplementation(Config.TestLibs.awaitility3)
-    androidTestUtil(Config.TestLibs.androidxTestOrchestrator)
 }
 
 tasks.withType<JavaCompile>().configureEach {

sentry-android-navigation/build.gradle.kts

@@ -76,10 +76,10 @@ dependencies {
     testImplementation(libs.mockito.inline)
 
     testImplementation(libs.roboelectric)
-    testImplementation(Config.TestLibs.androidxCore)
-    testImplementation(Config.TestLibs.androidxRunner)
-    testImplementation(Config.TestLibs.androidxJunit)
-    testImplementation(Config.TestLibs.androidxCoreKtx)
+    testImplementation(libs.androidx.core)
+    testImplementation(libs.androidx.core.ktx)
+    testImplementation(libs.androidx.test.ext.junit)
+    testImplementation(libs.androidx.test.runner)
 }
 
 tasks.withType<Detekt>().configureEach {

sentry-android-replay/build.gradle.kts

@@ -88,8 +88,8 @@ dependencies {
     testImplementation(projects.sentryAndroidCore)
     testImplementation(libs.roboelectric)
     testImplementation(libs.kotlin.test.junit)
-    testImplementation(Config.TestLibs.androidxRunner)
-    testImplementation(Config.TestLibs.androidxJunit)
+    testImplementation(libs.androidx.test.ext.junit)
+    testImplementation(libs.androidx.test.runner)
     testImplementation(libs.mockito.kotlin)
     testImplementation(libs.mockito.inline)
     testImplementation(Config.TestLibs.awaitility)

sentry-android-sqlite/build.gradle.kts

@@ -74,7 +74,7 @@ dependencies {
     // tests
     testImplementation(Config.Libs.androidxSqlite)
     testImplementation(libs.kotlin.test.junit)
-    testImplementation(Config.TestLibs.androidxJunit)
+    testImplementation(libs.androidx.test.ext.junit)
     testImplementation(libs.mockito.kotlin)
     testImplementation(libs.mockito.inline)
 }

sentry-android-timber/build.gradle.kts

@@ -77,7 +77,7 @@ dependencies {
     // tests
     testImplementation(Config.Libs.timber)
     testImplementation(libs.kotlin.test.junit)
-    testImplementation(Config.TestLibs.androidxJunit)
+    testImplementation(libs.androidx.test.ext.junit)
     testImplementation(libs.mockito.kotlin)
     testImplementation(libs.mockito.inline)
 }