diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index c1934a001f8..b508a0fb1be 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/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 { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 27b81d8963c..2ec54da2624 100644 --- a/gradle/libs.versions.toml +++ b/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" } diff --git a/sentry-android-core/build.gradle.kts b/sentry-android-core/build.gradle.kts index 1a02dc99dd3..ac5f384d29c 100644 --- a/sentry-android-core/build.gradle.kts +++ b/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) diff --git a/sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts b/sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts index a52f022daa3..97c2293d3f6 100644 --- a/sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts +++ b/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().configureEach { diff --git a/sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts b/sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts index c40c63113b4..f0c8a9f476f 100644 --- a/sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts +++ b/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) diff --git a/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts b/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts index cb0cdf07eba..9f44232c758 100644 --- a/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts +++ b/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts @@ -101,13 +101,13 @@ 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) @@ -115,17 +115,17 @@ dependencies { 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().configureEach { diff --git a/sentry-android-navigation/build.gradle.kts b/sentry-android-navigation/build.gradle.kts index fd5d2817359..0513116e4f9 100644 --- a/sentry-android-navigation/build.gradle.kts +++ b/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().configureEach { diff --git a/sentry-android-replay/build.gradle.kts b/sentry-android-replay/build.gradle.kts index 16f8e8036b5..2d2371c9f15 100644 --- a/sentry-android-replay/build.gradle.kts +++ b/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) diff --git a/sentry-android-sqlite/build.gradle.kts b/sentry-android-sqlite/build.gradle.kts index 53d4d03bd66..2307f8b8cba 100644 --- a/sentry-android-sqlite/build.gradle.kts +++ b/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) } diff --git a/sentry-android-timber/build.gradle.kts b/sentry-android-timber/build.gradle.kts index 1f47e589b02..ab5ade76d28 100644 --- a/sentry-android-timber/build.gradle.kts +++ b/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) } diff --git a/sentry-apollo-4/build.gradle.kts b/sentry-apollo-4/build.gradle.kts index 5f42f3f214a..8a205c1b51d 100644 --- a/sentry-apollo-4/build.gradle.kts +++ b/sentry-apollo-4/build.gradle.kts @@ -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") } diff --git a/sentry-compose/build.gradle.kts b/sentry-compose/build.gradle.kts index 7ccdd4e1f6b..a4b65eba586 100644 --- a/sentry-compose/build.gradle.kts +++ b/sentry-compose/build.gradle.kts @@ -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) } } diff --git a/sentry-kotlin-extensions/build.gradle.kts b/sentry-kotlin-extensions/build.gradle.kts index 105ed950c1b..2e66e27572f 100644 --- a/sentry-kotlin-extensions/build.gradle.kts +++ b/sentry-kotlin-extensions/build.gradle.kts @@ -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 {