Skip to content

Commit f5b4aee

Browse files
authored
Migrate some test dependencies to version catalogs (#4422)
* Migrate some test dependencies to version catalogs * Remove commented out
1 parent e0d5c10 commit f5b4aee

File tree

39 files changed

+81
-79
lines changed

39 files changed

+81
-79
lines changed

buildSrc/src/main/java/Config.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,8 @@ object Config {
186186
val androidxTestOrchestrator = "androidx.test:orchestrator:1.5.0"
187187
val androidxJunit = "androidx.test.ext:junit:1.1.5"
188188
val androidxCoreKtx = "androidx.core:core-ktx:1.7.0"
189-
val robolectric = "org.robolectric:robolectric:4.14"
190-
val mockitoKotlin = "org.mockito.kotlin:mockito-kotlin:4.1.0"
191-
val mockitoInline = "org.mockito:mockito-inline:4.8.0"
192189
val awaitility = "org.awaitility:awaitility-kotlin:4.1.1"
193190
val awaitility3 = "org.awaitility:awaitility-kotlin:3.1.6" // need this due to a conflict of awaitility4+ and espresso on hamcrest
194-
val mockWebserver = "com.squareup.okhttp3:mockwebserver:${Libs.okHttpVersion}"
195-
val jsonUnit = "net.javacrumbs.json-unit:json-unit:2.32.0"
196191
val hsqldb = "org.hsqldb:hsqldb:2.6.1"
197192
val javaFaker = "com.github.javafaker:javafaker:1.0.2"
198193
val msgpack = "org.msgpack:msgpack-core:0.9.8"

gradle/libs.versions.toml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ kotlin = "1.9.24"
33
# see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility
44
# see https://developer.android.com/jetpack/androidx/releases/compose-kotlin
55
composeVersion = "1.6.11"
6+
okhttp = "4.9.2"
67
springTwo = "2.7.18"
78
springThree = "3.4.2"
89

@@ -15,15 +16,21 @@ dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version = "2.0.0" }
1516
binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.0" }
1617
compose-compiler = { id = "org.jetbrains.compose", version.ref = "composeVersion" }
1718
errorprone = { id = "net.ltgt.errorprone", version = "3.0.1" }
18-
gradle-versions = {id = "com.github.ben-manes.versions", version = "0.42.0" }
19+
gradle-versions = { id = "com.github.ben-manes.versions", version = "0.42.0" }
1920
spotless = { id = "com.diffplug.spotless", version = "6.11.0" }
20-
detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8"}
21+
detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8" }
2122
jacoco-android = { id = "com.mxalbert.gradle.jacoco-android", version = "0.2.0" }
2223
kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.3" }
23-
vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
24+
vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
2425
spring-boot-two = { id = "org.springframework.boot", version.ref = "springTwo" }
2526
spring-boot-three = { id = "org.springframework.boot", version.ref = "springThree" }
26-
spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE"}
27+
spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE" }
2728

2829
[libraries]
2930
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
31+
32+
# test libraries
33+
mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version = "4.1.0" }
34+
mockito-inline = { module = "org.mockito:mockito-inline", version = "4.8.0" }
35+
okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
36+
roboelectric = { module = "org.robolectric:robolectric", version = "4.14" }

sentry-android-core/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@ dependencies {
9595

9696
// tests
9797
testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
98-
testImplementation(Config.TestLibs.robolectric)
98+
testImplementation(libs.roboelectric)
9999
testImplementation(libs.kotlin.test.junit)
100100
testImplementation(Config.TestLibs.androidxCore)
101101
testImplementation(Config.TestLibs.androidxRunner)
102102
testImplementation(Config.TestLibs.androidxJunit)
103103
testImplementation(Config.TestLibs.androidxCoreKtx)
104-
testImplementation(Config.TestLibs.mockitoKotlin)
105-
testImplementation(Config.TestLibs.mockitoInline)
104+
testImplementation(libs.mockito.kotlin)
105+
testImplementation(libs.mockito.inline)
106106
testImplementation(Config.TestLibs.awaitility)
107107
testImplementation(projects.sentryTestSupport)
108108
testImplementation(projects.sentryAndroidFragment)

sentry-android-fragment/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ dependencies {
7070
// tests
7171
testImplementation(Config.Libs.fragment)
7272
testImplementation(libs.kotlin.test.junit)
73-
testImplementation(Config.TestLibs.mockitoKotlin)
74-
testImplementation(Config.TestLibs.mockitoInline)
73+
testImplementation(libs.mockito.kotlin)
74+
testImplementation(libs.mockito.inline)
7575
}
7676

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ dependencies {
121121
androidTestImplementation(Config.TestLibs.androidxRunner)
122122
androidTestImplementation(Config.TestLibs.androidxTestRules)
123123
androidTestImplementation(Config.TestLibs.androidxTestCoreKtx)
124-
androidTestImplementation(Config.TestLibs.mockWebserver)
124+
androidTestImplementation(libs.okhttp.mockwebserver)
125125
androidTestImplementation(Config.TestLibs.androidxJunit)
126126
androidTestImplementation(Config.TestLibs.leakCanaryInstrumentation)
127127
androidTestImplementation(Config.TestLibs.awaitility3)

sentry-android-navigation/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ dependencies {
7272
testImplementation(Config.Libs.navigationRuntime)
7373

7474
testImplementation(libs.kotlin.test.junit)
75-
testImplementation(Config.TestLibs.mockitoKotlin)
76-
testImplementation(Config.TestLibs.mockitoInline)
75+
testImplementation(libs.mockito.kotlin)
76+
testImplementation(libs.mockito.inline)
7777

78-
testImplementation(Config.TestLibs.robolectric)
78+
testImplementation(libs.roboelectric)
7979
testImplementation(Config.TestLibs.androidxCore)
8080
testImplementation(Config.TestLibs.androidxRunner)
8181
testImplementation(Config.TestLibs.androidxJunit)

sentry-android-ndk/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,6 @@ dependencies {
8989

9090
testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
9191
testImplementation(libs.kotlin.test.junit)
92-
testImplementation(Config.TestLibs.mockitoKotlin)
92+
testImplementation(libs.mockito.kotlin)
9393
testImplementation(projects.sentryTestSupport)
9494
}

sentry-android-replay/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ dependencies {
8686
// tests
8787
testImplementation(projects.sentryTestSupport)
8888
testImplementation(projects.sentryAndroidCore)
89-
testImplementation(Config.TestLibs.robolectric)
89+
testImplementation(libs.roboelectric)
9090
testImplementation(libs.kotlin.test.junit)
9191
testImplementation(Config.TestLibs.androidxRunner)
9292
testImplementation(Config.TestLibs.androidxJunit)
93-
testImplementation(Config.TestLibs.mockitoKotlin)
94-
testImplementation(Config.TestLibs.mockitoInline)
93+
testImplementation(libs.mockito.kotlin)
94+
testImplementation(libs.mockito.inline)
9595
testImplementation(Config.TestLibs.awaitility)
9696
testImplementation(Config.Libs.composeActivity)
9797
testImplementation(Config.Libs.composeUi)

sentry-android-sqlite/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ dependencies {
7575
testImplementation(Config.Libs.androidxSqlite)
7676
testImplementation(libs.kotlin.test.junit)
7777
testImplementation(Config.TestLibs.androidxJunit)
78-
testImplementation(Config.TestLibs.mockitoKotlin)
79-
testImplementation(Config.TestLibs.mockitoInline)
78+
testImplementation(libs.mockito.kotlin)
79+
testImplementation(libs.mockito.inline)
8080
}
8181

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

sentry-android-timber/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ dependencies {
7878
testImplementation(Config.Libs.timber)
7979
testImplementation(libs.kotlin.test.junit)
8080
testImplementation(Config.TestLibs.androidxJunit)
81-
testImplementation(Config.TestLibs.mockitoKotlin)
82-
testImplementation(Config.TestLibs.mockitoInline)
81+
testImplementation(libs.mockito.kotlin)
82+
testImplementation(libs.mockito.inline)
8383
}
8484

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

0 commit comments

Comments
 (0)