Skip to content

Move more test dependencies to use version catalogs #4424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rbro112 merged 4 commits into from
May 22, 2025
Merged

Move more test dependencies to use version catalogs #4424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47b735b
Move more test dependencies to use version catalogs
rbro112 May 21, 2025
a589188
Orchestrator to androidTestUtil
rbro112 May 21, 2025
6177154
Fix
rbro112 May 21, 2025
7884cbe
Fixes
rbro112 May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions buildSrc/src/main/java/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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 {
Expand Down
15 changes: 14 additions & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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" }
Expand Down
10 changes: 5 additions & 5 deletions sentry-android-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
16 changes: 8 additions & 8 deletions sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 8 additions & 8 deletions sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions sentry-android-navigation/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions sentry-android-replay/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion sentry-android-sqlite/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion sentry-android-timber/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion sentry-apollo-4/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ dependencies {
testImplementation(Config.Libs.coroutinesCore)
testImplementation(kotlin(Config.kotlinStdLib))
testImplementation(libs.kotlin.test.junit)
testImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.mockito.kotlin)
testImplementation(libs.mockito.inline)
testImplementation(libs.okhttp.mockwebserver)
testImplementation(Config.Libs.apolloKotlin4)
testImplementation(Config.TestLibs.coroutinesTest)
testImplementation("org.jetbrains.kotlin:kotlin-reflect:2.0.0")
}

Expand Down
6 changes: 3 additions & 3 deletions sentry-compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ kotlin {
implementation(libs.mockito.inline)
implementation(Config.Libs.composeNavigation)
implementation(libs.roboelectric)
implementation(Config.TestLibs.androidxRunner)
implementation(Config.TestLibs.androidxJunit)
implementation(Config.TestLibs.androidxTestRules)
implementation(libs.androidx.test.rules)
implementation(libs.androidx.test.runner)
implementation(libs.androidx.test.ext.junit)
implementation(Config.TestLibs.composeUiTestJunit4)
}
}
Expand Down
2 changes: 1 addition & 1 deletion sentry-kotlin-extensions/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ dependencies {
testImplementation(projects.sentryTestSupport)
testImplementation(kotlin(Config.kotlinStdLib))
testImplementation(libs.kotlin.test.junit)
testImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.mockito.kotlin)
testImplementation(Config.Libs.coroutinesCore)
testImplementation(Config.TestLibs.coroutinesTest)
}

configure<SourceSetContainer> {
Expand Down
Loading