Skip to content

Commit 2630a4e

Browse files
rbro112rbro112
authored
Move more test dependencies to use version catalogs (#4424)
* Move more test dependencies to use version catalogs * Orchestrator to androidTestUtil * Fix * Fixes
1 parent f5b4aee commit 2630a4e

File tree

13 files changed

+49
-49
lines changed

13 files changed

+49
-49
lines changed

‎buildSrc/src/main/java/Config.kt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ object Config {
4343
private val lifecycleVersion = "2.2.0"
4444
val lifecycleProcess = "androidx.lifecycle:lifecycle-process:$lifecycleVersion"
4545
val lifecycleCommonJava8 = "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
46-
val androidxCore = "androidx.core:core:1.3.2"
4746
val androidxSqlite = "androidx.sqlite:sqlite:2.3.1"
4847
val androidxRecylerView = "androidx.recyclerview:recyclerview:1.2.1"
4948
val androidxAnnotation = "androidx.annotation:annotation:1.9.1"
@@ -174,18 +173,7 @@ object Config {
174173
}
175174

176175
object TestLibs {
177-
private val espressoVersion = "3.5.0"
178-
179176
val androidJUnitRunner = "androidx.test.runner.AndroidJUnitRunner"
180-
val androidxCore = "androidx.test:core:1.6.1"
181-
val androidxRunner = "androidx.test:runner:1.6.2"
182-
val androidxTestCoreKtx = "androidx.test:core-ktx:1.6.1"
183-
val androidxTestRules = "androidx.test:rules:1.6.1"
184-
val espressoCore = "androidx.test.espresso:espresso-core:$espressoVersion"
185-
val espressoIdlingResource = "androidx.test.espresso:espresso-idling-resource:$espressoVersion"
186-
val androidxTestOrchestrator = "androidx.test:orchestrator:1.5.0"
187-
val androidxJunit = "androidx.test.ext:junit:1.1.5"
188-
val androidxCoreKtx = "androidx.core:core-ktx:1.7.0"
189177
val awaitility = "org.awaitility:awaitility-kotlin:4.1.1"
190178
val awaitility3 = "org.awaitility:awaitility-kotlin:3.1.6" // need this due to a conflict of awaitility4+ and espresso on hamcrest
191179
val hsqldb = "org.hsqldb:hsqldb:2.6.1"
@@ -194,7 +182,6 @@ object Config {
194182
val leakCanaryInstrumentation = "com.squareup.leakcanary:leakcanary-android-instrumentation:2.14"
195183
val composeUiTestJunit4 = "androidx.compose.ui:ui-test-junit4:1.6.8"
196184
val okio = "com.squareup.okio:okio:1.13.0"
197-
val coroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1"
198185
}
199186

200187
object QualityPlugins {

‎gradle/libs.versions.toml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
[versions]
2+
androidxTestCore = "1.6.1"
3+
composeVersion = "1.6.11"
4+
espresso = "3.5.0"
25
kotlin = "1.9.24"
36
# see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility
47
# see https://developer.android.com/jetpack/androidx/releases/compose-kotlin
5-
composeVersion = "1.6.11"
68
okhttp = "4.9.2"
79
springTwo = "2.7.18"
810
springThree = "3.4.2"
@@ -27,9 +29,20 @@ spring-boot-three = { id = "org.springframework.boot", version.ref = "springThre
2729
spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE" }
2830

2931
[libraries]
32+
androidx-core = { module = "androidx.core:core", version = "1.3.2"}
33+
androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.7.0" }
3034
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
3135

3236
# test libraries
37+
androidx-test-core = { module = "androidx.test:core", version.ref = "androidxTestCore" }
38+
androidx-test-core-ktx = { module = "androidx.test:core-ktx", version.ref = "androidxTestCore" }
39+
androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
40+
androidx-test-espresso-idling-resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "espresso" }
41+
androidx-test-ext-junit = { module = "androidx.test.ext:junit", version = "1.1.5" }
42+
androidx-test-orchestrator = { module = "androidx.test:orchestrator", version = "1.5.0" }
43+
androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidxTestCore" }
44+
androidx-test-runner = { module = "androidx.test:runner", version = "1.6.2" }
45+
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.6.1" }
3346
mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version = "4.1.0" }
3447
mockito-inline = { module = "org.mockito:mockito-inline", version = "4.8.0" }
3548
okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }

‎sentry-android-core/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ dependencies {
8585
// lifecycle processor, session tracking
8686
implementation(Config.Libs.lifecycleProcess)
8787
implementation(Config.Libs.lifecycleCommonJava8)
88-
implementation(Config.Libs.androidxCore)
88+
implementation(libs.androidx.core)
8989

9090
compileOnly(Config.CompileOnly.nopen)
9191
errorprone(Config.CompileOnly.nopenChecker)
@@ -97,10 +97,10 @@ dependencies {
9797
testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
9898
testImplementation(libs.roboelectric)
9999
testImplementation(libs.kotlin.test.junit)
100-
testImplementation(Config.TestLibs.androidxCore)
101-
testImplementation(Config.TestLibs.androidxRunner)
102-
testImplementation(Config.TestLibs.androidxJunit)
103-
testImplementation(Config.TestLibs.androidxCoreKtx)
100+
testImplementation(libs.androidx.core.ktx)
101+
testImplementation(libs.androidx.test.core)
102+
testImplementation(libs.androidx.test.ext.junit)
103+
testImplementation(libs.androidx.test.runner)
104104
testImplementation(libs.mockito.kotlin)
105105
testImplementation(libs.mockito.inline)
106106
testImplementation(Config.TestLibs.awaitility)

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,24 +89,24 @@ dependencies {
8989

9090
implementation(projects.sentryAndroid)
9191
implementation(Config.Libs.appCompat)
92-
implementation(Config.Libs.androidxCore)
92+
implementation(libs.androidx.core)
9393
implementation(Config.Libs.androidxRecylerView)
9494
implementation(Config.Libs.constraintLayout)
95-
implementation(Config.TestLibs.espressoIdlingResource)
95+
implementation(libs.androidx.test.espresso.idling.resource)
9696

9797
compileOnly(Config.CompileOnly.nopen)
9898
errorprone(Config.CompileOnly.nopenChecker)
9999
errorprone(Config.CompileOnly.errorprone)
100100
errorprone(Config.CompileOnly.errorProneNullAway)
101101

102+
androidTestUtil(libs.androidx.test.orchestrator)
102103
androidTestImplementation(projects.sentryTestSupport)
103104
androidTestImplementation(libs.kotlin.test.junit)
104-
androidTestImplementation(Config.TestLibs.espressoCore)
105-
androidTestImplementation(Config.TestLibs.androidxTestCoreKtx)
106-
androidTestImplementation(Config.TestLibs.androidxRunner)
107-
androidTestImplementation(Config.TestLibs.androidxTestRules)
108-
androidTestImplementation(Config.TestLibs.androidxJunit)
109-
androidTestUtil(Config.TestLibs.androidxTestOrchestrator)
105+
androidTestImplementation(libs.androidx.test.espresso.core)
106+
androidTestImplementation(libs.androidx.test.core.ktx)
107+
androidTestImplementation(libs.androidx.test.ext.junit)
108+
androidTestImplementation(libs.androidx.test.rules)
109+
androidTestImplementation(libs.androidx.test.runner)
110110
}
111111

112112
tasks.withType<JavaCompile>().configureEach {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ android {
4949

5050
dependencies {
5151
implementation(kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION))
52-
implementation(Config.Libs.androidxCore)
52+
implementation(libs.androidx.core)
5353
implementation(Config.Libs.composeActivity)
5454
implementation(Config.Libs.composeFoundation)
5555
implementation(Config.Libs.composeMaterial)

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,31 +101,31 @@ dependencies {
101101
implementation(projects.sentryAndroidCore)
102102
}
103103
implementation(Config.Libs.appCompat)
104-
implementation(Config.Libs.androidxCore)
104+
implementation(libs.androidx.core)
105105
implementation(Config.Libs.composeActivity)
106106
implementation(Config.Libs.composeFoundation)
107107
implementation(Config.Libs.composeMaterial)
108108
implementation(Config.Libs.androidxRecylerView)
109109
implementation(Config.Libs.constraintLayout)
110-
implementation(Config.TestLibs.espressoIdlingResource)
110+
implementation(libs.androidx.test.espresso.idling.resource)
111111
implementation(Config.Libs.leakCanary)
112112

113113
compileOnly(Config.CompileOnly.nopen)
114114
errorprone(Config.CompileOnly.nopenChecker)
115115
errorprone(Config.CompileOnly.errorprone)
116116
errorprone(Config.CompileOnly.errorProneNullAway)
117117

118+
androidTestUtil(libs.androidx.test.orchestrator)
118119
androidTestImplementation(projects.sentryTestSupport)
119120
androidTestImplementation(libs.kotlin.test.junit)
120-
androidTestImplementation(Config.TestLibs.espressoCore)
121-
androidTestImplementation(Config.TestLibs.androidxRunner)
122-
androidTestImplementation(Config.TestLibs.androidxTestRules)
123-
androidTestImplementation(Config.TestLibs.androidxTestCoreKtx)
121+
androidTestImplementation(libs.androidx.test.core.ktx)
122+
androidTestImplementation(libs.androidx.test.espresso.core)
123+
androidTestImplementation(libs.androidx.test.ext.junit)
124+
androidTestImplementation(libs.androidx.test.rules)
125+
androidTestImplementation(libs.androidx.test.runner)
124126
androidTestImplementation(libs.okhttp.mockwebserver)
125-
androidTestImplementation(Config.TestLibs.androidxJunit)
126127
androidTestImplementation(Config.TestLibs.leakCanaryInstrumentation)
127128
androidTestImplementation(Config.TestLibs.awaitility3)
128-
androidTestUtil(Config.TestLibs.androidxTestOrchestrator)
129129
}
130130

131131
tasks.withType<JavaCompile>().configureEach {

‎sentry-android-navigation/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ dependencies {
7676
testImplementation(libs.mockito.inline)
7777

7878
testImplementation(libs.roboelectric)
79-
testImplementation(Config.TestLibs.androidxCore)
80-
testImplementation(Config.TestLibs.androidxRunner)
81-
testImplementation(Config.TestLibs.androidxJunit)
82-
testImplementation(Config.TestLibs.androidxCoreKtx)
79+
testImplementation(libs.androidx.core)
80+
testImplementation(libs.androidx.core.ktx)
81+
testImplementation(libs.androidx.test.ext.junit)
82+
testImplementation(libs.androidx.test.runner)
8383
}
8484

8585
tasks.withType<Detekt>().configureEach {

‎sentry-android-replay/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ dependencies {
8888
testImplementation(projects.sentryAndroidCore)
8989
testImplementation(libs.roboelectric)
9090
testImplementation(libs.kotlin.test.junit)
91-
testImplementation(Config.TestLibs.androidxRunner)
92-
testImplementation(Config.TestLibs.androidxJunit)
91+
testImplementation(libs.androidx.test.ext.junit)
92+
testImplementation(libs.androidx.test.runner)
9393
testImplementation(libs.mockito.kotlin)
9494
testImplementation(libs.mockito.inline)
9595
testImplementation(Config.TestLibs.awaitility)

‎sentry-android-sqlite/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ dependencies {
7474
// tests
7575
testImplementation(Config.Libs.androidxSqlite)
7676
testImplementation(libs.kotlin.test.junit)
77-
testImplementation(Config.TestLibs.androidxJunit)
77+
testImplementation(libs.androidx.test.ext.junit)
7878
testImplementation(libs.mockito.kotlin)
7979
testImplementation(libs.mockito.inline)
8080
}

‎sentry-android-timber/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ dependencies {
7777
// tests
7878
testImplementation(Config.Libs.timber)
7979
testImplementation(libs.kotlin.test.junit)
80-
testImplementation(Config.TestLibs.androidxJunit)
80+
testImplementation(libs.androidx.test.ext.junit)
8181
testImplementation(libs.mockito.kotlin)
8282
testImplementation(libs.mockito.inline)
8383
}

0 commit comments

Comments
 (0)