Skip to content

Commit 1f80472

Browse files
rbro112rbro112
committed
Move remaining testLib dependencies to version catalog
1 parent 6ecd82b commit 1f80472

25 files changed

Lines changed: 56 additions & 49 deletions

File tree

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

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -158,17 +158,14 @@ object Config {
158158
val springBootConfiguration = "org.springframework.boot:spring-boot-configuration-processor"
159159
}
160160

161-
object TestLibs {
162-
val androidJUnitRunner = "androidx.test.runner.AndroidJUnitRunner"
163-
val awaitility = "org.awaitility:awaitility-kotlin:4.1.1"
164-
val awaitility3 = "org.awaitility:awaitility-kotlin:3.1.6" // need this due to a conflict of awaitility4+ and espresso on hamcrest
165-
val hsqldb = "org.hsqldb:hsqldb:2.6.1"
166-
val javaFaker = "com.github.javafaker:javafaker:1.0.2"
167-
val msgpack = "org.msgpack:msgpack-core:0.9.8"
168-
val leakCanaryInstrumentation = "com.squareup.leakcanary:leakcanary-android-instrumentation:2.14"
169-
val composeUiTestJunit4 = "androidx.compose.ui:ui-test-junit4:1.6.8"
170-
val okio = "com.squareup.okio:okio:1.13.0"
171-
}
161+
// object TestLibs {
162+
//// val hsqldb = "org.hsqldb:hsqldb:2.6.1"
163+
//// val javaFaker = "com.github.javafaker:javafaker:1.0.2"
164+
//// val msgpack = "org.msgpack:msgpack-core:0.9.8"
165+
//// val leakCanaryInstrumentation = "com.squareup.leakcanary:leakcanary-android-instrumentation:2.14"
166+
//// val composeUiTestJunit4 = "androidx.compose.ui:ui-test-junit4:1.6.8"
167+
// val okio = "com.squareup.okio:okio:1.13.0"
168+
// }
172169

173170
object QualityPlugins {
174171
object Jacoco {

‎gradle/libs.versions.toml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,15 @@ androidx-compose-material3 = { module = "androidx.compose.material3:material3",
3838
androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidxComposeVersion" }
3939
# Note: don't change without testing forwards compatibility
4040
androidx-compose-ui-replay = { module = "androidx.compose.ui:ui", version = "1.5.0" }
41-
androidx-core = { module = "androidx.core:core", version = "1.3.2"}
41+
androidx-core = { module = "androidx.core:core", version = "1.3.2" }
4242
androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.7.0" }
4343
androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidxNavigation" }
4444
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" }
4545
coil-compose = { module = "io.coil-kt:coil-compose", version = "2.6.0" }
4646
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
4747

4848
# test libraries
49+
androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version = "1.6.8" }
4950
androidx-test-core = { module = "androidx.test:core", version.ref = "androidxTestCore" }
5051
androidx-test-core-ktx = { module = "androidx.test:core-ktx", version.ref = "androidxTestCore" }
5152
androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
@@ -54,8 +55,15 @@ androidx-test-ext-junit = { module = "androidx.test.ext:junit", version = "1.1.5
5455
androidx-test-orchestrator = { module = "androidx.test:orchestrator", version = "1.5.0" }
5556
androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidxTestCore" }
5657
androidx-test-runner = { module = "androidx.test:runner", version = "1.6.2" }
58+
awaitility-kotlin = { module = "org.awaitility:awaitility-kotlin", version = "4.1.1" }
59+
awaitility3-kotlin = { module = "org.awaitility:awaitility-kotlin", version = "3.1.6" }
60+
hsqldb = { module = "org.hsqldb:hsqldb", version = "2.6.1" }
61+
javafaker = { module = "com.github.javafaker:javafaker", version = "1.0.2" }
5762
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.6.1" }
63+
leakcanary-instrumentation = { module = "com.squareup.leakcanary:leakcanary-android-instrumentation", version = "2.14" }
5864
mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version = "4.1.0" }
5965
mockito-inline = { module = "org.mockito:mockito-inline", version = "4.8.0" }
66+
msgpack = { module = "org.msgpack:msgpack-core", version = "0.9.8" }
6067
okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
68+
okio = { module = "com.squareup.okio:okio", version = "1.13.0" }
6169
roboelectric = { module = "org.robolectric:robolectric", version = "4.14" }

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ android {
1717
defaultConfig {
1818
minSdk = Config.Android.minSdkVersion
1919

20-
testInstrumentationRunner = Config.TestLibs.androidJUnitRunner
20+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2121

2222
buildConfigField("String", "SENTRY_ANDROID_SDK_NAME", "\"${Config.Sentry.SENTRY_ANDROID_SDK_NAME}\"")
2323

@@ -101,9 +101,9 @@ dependencies {
101101
testImplementation(libs.androidx.test.core)
102102
testImplementation(libs.androidx.test.ext.junit)
103103
testImplementation(libs.androidx.test.runner)
104+
testImplementation(libs.awaitility.kotlin)
104105
testImplementation(libs.mockito.kotlin)
105106
testImplementation(libs.mockito.inline)
106-
testImplementation(Config.TestLibs.awaitility)
107107
testImplementation(projects.sentryTestSupport)
108108
testImplementation(projects.sentryAndroidFragment)
109109
testImplementation(projects.sentryAndroidTimber)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ android {
2020
versionCode = 1
2121
versionName = "1.0.0"
2222

23-
testInstrumentationRunner = Config.TestLibs.androidJUnitRunner
23+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2424
// Runs each test in its own instance of Instrumentation. This way they are isolated from
2525
// one another and get their own Application instance.
2626
// https://developer.android.com/training/testing/instrumented-tests/androidx-test-libraries/runner#enable-gradle

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ android {
1919
versionCode = 1
2020
versionName = "1.0.0"
2121

22-
testInstrumentationRunner = Config.TestLibs.androidJUnitRunner
22+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2323
// Runs each test in its own instance of Instrumentation. This way they are isolated from
2424
// one another and get their own Application instance.
2525
// https://developer.android.com/training/testing/instrumented-tests/androidx-test-libraries/runner#enable-gradle
@@ -117,15 +117,15 @@ dependencies {
117117

118118
androidTestUtil(libs.androidx.test.orchestrator)
119119
androidTestImplementation(projects.sentryTestSupport)
120-
androidTestImplementation(libs.kotlin.test.junit)
121120
androidTestImplementation(libs.androidx.test.core.ktx)
122121
androidTestImplementation(libs.androidx.test.espresso.core)
123122
androidTestImplementation(libs.androidx.test.ext.junit)
124123
androidTestImplementation(libs.androidx.test.rules)
125124
androidTestImplementation(libs.androidx.test.runner)
125+
androidTestImplementation(libs.awaitility3.kotlin)
126+
androidTestImplementation(libs.kotlin.test.junit)
127+
androidTestImplementation(libs.leakcanary.instrumentation)
126128
androidTestImplementation(libs.okhttp.mockwebserver)
127-
androidTestImplementation(Config.TestLibs.leakCanaryInstrumentation)
128-
androidTestImplementation(Config.TestLibs.awaitility3)
129129
}
130130

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ android {
1515
defaultConfig {
1616
minSdk = Config.Android.minSdkVersion
1717

18-
testInstrumentationRunner = Config.TestLibs.androidJUnitRunner
18+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1919

2020
ndk {
2121
abiFilters.addAll(Config.Android.abiFilters)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ android {
1919
defaultConfig {
2020
minSdk = Config.Android.minSdkVersion
2121

22-
testInstrumentationRunner = Config.TestLibs.androidJUnitRunner
22+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2323

2424
// for AGP 4.1
2525
buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
@@ -91,9 +91,9 @@ dependencies {
9191
testImplementation(libs.androidx.activity.compose)
9292
testImplementation(libs.androidx.test.ext.junit)
9393
testImplementation(libs.androidx.test.runner)
94+
testImplementation(libs.awaitility.kotlin)
9495
testImplementation(libs.mockito.kotlin)
9596
testImplementation(libs.mockito.inline)
96-
testImplementation(Config.TestLibs.awaitility)
9797
testImplementation(libs.androidx.compose.ui)
9898
testImplementation(libs.androidx.compose.foundation)
9999
testImplementation(libs.androidx.compose.foundation.layout)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ android {
1717
defaultConfig {
1818
minSdk = Config.Android.minSdkVersion
1919

20-
testInstrumentationRunner = Config.TestLibs.androidJUnitRunner
20+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2121

2222
// for AGP 4.1
2323
buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")

‎sentry-compose/build.gradle.kts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ kotlin {
5555
}
5656
val androidUnitTest by getting {
5757
dependencies {
58-
implementation(libs.kotlin.test.junit)
59-
implementation(libs.mockito.kotlin)
60-
implementation(libs.mockito.inline)
58+
implementation(libs.androidx.compose.ui.test.junit4)
6159
implementation(libs.androidx.navigation.compose)
62-
implementation(libs.roboelectric)
60+
implementation(libs.androidx.test.ext.junit)
6361
implementation(libs.androidx.test.rules)
6462
implementation(libs.androidx.test.runner)
65-
implementation(libs.androidx.test.ext.junit)
66-
implementation(Config.TestLibs.composeUiTestJunit4)
63+
implementation(libs.kotlin.test.junit)
64+
implementation(libs.mockito.inline)
65+
implementation(libs.mockito.kotlin)
66+
implementation(libs.roboelectric)
6767
}
6868
}
6969
}

‎sentry-jdbc/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ dependencies {
2727
// tests
2828
testImplementation(projects.sentryTestSupport)
2929
testImplementation(kotlin(Config.kotlinStdLib))
30+
testImplementation(libs.awaitility.kotlin)
31+
testImplementation(libs.hsqldb)
3032
testImplementation(libs.kotlin.test.junit)
3133
testImplementation(libs.mockito.kotlin)
3234
testImplementation(libs.mockito.inline)
33-
testImplementation(Config.TestLibs.awaitility)
34-
testImplementation(Config.TestLibs.hsqldb)
3535
}
3636

3737
configure<SourceSetContainer> {

0 commit comments

Comments
 (0)