Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions buildSrc/src/main/java/Config.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
15 changes: 11 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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" }
6 changes: 3 additions & 3 deletions sentry-android-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions sentry-android-fragment/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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<Detekt>().configureEach {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions sentry-android-navigation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion sentry-android-ndk/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
6 changes: 3 additions & 3 deletions sentry-android-replay/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions sentry-android-sqlite/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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<Detekt>().configureEach {
Expand Down
4 changes: 2 additions & 2 deletions sentry-android-timber/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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<Detekt>().configureEach {
Expand Down
2 changes: 1 addition & 1 deletion sentry-apache-http-client-5/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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<SourceSetContainer> {
Expand Down
6 changes: 3 additions & 3 deletions sentry-apollo-3/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
6 changes: 3 additions & 3 deletions sentry-apollo-4/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions sentry-apollo/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
6 changes: 3 additions & 3 deletions sentry-compose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions sentry-graphql-22/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions sentry-graphql-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions sentry-graphql/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions sentry-jdbc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion sentry-jul/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion sentry-kotlin-extensions/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion sentry-log4j2/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion sentry-logback/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
6 changes: 3 additions & 3 deletions sentry-okhttp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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<SourceSetContainer> {
Expand Down
4 changes: 2 additions & 2 deletions sentry-openfeign/build.gradle.kts
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(Config.TestLibs.mockitoKotlin)
testImplementation(libs.mockito.kotlin)
testImplementation(Config.TestLibs.awaitility)
testImplementation(Config.TestLibs.mockWebserver)
testImplementation(libs.okhttp.mockwebserver)
testImplementation(Config.Libs.feignCore)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions sentry-quartz/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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<SourceSetContainer> {
Expand Down
2 changes: 1 addition & 1 deletion sentry-reactor/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion sentry-servlet-jakarta/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
2 changes: 1 addition & 1 deletion sentry-servlet/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions sentry-spring-boot-jakarta/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading
Loading