diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 11fe2511e3b..c1934a001f8 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -186,13 +186,8 @@ object Config { 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 robolectric = "org.robolectric:robolectric:4.14" - val mockitoKotlin = "org.mockito.kotlin:mockito-kotlin:4.1.0" - val mockitoInline = "org.mockito:mockito-inline:4.8.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 mockWebserver = "com.squareup.okhttp3:mockwebserver:${Libs.okHttpVersion}" - val jsonUnit = "net.javacrumbs.json-unit:json-unit:2.32.0" val hsqldb = "org.hsqldb:hsqldb:2.6.1" val javaFaker = "com.github.javafaker:javafaker:1.0.2" val msgpack = "org.msgpack:msgpack-core:0.9.8" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c0c37eb0408..27b81d8963c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,6 +3,7 @@ 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" @@ -15,15 +16,21 @@ dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version = "2.0.0" } binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.0" } compose-compiler = { id = "org.jetbrains.compose", version.ref = "composeVersion" } errorprone = { id = "net.ltgt.errorprone", version = "3.0.1" } -gradle-versions = {id = "com.github.ben-manes.versions", version = "0.42.0" } +gradle-versions = { id = "com.github.ben-manes.versions", version = "0.42.0" } spotless = { id = "com.diffplug.spotless", version = "6.11.0" } -detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8"} +detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8" } jacoco-android = { id = "com.mxalbert.gradle.jacoco-android", version = "0.2.0" } kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.3" } -vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" } +vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" } spring-boot-two = { id = "org.springframework.boot", version.ref = "springTwo" } spring-boot-three = { id = "org.springframework.boot", version.ref = "springThree" } -spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE"} +spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE" } [libraries] kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } + +# test libraries +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" } +roboelectric = { module = "org.robolectric:robolectric", version = "4.14" } diff --git a/sentry-android-core/build.gradle.kts b/sentry-android-core/build.gradle.kts index 094c7827d98..1a02dc99dd3 100644 --- a/sentry-android-core/build.gradle.kts +++ b/sentry-android-core/build.gradle.kts @@ -95,14 +95,14 @@ dependencies { // tests testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION)) - testImplementation(Config.TestLibs.robolectric) + 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(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockitoInline) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockito.inline) testImplementation(Config.TestLibs.awaitility) testImplementation(projects.sentryTestSupport) testImplementation(projects.sentryAndroidFragment) diff --git a/sentry-android-fragment/build.gradle.kts b/sentry-android-fragment/build.gradle.kts index 104e9757c4b..7e6853c8574 100644 --- a/sentry-android-fragment/build.gradle.kts +++ b/sentry-android-fragment/build.gradle.kts @@ -70,8 +70,8 @@ dependencies { // tests testImplementation(Config.Libs.fragment) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockitoInline) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockito.inline) } tasks.withType().configureEach { 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 2e59ecfc38a..cb0cdf07eba 100644 --- a/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts +++ b/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts @@ -121,7 +121,7 @@ dependencies { androidTestImplementation(Config.TestLibs.androidxRunner) androidTestImplementation(Config.TestLibs.androidxTestRules) androidTestImplementation(Config.TestLibs.androidxTestCoreKtx) - androidTestImplementation(Config.TestLibs.mockWebserver) + androidTestImplementation(libs.okhttp.mockwebserver) androidTestImplementation(Config.TestLibs.androidxJunit) androidTestImplementation(Config.TestLibs.leakCanaryInstrumentation) androidTestImplementation(Config.TestLibs.awaitility3) diff --git a/sentry-android-navigation/build.gradle.kts b/sentry-android-navigation/build.gradle.kts index 24c5c2cadd6..fd5d2817359 100644 --- a/sentry-android-navigation/build.gradle.kts +++ b/sentry-android-navigation/build.gradle.kts @@ -72,10 +72,10 @@ dependencies { testImplementation(Config.Libs.navigationRuntime) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockitoInline) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockito.inline) - testImplementation(Config.TestLibs.robolectric) + testImplementation(libs.roboelectric) testImplementation(Config.TestLibs.androidxCore) testImplementation(Config.TestLibs.androidxRunner) testImplementation(Config.TestLibs.androidxJunit) diff --git a/sentry-android-ndk/build.gradle.kts b/sentry-android-ndk/build.gradle.kts index 7aa16e469bc..4b113b8e95e 100644 --- a/sentry-android-ndk/build.gradle.kts +++ b/sentry-android-ndk/build.gradle.kts @@ -89,6 +89,6 @@ dependencies { testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) + testImplementation(libs.mockito.kotlin) testImplementation(projects.sentryTestSupport) } diff --git a/sentry-android-replay/build.gradle.kts b/sentry-android-replay/build.gradle.kts index aec9d6fd2b2..16f8e8036b5 100644 --- a/sentry-android-replay/build.gradle.kts +++ b/sentry-android-replay/build.gradle.kts @@ -86,12 +86,12 @@ dependencies { // tests testImplementation(projects.sentryTestSupport) testImplementation(projects.sentryAndroidCore) - testImplementation(Config.TestLibs.robolectric) + testImplementation(libs.roboelectric) testImplementation(libs.kotlin.test.junit) testImplementation(Config.TestLibs.androidxRunner) testImplementation(Config.TestLibs.androidxJunit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockitoInline) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockito.inline) testImplementation(Config.TestLibs.awaitility) testImplementation(Config.Libs.composeActivity) testImplementation(Config.Libs.composeUi) diff --git a/sentry-android-sqlite/build.gradle.kts b/sentry-android-sqlite/build.gradle.kts index 096aa97fa3f..53d4d03bd66 100644 --- a/sentry-android-sqlite/build.gradle.kts +++ b/sentry-android-sqlite/build.gradle.kts @@ -75,8 +75,8 @@ dependencies { testImplementation(Config.Libs.androidxSqlite) testImplementation(libs.kotlin.test.junit) testImplementation(Config.TestLibs.androidxJunit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockitoInline) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockito.inline) } tasks.withType().configureEach { diff --git a/sentry-android-timber/build.gradle.kts b/sentry-android-timber/build.gradle.kts index 376fd8d49b1..1f47e589b02 100644 --- a/sentry-android-timber/build.gradle.kts +++ b/sentry-android-timber/build.gradle.kts @@ -78,8 +78,8 @@ dependencies { testImplementation(Config.Libs.timber) testImplementation(libs.kotlin.test.junit) testImplementation(Config.TestLibs.androidxJunit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockitoInline) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockito.inline) } tasks.withType().configureEach { diff --git a/sentry-apache-http-client-5/build.gradle.kts b/sentry-apache-http-client-5/build.gradle.kts index 97a03b5efff..011898ae756 100644 --- a/sentry-apache-http-client-5/build.gradle.kts +++ b/sentry-apache-http-client-5/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) + testImplementation(libs.mockito.kotlin) } configure { diff --git a/sentry-apollo-3/build.gradle.kts b/sentry-apollo-3/build.gradle.kts index 7449ca71b93..cd24fea76a1 100644 --- a/sentry-apollo-3/build.gradle.kts +++ b/sentry-apollo-3/build.gradle.kts @@ -32,9 +32,9 @@ dependencies { testImplementation(Config.Libs.coroutinesCore) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockitoInline) - testImplementation(Config.TestLibs.mockWebserver) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockito.inline) + testImplementation(libs.okhttp.mockwebserver) testImplementation(Config.Libs.apolloKotlin) } diff --git a/sentry-apollo-4/build.gradle.kts b/sentry-apollo-4/build.gradle.kts index a38e4788b37..5f42f3f214a 100644 --- a/sentry-apollo-4/build.gradle.kts +++ b/sentry-apollo-4/build.gradle.kts @@ -37,9 +37,9 @@ dependencies { testImplementation(Config.Libs.coroutinesCore) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockitoInline) - testImplementation(Config.TestLibs.mockWebserver) + 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-apollo/build.gradle.kts b/sentry-apollo/build.gradle.kts index 9df30aacc1f..e47198d3f4e 100644 --- a/sentry-apollo/build.gradle.kts +++ b/sentry-apollo/build.gradle.kts @@ -32,9 +32,9 @@ dependencies { testImplementation(Config.Libs.coroutinesCore) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockitoInline) - testImplementation(Config.TestLibs.mockWebserver) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockito.inline) + testImplementation(libs.okhttp.mockwebserver) testImplementation(Config.Libs.apolloCoroutines) testImplementation(Config.Libs.apolloAndroid) } diff --git a/sentry-compose/build.gradle.kts b/sentry-compose/build.gradle.kts index c1609496d4a..7ccdd4e1f6b 100644 --- a/sentry-compose/build.gradle.kts +++ b/sentry-compose/build.gradle.kts @@ -56,10 +56,10 @@ kotlin { val androidUnitTest by getting { dependencies { implementation(libs.kotlin.test.junit) - implementation(Config.TestLibs.mockitoKotlin) - implementation(Config.TestLibs.mockitoInline) + implementation(libs.mockito.kotlin) + implementation(libs.mockito.inline) implementation(Config.Libs.composeNavigation) - implementation(Config.TestLibs.robolectric) + implementation(libs.roboelectric) implementation(Config.TestLibs.androidxRunner) implementation(Config.TestLibs.androidxJunit) implementation(Config.TestLibs.androidxTestRules) diff --git a/sentry-graphql-22/build.gradle.kts b/sentry-graphql-22/build.gradle.kts index 2d9a4a6dfd3..f2362ba2ed4 100644 --- a/sentry-graphql-22/build.gradle.kts +++ b/sentry-graphql-22/build.gradle.kts @@ -31,9 +31,9 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockitoInline) - testImplementation(Config.TestLibs.mockWebserver) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockito.inline) + testImplementation(libs.okhttp.mockwebserver) testImplementation(Config.Libs.okhttp) testImplementation(Config.Libs.springBootStarterGraphql) testImplementation("com.netflix.graphql.dgs:graphql-error-types:4.9.2") diff --git a/sentry-graphql-core/build.gradle.kts b/sentry-graphql-core/build.gradle.kts index 1d06744d827..763629075f5 100644 --- a/sentry-graphql-core/build.gradle.kts +++ b/sentry-graphql-core/build.gradle.kts @@ -30,9 +30,9 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockitoInline) - testImplementation(Config.TestLibs.mockWebserver) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockito.inline) + testImplementation(libs.okhttp.mockwebserver) testImplementation(Config.Libs.okhttp) testImplementation(Config.Libs.springBootStarterGraphql) testImplementation("com.netflix.graphql.dgs:graphql-error-types:4.9.2") diff --git a/sentry-graphql/build.gradle.kts b/sentry-graphql/build.gradle.kts index 7bb51bb640d..79df9977308 100644 --- a/sentry-graphql/build.gradle.kts +++ b/sentry-graphql/build.gradle.kts @@ -31,9 +31,9 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockitoInline) - testImplementation(Config.TestLibs.mockWebserver) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockito.inline) + testImplementation(libs.okhttp.mockwebserver) testImplementation(Config.Libs.okhttp) testImplementation(Config.Libs.springBootStarterGraphql) testImplementation("com.netflix.graphql.dgs:graphql-error-types:4.9.2") diff --git a/sentry-jdbc/build.gradle.kts b/sentry-jdbc/build.gradle.kts index 0e9ad77bc85..9abe5a6c1aa 100644 --- a/sentry-jdbc/build.gradle.kts +++ b/sentry-jdbc/build.gradle.kts @@ -28,8 +28,8 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockitoInline) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockito.inline) testImplementation(Config.TestLibs.awaitility) testImplementation(Config.TestLibs.hsqldb) } diff --git a/sentry-jul/build.gradle.kts b/sentry-jul/build.gradle.kts index ebb0645c4a6..d8dbaa46b72 100644 --- a/sentry-jul/build.gradle.kts +++ b/sentry-jul/build.gradle.kts @@ -28,7 +28,7 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) + testImplementation(libs.mockito.kotlin) testImplementation(Config.Libs.logbackClassic) testImplementation(Config.Libs.slf4jApi) } diff --git a/sentry-kotlin-extensions/build.gradle.kts b/sentry-kotlin-extensions/build.gradle.kts index e185218b851..105ed950c1b 100644 --- a/sentry-kotlin-extensions/build.gradle.kts +++ b/sentry-kotlin-extensions/build.gradle.kts @@ -28,7 +28,7 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) + testImplementation(libs.mockito.kotlin) testImplementation(Config.Libs.coroutinesCore) testImplementation(Config.TestLibs.coroutinesTest) } diff --git a/sentry-log4j2/build.gradle.kts b/sentry-log4j2/build.gradle.kts index 78c8fe06b6f..377a92b0884 100644 --- a/sentry-log4j2/build.gradle.kts +++ b/sentry-log4j2/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) + testImplementation(libs.mockito.kotlin) testImplementation(Config.Libs.log4j2Api) testImplementation(Config.Libs.log4j2Core) } diff --git a/sentry-logback/build.gradle.kts b/sentry-logback/build.gradle.kts index 43f462b0902..a9f202aa155 100644 --- a/sentry-logback/build.gradle.kts +++ b/sentry-logback/build.gradle.kts @@ -28,7 +28,7 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) + testImplementation(libs.mockito.kotlin) testImplementation(Config.Libs.logbackClassic) } diff --git a/sentry-okhttp/build.gradle.kts b/sentry-okhttp/build.gradle.kts index 4d01b2aa365..3a542b16be6 100644 --- a/sentry-okhttp/build.gradle.kts +++ b/sentry-okhttp/build.gradle.kts @@ -36,9 +36,9 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(Config.Libs.okhttp) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockitoInline) - testImplementation(Config.TestLibs.mockWebserver) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockito.inline) + testImplementation(libs.okhttp.mockwebserver) } configure { diff --git a/sentry-openfeign/build.gradle.kts b/sentry-openfeign/build.gradle.kts index 28a3c50d139..ec74094cde7 100644 --- a/sentry-openfeign/build.gradle.kts +++ b/sentry-openfeign/build.gradle.kts @@ -28,9 +28,9 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) + testImplementation(libs.mockito.kotlin) testImplementation(Config.TestLibs.awaitility) - testImplementation(Config.TestLibs.mockWebserver) + testImplementation(libs.okhttp.mockwebserver) testImplementation(Config.Libs.feignCore) } diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts index 8653c2ef719..cd0cde933c8 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts @@ -36,7 +36,7 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) + testImplementation(libs.mockito.kotlin) testImplementation(Config.TestLibs.awaitility) } diff --git a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts index f7b053c0a62..ea780fe0dd0 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts @@ -28,7 +28,7 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) + testImplementation(libs.mockito.kotlin) testImplementation(Config.TestLibs.awaitility) testImplementation(Config.Libs.OpenTelemetry.otelSdk) diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts index e0a7bdd50d2..8544c9b6725 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts @@ -37,7 +37,7 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) + testImplementation(libs.mockito.kotlin) testImplementation(Config.TestLibs.awaitility) testImplementation(Config.Libs.OpenTelemetry.otelSdk) diff --git a/sentry-quartz/build.gradle.kts b/sentry-quartz/build.gradle.kts index ed32402a2fc..8ec982e2afd 100644 --- a/sentry-quartz/build.gradle.kts +++ b/sentry-quartz/build.gradle.kts @@ -30,8 +30,8 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockitoInline) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockito.inline) } configure { diff --git a/sentry-reactor/build.gradle.kts b/sentry-reactor/build.gradle.kts index 40e7d158ad6..453b565c2db 100644 --- a/sentry-reactor/build.gradle.kts +++ b/sentry-reactor/build.gradle.kts @@ -35,7 +35,7 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) + testImplementation(libs.mockito.kotlin) testImplementation(Config.Libs.reactorCore) testImplementation(Config.Libs.contextPropagation) diff --git a/sentry-servlet-jakarta/build.gradle.kts b/sentry-servlet-jakarta/build.gradle.kts index 16a638e93bf..9d954355cfb 100644 --- a/sentry-servlet-jakarta/build.gradle.kts +++ b/sentry-servlet-jakarta/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) + testImplementation(libs.mockito.kotlin) testImplementation(Config.TestLibs.awaitility) } diff --git a/sentry-servlet/build.gradle.kts b/sentry-servlet/build.gradle.kts index c546dde6cdf..bef85c3cbc7 100644 --- a/sentry-servlet/build.gradle.kts +++ b/sentry-servlet/build.gradle.kts @@ -29,7 +29,7 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) + testImplementation(libs.mockito.kotlin) testImplementation(Config.TestLibs.awaitility) testImplementation(Config.Libs.springBootStarterTest) testImplementation(Config.Libs.springBootStarterWeb) diff --git a/sentry-spring-boot-jakarta/build.gradle.kts b/sentry-spring-boot-jakarta/build.gradle.kts index 9f43c1f67cc..aa80340c4c4 100644 --- a/sentry-spring-boot-jakarta/build.gradle.kts +++ b/sentry-spring-boot-jakarta/build.gradle.kts @@ -65,8 +65,8 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockWebserver) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.okhttp.mockwebserver) testImplementation(Config.Libs.okhttp) testImplementation(Config.Libs.springBoot3Starter) diff --git a/sentry-spring-boot/build.gradle.kts b/sentry-spring-boot/build.gradle.kts index 417d4e2b58d..56cb3f296dd 100644 --- a/sentry-spring-boot/build.gradle.kts +++ b/sentry-spring-boot/build.gradle.kts @@ -53,8 +53,8 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockWebserver) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.okhttp.mockwebserver) testImplementation(Config.Libs.okhttp) testImplementation(Config.Libs.springBootStarter) testImplementation(Config.Libs.springBootStarterTest) diff --git a/sentry-spring-jakarta/build.gradle.kts b/sentry-spring-jakarta/build.gradle.kts index 2b11ef82d5c..4cb024e08b2 100644 --- a/sentry-spring-jakarta/build.gradle.kts +++ b/sentry-spring-jakarta/build.gradle.kts @@ -59,8 +59,8 @@ dependencies { testImplementation(projects.sentryGraphql) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockitoInline) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockito.inline) testImplementation(Config.Libs.springBoot3StarterTest) testImplementation(Config.Libs.springBoot3StarterWeb) testImplementation(Config.Libs.springBoot3StarterWebflux) diff --git a/sentry-spring/build.gradle.kts b/sentry-spring/build.gradle.kts index 6cf8598481a..d0b7c88186b 100644 --- a/sentry-spring/build.gradle.kts +++ b/sentry-spring/build.gradle.kts @@ -48,8 +48,8 @@ dependencies { testImplementation(projects.sentryGraphql) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockitoInline) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockito.inline) testImplementation(Config.Libs.springBootStarterTest) testImplementation(Config.Libs.springBootStarterWeb) testImplementation(Config.Libs.springBootStarterWebflux) diff --git a/sentry-system-test-support/build.gradle.kts b/sentry-system-test-support/build.gradle.kts index 3293c0fa025..25ea579fa69 100644 --- a/sentry-system-test-support/build.gradle.kts +++ b/sentry-system-test-support/build.gradle.kts @@ -36,7 +36,7 @@ dependencies { // tests implementation(kotlin(Config.kotlinStdLib)) implementation(libs.kotlin.test.junit) - implementation(Config.TestLibs.mockitoKotlin) + implementation(libs.mockito.kotlin) } configure { diff --git a/sentry-test-support/build.gradle.kts b/sentry-test-support/build.gradle.kts index bfe19b59f52..c80af699503 100644 --- a/sentry-test-support/build.gradle.kts +++ b/sentry-test-support/build.gradle.kts @@ -26,7 +26,7 @@ dependencies { // tests implementation(kotlin(Config.kotlinStdLib)) implementation(libs.kotlin.test.junit) - implementation(Config.TestLibs.mockitoKotlin) + implementation(libs.mockito.kotlin) } configure { diff --git a/sentry/build.gradle.kts b/sentry/build.gradle.kts index 7548d27cd56..759c54ccd62 100644 --- a/sentry/build.gradle.kts +++ b/sentry/build.gradle.kts @@ -23,8 +23,8 @@ dependencies { // tests testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) - testImplementation(Config.TestLibs.mockitoKotlin) - testImplementation(Config.TestLibs.mockitoInline) + testImplementation(libs.mockito.kotlin) + testImplementation(libs.mockito.inline) testImplementation(Config.TestLibs.awaitility) testImplementation(Config.TestLibs.javaFaker) testImplementation(Config.TestLibs.msgpack)