From 1c5a687395393cbc63191ec52ff7fc8e5dc1c04a Mon Sep 17 00:00:00 2001 From: Ryan Brooks Date: Thu, 29 May 2025 15:56:14 -0700 Subject: [PATCH] Remaining simple migrations to version catalogs --- build.gradle.kts | 2 +- buildSrc/src/main/java/Config.kt | 33 ------------------- gradle/libs.versions.toml | 25 +++++++++++++- .../build.gradle.kts | 2 +- .../sentry-uitest-android/build.gradle.kts | 2 +- sentry-android-navigation/build.gradle.kts | 2 +- sentry-android-ndk/build.gradle.kts | 4 +-- sentry-android-replay/build.gradle.kts | 4 +-- sentry-android-sqlite/build.gradle.kts | 2 +- sentry-android-timber/build.gradle.kts | 2 +- sentry-apache-http-client-5/build.gradle.kts | 6 ++-- sentry-apollo-3/build.gradle.kts | 7 ++-- sentry-apollo-4/build.gradle.kts | 7 ++-- sentry-apollo/build.gradle.kts | 8 ++--- sentry-graphql-22/build.gradle.kts | 6 ++-- sentry-graphql-core/build.gradle.kts | 6 ++-- sentry-graphql/build.gradle.kts | 6 ++-- sentry-jdbc/build.gradle.kts | 2 +- sentry-kotlin-extensions/build.gradle.kts | 2 +- sentry-openfeign/build.gradle.kts | 4 +-- sentry-quartz/build.gradle.kts | 4 +-- sentry-reactor/build.gradle.kts | 12 +++---- .../sentry-samples-android/build.gradle.kts | 5 ++- .../sentry-samples-openfeign/build.gradle.kts | 4 +-- .../build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../build.gradle.kts | 4 +-- .../build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../build.gradle.kts | 10 +++--- .../build.gradle.kts | 2 +- .../build.gradle.kts | 8 ++--- .../build.gradle.kts | 2 +- .../sentry-samples-spring/build.gradle.kts | 2 +- sentry-servlet-jakarta/build.gradle.kts | 6 ++-- sentry-servlet/build.gradle.kts | 4 +-- sentry-spring-boot-jakarta/build.gradle.kts | 29 ++++++++-------- .../build.gradle.kts | 2 +- sentry-spring-boot-starter/build.gradle.kts | 2 +- sentry-spring-boot/build.gradle.kts | 6 ++-- sentry-spring-jakarta/build.gradle.kts | 10 +++--- sentry-spring/build.gradle.kts | 6 ++-- sentry-system-test-support/build.gradle.kts | 4 ++- 43 files changed, 124 insertions(+), 138 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3d0f608ea32..d5e75d53420 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,7 +39,7 @@ buildscript { // add classpath of sentry android gradle plugin // classpath("io.sentry:sentry-android-gradle-plugin:{version}") - classpath(Config.BuildPlugins.commonsCompressOverride) + classpath(libs.commons.compress) } } diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index ffd0f60668a..69e8d02c892 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -5,13 +5,8 @@ object Config { val AGP = System.getenv("VERSION_AGP") ?: "8.6.0" val kotlinStdLib = "stdlib-jdk8" - val kotlinCompatibleLanguageVersion = "1.6" - - val androidComposeCompilerVersion = "1.5.14" - object BuildPlugins { val androidGradle = "com.android.tools.build:gradle:$AGP" - val commonsCompressOverride = "org.apache.commons:commons-compress:1.25.0" } object Android { @@ -29,37 +24,9 @@ object Config { val springSecurityConfig = "org.springframework.security:spring-security-config" val springAop = "org.springframework:spring-aop" val aspectj = "org.aspectj:aspectjweaver" - val servletApi = "javax.servlet:javax.servlet-api:3.1.0" - val servletApiJakarta = "jakarta.servlet:jakarta.servlet-api:5.0.0" - - val apacheHttpClient = "org.apache.httpcomponents.client5:httpclient5:5.0.4" - - val reactorCore = "io.projectreactor:reactor-core:3.5.3" - val contextPropagation = "io.micrometer:context-propagation:1.1.0" - - private val feignVersion = "11.6" - val feignCore = "io.github.openfeign:feign-core:$feignVersion" - val feignGson = "io.github.openfeign:feign-gson:$feignVersion" - - private val apolloVersion = "2.5.9" - val apolloAndroid = "com.apollographql.apollo:apollo-runtime:$apolloVersion" - val apolloCoroutines = "com.apollographql.apollo:apollo-coroutines-support:$apolloVersion" - - val p6spy = "p6spy:p6spy:3.9.1" - - val graphQlJava = "com.graphql-java:graphql-java:17.3" - val graphQlJava22 = "com.graphql-java:graphql-java:22.1" - val graphQlJavaNew = "com.graphql-java:graphql-java:24.0" - - val quartz = "org.quartz-scheduler:quartz:2.3.0" val kotlinReflect = "org.jetbrains.kotlin:kotlin-reflect" val kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib" - - val apolloKotlin = "com.apollographql.apollo3:apollo-runtime:3.8.2" - val apolloKotlin4 = "com.apollographql.apollo:apollo-runtime:4.1.1" - - val sentryNativeNdk = "io.sentry:sentry-native-ndk:0.8.4" } object AnnotationProcessors { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 74188883406..236044c9815 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,18 @@ [versions] +apollo = "2.5.9" androidxLifecycle = "2.2.0" androidxNavigation = "2.4.2" androidxTestCore = "1.6.1" androidxCompose = "1.6.3" +composeCompiler = "1.5.14" coroutines = "1.6.1" espresso = "3.5.0" +feign = "11.6" +jacoco = "0.8.7" jackson = "2.18.3" jetbrainsCompose = "1.6.11" kotlin = "1.9.24" +kotlin-compatible-version = "1.6" logback = "1.2.9" log4j2 = "2.20.0" nopen = "1.0.1" @@ -23,10 +28,10 @@ retrofit = "2.9.0" slf4j = "1.7.30" springboot2 = "2.7.18" springboot3 = "3.5.0" +# Android targetSdk = "34" compileSdk = "34" minSdk = "21" -jacoco = "0.8.7" [plugins] kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } @@ -49,6 +54,11 @@ spring-dependency-management = { id = "io.spring.dependency-management", version gretty = { id = "org.gretty", version = "4.0.0" } [libraries] +apache-httpclient = { module = "org.apache.httpcomponents.client5:httpclient5", version = "5.0.4" } +apollo2-coroutines = { module = "com.apollographql.apollo:apollo-coroutines-support", version.ref = "apollo" } +apollo2-runtime = { module = "com.apollographql.apollo:apollo-runtime", version.ref = "apollo" } +apollo3-kotlin = { module = "com.apollographql.apollo3:apollo-runtime", version = "3.8.2" } +apollo4-kotlin = { module = "com.apollographql.apollo:apollo-runtime", version = "4.1.1" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.3.0" } androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.2" } @@ -69,7 +79,14 @@ androidx-navigation-compose = { module = "androidx.navigation:navigation-compose androidx-sqlite = { module = "androidx.sqlite:sqlite", version = "2.3.1" } androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.2.1" } coil-compose = { module = "io.coil-kt:coil-compose", version = "2.6.0" } +commons-compress = {module = "org.apache.commons:commons-compress", version = "1.25.0"} +context-propagation = { module = "io.micrometer:context-propagation", version = "1.1.0" } errorprone-core = { module = "com.google.errorprone:error_prone_core", version = "2.11.0" } +feign-core = { module = "io.github.openfeign:feign-core", version.ref = "feign" } +feign-gson = { module = "io.github.openfeign:feign-gson", version.ref = "feign" } +graphql-java17 = { module = "com.graphql-java:graphql-java", version = "17.3" } +graphql-java22 = { module = "com.graphql-java:graphql-java", version = "22.1" } +graphql-java24 = { module = "com.graphql-java:graphql-java", version = "24.0" } jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" } jackson-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" } jetbrains-annotations = { module = "org.jetbrains:annotations", version = "23.0.0" } @@ -93,8 +110,14 @@ otel-javaagent-tooling = { module = "io.opentelemetry.javaagent:opentelemetry-ja otel-javaagent-extension-api = { module = "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api", version.ref = "otelInstrumentationAlpha" } otel-semconv = { module = "io.opentelemetry.semconv:opentelemetry-semconv", version.ref = "otelSemanticConventions" } otel-semconv-incubating = { module = "io.opentelemetry.semconv:opentelemetry-semconv-incubating", version.ref = "otelSemanticConventions" } +p6spy = { module = "p6spy:p6spy", version = "3.9.1" } +quartz = { module = "org.quartz-scheduler:quartz", version = "2.3.0" } +reactor-core = { module = "io.projectreactor:reactor-core", version = "3.5.3" } retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" } retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" } +sentry-native-ndk = { module = "io.sentry:sentry-native-ndk", version = "0.8.4" } +servlet-api = { module = "javax.servlet:javax.servlet-api", version = "3.1.0" } +servlet-jakarta-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "5.0.0" } slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } slf4j-jdk14 = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" } slf4j2-api = { module = "org.slf4j:slf4j-api", version = "2.0.5" } 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 1e9b987a35d..47278038d97 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 @@ -40,7 +40,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = Config.androidComposeCompilerVersion + kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() } androidComponents.beforeVariants { it.enable = !Config.Android.shouldSkipDebugVariant(it.buildType) 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 5159e9d4bac..85df78e37fa 100644 --- a/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts +++ b/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts @@ -42,7 +42,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = Config.androidComposeCompilerVersion + kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() } signingConfigs { diff --git a/sentry-android-navigation/build.gradle.kts b/sentry-android-navigation/build.gradle.kts index 5ca9f3287d7..18f1d95a735 100644 --- a/sentry-android-navigation/build.gradle.kts +++ b/sentry-android-navigation/build.gradle.kts @@ -31,7 +31,7 @@ android { kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } testOptions { diff --git a/sentry-android-ndk/build.gradle.kts b/sentry-android-ndk/build.gradle.kts index 16e5fc1c584..7647c84551f 100644 --- a/sentry-android-ndk/build.gradle.kts +++ b/sentry-android-ndk/build.gradle.kts @@ -83,10 +83,10 @@ dependencies { api(projects.sentry) api(projects.sentryAndroidCore) - implementation(Config.Libs.sentryNativeNdk) - compileOnly(libs.jetbrains.annotations) + implementation(libs.sentry.native.ndk) + testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION)) testImplementation(libs.kotlin.test.junit) testImplementation(libs.mockito.kotlin) diff --git a/sentry-android-replay/build.gradle.kts b/sentry-android-replay/build.gradle.kts index 440dc32e1cf..bd525319380 100644 --- a/sentry-android-replay/build.gradle.kts +++ b/sentry-android-replay/build.gradle.kts @@ -30,7 +30,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = Config.androidComposeCompilerVersion + kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() useLiveLiterals = false } @@ -45,7 +45,7 @@ android { kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } testOptions { diff --git a/sentry-android-sqlite/build.gradle.kts b/sentry-android-sqlite/build.gradle.kts index 457be98ef5c..e3ef5eb02f4 100644 --- a/sentry-android-sqlite/build.gradle.kts +++ b/sentry-android-sqlite/build.gradle.kts @@ -32,7 +32,7 @@ android { kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } testOptions { diff --git a/sentry-android-timber/build.gradle.kts b/sentry-android-timber/build.gradle.kts index 4527651dc4c..257fab5206b 100644 --- a/sentry-android-timber/build.gradle.kts +++ b/sentry-android-timber/build.gradle.kts @@ -35,7 +35,7 @@ android { kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } testOptions { diff --git a/sentry-apache-http-client-5/build.gradle.kts b/sentry-apache-http-client-5/build.gradle.kts index 0634d0fec4d..97b8c11c7c6 100644 --- a/sentry-apache-http-client-5/build.gradle.kts +++ b/sentry-apache-http-client-5/build.gradle.kts @@ -12,12 +12,12 @@ plugins { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } dependencies { api(projects.sentry) - api(Config.Libs.apacheHttpClient) + api(libs.apache.httpclient) compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) @@ -26,7 +26,7 @@ dependencies { errorprone(libs.nullaway) // tests - testImplementation(Config.Libs.apacheHttpClient) + testImplementation(libs.apache.httpclient) testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.kotlin.test.junit) diff --git a/sentry-apollo-3/build.gradle.kts b/sentry-apollo-3/build.gradle.kts index e8ac1778233..e6a9b53102a 100644 --- a/sentry-apollo-3/build.gradle.kts +++ b/sentry-apollo-3/build.gradle.kts @@ -12,15 +12,14 @@ plugins { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } dependencies { api(projects.sentry) api(projects.sentryKotlinExtensions) - compileOnly(Config.Libs.apolloKotlin) - + compileOnly(libs.apollo3.kotlin) compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) errorprone(libs.errorprone.core) @@ -30,12 +29,12 @@ dependencies { // tests testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) + testImplementation(libs.apollo3.kotlin) testImplementation(libs.kotlin.test.junit) testImplementation(libs.kotlinx.coroutines) testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.inline) testImplementation(libs.okhttp.mockwebserver) - testImplementation(Config.Libs.apolloKotlin) } configure { diff --git a/sentry-apollo-4/build.gradle.kts b/sentry-apollo-4/build.gradle.kts index 27d4f8a3c80..690884e8605 100644 --- a/sentry-apollo-4/build.gradle.kts +++ b/sentry-apollo-4/build.gradle.kts @@ -17,15 +17,14 @@ configure { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } dependencies { api(projects.sentry) api(projects.sentryKotlinExtensions) - compileOnly(Config.Libs.apolloKotlin4) - + compileOnly(libs.apollo4.kotlin) compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) errorprone(libs.errorprone.core) @@ -35,13 +34,13 @@ dependencies { // tests testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) + testImplementation(libs.apollo4.kotlin) testImplementation(libs.kotlin.test.junit) testImplementation(libs.kotlinx.coroutines) testImplementation(libs.kotlinx.coroutines.test) testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.inline) testImplementation(libs.okhttp.mockwebserver) - testImplementation(Config.Libs.apolloKotlin4) testImplementation("org.jetbrains.kotlin:kotlin-reflect:2.0.0") } diff --git a/sentry-apollo/build.gradle.kts b/sentry-apollo/build.gradle.kts index c08d53bea24..ed3f111e5d3 100644 --- a/sentry-apollo/build.gradle.kts +++ b/sentry-apollo/build.gradle.kts @@ -12,14 +12,14 @@ plugins { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } dependencies { api(projects.sentry) api(projects.sentryKotlinExtensions) - compileOnly(Config.Libs.apolloAndroid) + compileOnly(libs.apollo2.runtime) compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) errorprone(libs.errorprone.core) @@ -29,13 +29,13 @@ dependencies { // tests testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) + testImplementation(libs.apollo2.coroutines) + testImplementation(libs.apollo2.runtime) testImplementation(libs.kotlin.test.junit) testImplementation(libs.kotlinx.coroutines) testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.inline) testImplementation(libs.okhttp.mockwebserver) - testImplementation(Config.Libs.apolloCoroutines) - testImplementation(Config.Libs.apolloAndroid) } configure { diff --git a/sentry-graphql-22/build.gradle.kts b/sentry-graphql-22/build.gradle.kts index fb384c95801..840d9d7169d 100644 --- a/sentry-graphql-22/build.gradle.kts +++ b/sentry-graphql-22/build.gradle.kts @@ -12,13 +12,13 @@ plugins { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } dependencies { api(projects.sentry) api(projects.sentryGraphqlCore) - compileOnly(Config.Libs.graphQlJava22) + compileOnly(libs.graphql.java22) compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) @@ -30,6 +30,7 @@ dependencies { testImplementation(projects.sentry) testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) + testImplementation(libs.graphql.java22) testImplementation(libs.kotlin.test.junit) testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.inline) @@ -37,7 +38,6 @@ dependencies { testImplementation(libs.okhttp.mockwebserver) testImplementation(libs.springboot.starter.graphql) testImplementation("com.netflix.graphql.dgs:graphql-error-types:4.9.2") - testImplementation(Config.Libs.graphQlJava22) } configure { diff --git a/sentry-graphql-core/build.gradle.kts b/sentry-graphql-core/build.gradle.kts index 4519527a3e3..03449a3a3d0 100644 --- a/sentry-graphql-core/build.gradle.kts +++ b/sentry-graphql-core/build.gradle.kts @@ -12,13 +12,13 @@ plugins { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } dependencies { api(projects.sentry) - compileOnly(Config.Libs.graphQlJava) + compileOnly(libs.graphql.java17) compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) errorprone(libs.errorprone.core) @@ -29,6 +29,7 @@ dependencies { testImplementation(projects.sentry) testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) + testImplementation(libs.graphql.java17) testImplementation(libs.kotlin.test.junit) testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.inline) @@ -36,7 +37,6 @@ dependencies { testImplementation(libs.okhttp.mockwebserver) testImplementation(libs.springboot.starter.graphql) testImplementation("com.netflix.graphql.dgs:graphql-error-types:4.9.2") - testImplementation(Config.Libs.graphQlJava) } configure { diff --git a/sentry-graphql/build.gradle.kts b/sentry-graphql/build.gradle.kts index 38d88d83407..24e2fb3effb 100644 --- a/sentry-graphql/build.gradle.kts +++ b/sentry-graphql/build.gradle.kts @@ -12,14 +12,14 @@ plugins { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } dependencies { api(projects.sentry) api(projects.sentryGraphqlCore) - compileOnly(Config.Libs.graphQlJava) + compileOnly(libs.graphql.java17) compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) errorprone(libs.errorprone.core) @@ -30,6 +30,7 @@ dependencies { testImplementation(projects.sentry) testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) + testImplementation(libs.graphql.java17) testImplementation(libs.kotlin.test.junit) testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.inline) @@ -37,7 +38,6 @@ dependencies { testImplementation(libs.okhttp.mockwebserver) testImplementation(libs.springboot.starter.graphql) testImplementation("com.netflix.graphql.dgs:graphql-error-types:4.9.2") - testImplementation(Config.Libs.graphQlJava) } configure { diff --git a/sentry-jdbc/build.gradle.kts b/sentry-jdbc/build.gradle.kts index 4fc30517653..70573385742 100644 --- a/sentry-jdbc/build.gradle.kts +++ b/sentry-jdbc/build.gradle.kts @@ -16,7 +16,7 @@ tasks.withType().configureEach { dependencies { api(projects.sentry) - api(Config.Libs.p6spy) + api(libs.p6spy) compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) diff --git a/sentry-kotlin-extensions/build.gradle.kts b/sentry-kotlin-extensions/build.gradle.kts index 04e40f26dd6..2a581f997c8 100644 --- a/sentry-kotlin-extensions/build.gradle.kts +++ b/sentry-kotlin-extensions/build.gradle.kts @@ -12,7 +12,7 @@ plugins { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } dependencies { diff --git a/sentry-openfeign/build.gradle.kts b/sentry-openfeign/build.gradle.kts index eb7a7de9b9e..642e2df0d45 100644 --- a/sentry-openfeign/build.gradle.kts +++ b/sentry-openfeign/build.gradle.kts @@ -16,8 +16,8 @@ tasks.withType().configureEach { dependencies { api(projects.sentry) - compileOnly(Config.Libs.feignCore) + compileOnly(libs.feign.core) compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) errorprone(libs.errorprone.core) @@ -28,10 +28,10 @@ dependencies { testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.awaitility.kotlin) + testImplementation(libs.feign.core) testImplementation(libs.kotlin.test.junit) testImplementation(libs.mockito.kotlin) testImplementation(libs.okhttp.mockwebserver) - testImplementation(Config.Libs.feignCore) } configure { diff --git a/sentry-quartz/build.gradle.kts b/sentry-quartz/build.gradle.kts index c043e27f8af..efbe4bda3bf 100644 --- a/sentry-quartz/build.gradle.kts +++ b/sentry-quartz/build.gradle.kts @@ -12,12 +12,12 @@ plugins { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } dependencies { api(projects.sentry) - compileOnly(Config.Libs.quartz) + compileOnly(libs.quartz) compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) diff --git a/sentry-reactor/build.gradle.kts b/sentry-reactor/build.gradle.kts index 183b51490b3..75a43837633 100644 --- a/sentry-reactor/build.gradle.kts +++ b/sentry-reactor/build.gradle.kts @@ -17,16 +17,16 @@ configure { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } dependencies { api(projects.sentry) - compileOnly(Config.Libs.reactorCore) - compileOnly(Config.Libs.contextPropagation) + compileOnly(libs.context.propagation) compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) + compileOnly(libs.reactor.core) errorprone(libs.errorprone.core) errorprone(libs.nopen.checker) errorprone(libs.nullaway) @@ -34,12 +34,10 @@ dependencies { // tests testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) + testImplementation(libs.context.propagation) testImplementation(libs.kotlin.test.junit) testImplementation(libs.mockito.kotlin) - - testImplementation(Config.Libs.reactorCore) - testImplementation(Config.Libs.contextPropagation) - + testImplementation(libs.reactor.core) testImplementation(platform("org.junit:junit-bom:5.10.0")) testImplementation("org.junit.jupiter:junit-jupiter") } diff --git a/sentry-samples/sentry-samples-android/build.gradle.kts b/sentry-samples/sentry-samples-android/build.gradle.kts index c0df6a24c7c..e1af788cc36 100644 --- a/sentry-samples/sentry-samples-android/build.gradle.kts +++ b/sentry-samples/sentry-samples-android/build.gradle.kts @@ -57,7 +57,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = Config.androidComposeCompilerVersion + kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() } dependenciesInfo { @@ -155,8 +155,6 @@ dependencies { // exclude(group = "androidx.core", module = "core") // } - implementation(Config.Libs.sentryNativeNdk) - implementation(libs.androidx.activity.compose) implementation(libs.androidx.appcompat) implementation(libs.androidx.fragment.ktx) @@ -169,6 +167,7 @@ dependencies { implementation(libs.kotlinx.coroutines.android) implementation(libs.retrofit) implementation(libs.retrofit.gson) + implementation(libs.sentry.native.ndk) implementation(libs.timber) debugImplementation(libs.leakcanary) diff --git a/sentry-samples/sentry-samples-openfeign/build.gradle.kts b/sentry-samples/sentry-samples-openfeign/build.gradle.kts index b0f4539a884..94edbba132b 100644 --- a/sentry-samples/sentry-samples-openfeign/build.gradle.kts +++ b/sentry-samples/sentry-samples-openfeign/build.gradle.kts @@ -16,6 +16,6 @@ configure { dependencies { implementation(projects.sentry) implementation(projects.sentryOpenfeign) - implementation(Config.Libs.feignCore) - implementation(Config.Libs.feignGson) + implementation(libs.feign.core) + implementation(libs.feign.gson) } diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts index ce8cd71bfef..4adb74eef51 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts @@ -56,6 +56,7 @@ dependencies { testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(projects.sentrySystemTestSupport) + testImplementation(libs.apollo3.kotlin) testImplementation(libs.kotlin.test.junit) testImplementation(libs.slf4j2.api) testImplementation(libs.springboot3.starter.test) { @@ -63,7 +64,6 @@ dependencies { } testImplementation("ch.qos.logback:logback-classic:1.5.16") testImplementation("ch.qos.logback:logback-core:1.5.16") - testImplementation(Config.Libs.apolloKotlin) } dependencyManagement { diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts index 9311ec6f4d7..0268846c0e2 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts @@ -60,6 +60,7 @@ dependencies { testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(projects.sentrySystemTestSupport) + testImplementation(libs.apollo3.kotlin) testImplementation(libs.kotlin.test.junit) testImplementation(libs.slf4j2.api) testImplementation(libs.springboot3.starter.test) { @@ -67,7 +68,6 @@ dependencies { } testImplementation("ch.qos.logback:logback-classic:1.5.16") testImplementation("ch.qos.logback:logback-core:1.5.16") - testImplementation(Config.Libs.apolloKotlin) } configure { diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts index a007e2c5adf..8260135f1fc 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts @@ -57,7 +57,9 @@ dependencies { runtimeOnly(libs.hsqldb) testImplementation(kotlin(Config.kotlinStdLib)) + testImplementation(projects.sentry) testImplementation(projects.sentrySystemTestSupport) + testImplementation(libs.apollo3.kotlin) testImplementation(libs.kotlin.test.junit) testImplementation(libs.slf4j2.api) testImplementation(libs.springboot3.starter.test) { @@ -65,8 +67,6 @@ dependencies { } testImplementation("ch.qos.logback:logback-classic:1.5.16") testImplementation("ch.qos.logback:logback-core:1.5.16") - testImplementation(Config.Libs.apolloKotlin) - testImplementation(projects.sentry) } configure { diff --git a/sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts index ac63e800769..8dfbddfcea1 100644 --- a/sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts @@ -59,6 +59,7 @@ dependencies { testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(projects.sentrySystemTestSupport) + testImplementation(libs.apollo3.kotlin) testImplementation(libs.kotlin.test.junit) testImplementation(libs.slf4j2.api) testImplementation(libs.springboot.starter.test) { @@ -66,7 +67,6 @@ dependencies { } testImplementation("ch.qos.logback:logback-classic:1.5.16") testImplementation("ch.qos.logback:logback-core:1.5.16") - testImplementation(Config.Libs.apolloKotlin) testImplementation("org.apache.httpcomponents:httpclient") } diff --git a/sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts index ba063d582ec..c16b98d23ee 100644 --- a/sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts @@ -57,6 +57,7 @@ dependencies { testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(projects.sentrySystemTestSupport) + testImplementation(libs.apollo3.kotlin) testImplementation(libs.kotlin.test.junit) testImplementation(libs.slf4j2.api) testImplementation(libs.springboot.starter.test) { @@ -64,7 +65,6 @@ dependencies { } testImplementation("ch.qos.logback:logback-classic:1.5.16") testImplementation("ch.qos.logback:logback-core:1.5.16") - testImplementation(Config.Libs.apolloKotlin) testImplementation("org.apache.httpcomponents:httpclient") } diff --git a/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts index cabebebd0e5..9dc379535ec 100644 --- a/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts @@ -18,19 +18,20 @@ repositories { } dependencies { - implementation(libs.springboot3.starter.actuator) - implementation(libs.springboot3.starter.graphql) - implementation(libs.springboot3.starter.webflux) - implementation(Config.Libs.contextPropagation) implementation(Config.Libs.kotlinReflect) implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION)) implementation(projects.sentrySpringBootStarterJakarta) implementation(projects.sentryLogback) implementation(projects.sentryJdbc) implementation(projects.sentryGraphql22) + implementation(libs.context.propagation) + implementation(libs.springboot3.starter.actuator) + implementation(libs.springboot3.starter.graphql) + implementation(libs.springboot3.starter.webflux) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(projects.sentrySystemTestSupport) + testImplementation(libs.apollo3.kotlin) testImplementation(libs.kotlin.test.junit) testImplementation(libs.slf4j2.api) testImplementation(libs.springboot3.starter.test) { @@ -38,7 +39,6 @@ dependencies { } testImplementation("ch.qos.logback:logback-classic:1.5.16") testImplementation("ch.qos.logback:logback-core:1.5.16") - testImplementation(Config.Libs.apolloKotlin) } configure { diff --git a/sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts index 347f1437cf4..5dfc17c2a64 100644 --- a/sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts @@ -29,6 +29,7 @@ dependencies { testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(projects.sentrySystemTestSupport) + testImplementation(libs.apollo3.kotlin) testImplementation(libs.kotlin.test.junit) testImplementation(libs.slf4j2.api) testImplementation(libs.springboot.starter.test) { @@ -36,7 +37,6 @@ dependencies { } testImplementation("ch.qos.logback:logback-classic:1.5.16") testImplementation("ch.qos.logback:logback-core:1.5.16") - testImplementation(Config.Libs.apolloKotlin) testImplementation("org.apache.httpcomponents:httpclient") } diff --git a/sentry-samples/sentry-samples-spring-boot/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot/build.gradle.kts index ff4d6a3aec4..79196b21180 100644 --- a/sentry-samples/sentry-samples-spring-boot/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot/build.gradle.kts @@ -57,15 +57,15 @@ dependencies { runtimeOnly(libs.hsqldb) testImplementation(projects.sentrySystemTestSupport) - testImplementation(libs.springboot.starter.test) { - exclude(group = "org.junit.vintage", module = "junit-vintage-engine") - } testImplementation(kotlin(Config.kotlinStdLib)) + testImplementation(libs.apollo3.kotlin) testImplementation(libs.kotlin.test.junit) testImplementation(libs.slf4j2.api) + testImplementation(libs.springboot.starter.test) { + exclude(group = "org.junit.vintage", module = "junit-vintage-engine") + } testImplementation("ch.qos.logback:logback-classic:1.5.16") testImplementation("ch.qos.logback:logback-core:1.5.16") - testImplementation(Config.Libs.apolloKotlin) testImplementation("org.apache.httpcomponents:httpclient") } diff --git a/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts index 5eb28dcdf13..4b007904ec2 100644 --- a/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts @@ -27,7 +27,6 @@ dependencyManagement { } dependencies { - implementation(Config.Libs.servletApiJakarta) implementation(Config.Libs.springWeb) implementation(Config.Libs.springAop) implementation(Config.Libs.aspectj) @@ -39,6 +38,7 @@ dependencies { implementation(projects.sentryLogback) implementation(libs.jackson.databind) implementation(libs.logback.classic) + implementation(libs.servlet.jakarta.api) implementation(libs.slf4j2.api) testImplementation(libs.springboot.starter.test) { exclude(group = "org.junit.vintage", module = "junit-vintage-engine") diff --git a/sentry-samples/sentry-samples-spring/build.gradle.kts b/sentry-samples/sentry-samples-spring/build.gradle.kts index 7e1d66c8301..964c0050174 100644 --- a/sentry-samples/sentry-samples-spring/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring/build.gradle.kts @@ -26,7 +26,6 @@ dependencyManagement { } dependencies { - implementation(Config.Libs.servletApi) implementation(Config.Libs.springWeb) implementation(Config.Libs.springAop) implementation(Config.Libs.aspectj) @@ -37,6 +36,7 @@ dependencies { implementation(projects.sentrySpring) implementation(projects.sentryLogback) implementation(libs.logback.classic) + implementation(libs.servlet.api) testImplementation(libs.springboot.starter.test) { exclude(group = "org.junit.vintage", module = "junit-vintage-engine") } diff --git a/sentry-servlet-jakarta/build.gradle.kts b/sentry-servlet-jakarta/build.gradle.kts index 0fcc7ac1a96..c8332ca91ed 100644 --- a/sentry-servlet-jakarta/build.gradle.kts +++ b/sentry-servlet-jakarta/build.gradle.kts @@ -12,26 +12,26 @@ plugins { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } dependencies { api(projects.sentry) - compileOnly(Config.Libs.servletApiJakarta) compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) + compileOnly(libs.servlet.jakarta.api) errorprone(libs.errorprone.core) errorprone(libs.nopen.checker) errorprone(libs.nullaway) // tests - testImplementation(Config.Libs.servletApiJakarta) testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.awaitility.kotlin) testImplementation(libs.kotlin.test.junit) testImplementation(libs.mockito.kotlin) + testImplementation(libs.servlet.jakarta.api) } configure { diff --git a/sentry-servlet/build.gradle.kts b/sentry-servlet/build.gradle.kts index 375453406bb..60885889f4f 100644 --- a/sentry-servlet/build.gradle.kts +++ b/sentry-servlet/build.gradle.kts @@ -12,15 +12,15 @@ plugins { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } dependencies { api(projects.sentry) - compileOnly(Config.Libs.servletApi) compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) + compileOnly(libs.servlet.api) errorprone(libs.errorprone.core) errorprone(libs.nopen.checker) errorprone(libs.nullaway) diff --git a/sentry-spring-boot-jakarta/build.gradle.kts b/sentry-spring-boot-jakarta/build.gradle.kts index 03d45b26e27..28a1d60a659 100644 --- a/sentry-spring-boot-jakarta/build.gradle.kts +++ b/sentry-spring-boot-jakarta/build.gradle.kts @@ -19,7 +19,7 @@ configure { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } dependencies { @@ -33,12 +33,12 @@ dependencies { compileOnly(projects.sentryQuartz) compileOnly(Config.Libs.springWeb) compileOnly(Config.Libs.springWebflux) - compileOnly(Config.Libs.servletApiJakarta) - compileOnly(Config.Libs.reactorCore) - compileOnly(Config.Libs.contextPropagation) + compileOnly(libs.context.propagation) compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) compileOnly(libs.otel) + compileOnly(libs.reactor.core) + compileOnly(libs.servlet.jakarta.api) compileOnly(libs.springboot3.starter) compileOnly(libs.springboot3.starter.aop) compileOnly(libs.springboot3.starter.graphql) @@ -58,19 +58,23 @@ dependencies { // tests testImplementation(projects.sentryLogback) - testImplementation(projects.sentryQuartz) + testImplementation(projects.sentryApacheHttpClient5) testImplementation(projects.sentryGraphql) testImplementation(projects.sentryGraphql22) - testImplementation(projects.sentryApacheHttpClient5) + testImplementation(projects.sentryOpentelemetry.sentryOpentelemetryCore) + testImplementation(projects.sentryOpentelemetry.sentryOpentelemetryAgent) + testImplementation(projects.sentryOpentelemetry.sentryOpentelemetryAgentcustomization) + testImplementation(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap) + testImplementation(projects.sentryQuartz) + testImplementation(projects.sentryReactor) testImplementation(projects.sentryTestSupport) testImplementation(kotlin(Config.kotlinStdLib)) + testImplementation(platform(SpringBootPlugin.BOM_COORDINATES)) + testImplementation(libs.context.propagation) testImplementation(libs.kotlin.test.junit) testImplementation(libs.mockito.kotlin) - testImplementation(libs.okhttp.mockwebserver) - - testImplementation(platform(SpringBootPlugin.BOM_COORDINATES)) - testImplementation(Config.Libs.contextPropagation) testImplementation(libs.okhttp) + testImplementation(libs.okhttp.mockwebserver) testImplementation(libs.otel) testImplementation(libs.otel.extension.autoconfigure.spi) testImplementation(libs.springboot3.otel) @@ -82,11 +86,6 @@ dependencies { testImplementation(libs.springboot3.starter.test) testImplementation(libs.springboot3.starter.web) testImplementation(libs.springboot3.starter.webflux) - testImplementation(projects.sentryOpentelemetry.sentryOpentelemetryCore) - testImplementation(projects.sentryOpentelemetry.sentryOpentelemetryAgent) - testImplementation(projects.sentryOpentelemetry.sentryOpentelemetryAgentcustomization) - testImplementation(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap) - testImplementation(projects.sentryReactor) } configure { diff --git a/sentry-spring-boot-starter-jakarta/build.gradle.kts b/sentry-spring-boot-starter-jakarta/build.gradle.kts index 94a4b30011e..6e06af30436 100644 --- a/sentry-spring-boot-starter-jakarta/build.gradle.kts +++ b/sentry-spring-boot-starter-jakarta/build.gradle.kts @@ -18,7 +18,7 @@ configure { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } dependencies { diff --git a/sentry-spring-boot-starter/build.gradle.kts b/sentry-spring-boot-starter/build.gradle.kts index 7321e254ee4..e8f164024b6 100644 --- a/sentry-spring-boot-starter/build.gradle.kts +++ b/sentry-spring-boot-starter/build.gradle.kts @@ -13,7 +13,7 @@ plugins { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } dependencies { diff --git a/sentry-spring-boot/build.gradle.kts b/sentry-spring-boot/build.gradle.kts index d3c89a59933..642fd71c5e6 100644 --- a/sentry-spring-boot/build.gradle.kts +++ b/sentry-spring-boot/build.gradle.kts @@ -14,7 +14,7 @@ plugins { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } dependencies { @@ -24,6 +24,8 @@ dependencies { compileOnly(projects.sentryApacheHttpClient5) compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) + compileOnly(libs.reactor.core) + compileOnly(libs.servlet.api) compileOnly(libs.springboot.starter) compileOnly(libs.springboot.starter.aop) compileOnly(libs.springboot.starter.graphql) @@ -32,8 +34,6 @@ dependencies { compileOnly(platform(SpringBootPlugin.BOM_COORDINATES)) compileOnly(Config.Libs.springWeb) compileOnly(Config.Libs.springWebflux) - compileOnly(Config.Libs.servletApi) - compileOnly(Config.Libs.reactorCore) compileOnly(projects.sentryOpentelemetry.sentryOpentelemetryCore) compileOnly(projects.sentryGraphql) compileOnly(projects.sentryQuartz) diff --git a/sentry-spring-jakarta/build.gradle.kts b/sentry-spring-jakarta/build.gradle.kts index 5f5ff5ca833..24ce47e6bb0 100644 --- a/sentry-spring-jakarta/build.gradle.kts +++ b/sentry-spring-jakarta/build.gradle.kts @@ -21,7 +21,7 @@ configure { tasks.withType().configureEach { kotlinOptions { jvmTarget = JavaVersion.VERSION_17.toString() - languageVersion = Config.kotlinCompatibleLanguageVersion + languageVersion = libs.versions.kotlin.compatible.version.get() freeCompilerArgs = listOf("-Xjsr305=strict") } } @@ -33,11 +33,11 @@ dependencies { compileOnly(Config.Libs.springAop) compileOnly(Config.Libs.springSecurityWeb) compileOnly(Config.Libs.aspectj) - compileOnly(Config.Libs.servletApiJakarta) - compileOnly(Config.Libs.contextPropagation) + compileOnly(libs.context.propagation) compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) compileOnly(libs.otel) + compileOnly(libs.servlet.jakarta.api) compileOnly(libs.slf4j.api) compileOnly(libs.springboot3.starter.graphql) compileOnly(libs.springboot3.starter.quartz) @@ -59,6 +59,8 @@ dependencies { testImplementation(projects.sentryGraphql) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.awaitility.kotlin) + testImplementation(libs.context.propagation) + testImplementation(libs.graphql.java24) testImplementation(libs.kotlin.test.junit) testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.inline) @@ -68,8 +70,6 @@ dependencies { testImplementation(libs.springboot3.starter.test) testImplementation(libs.springboot3.starter.web) testImplementation(libs.springboot3.starter.webflux) - testImplementation(Config.Libs.contextPropagation) - testImplementation(Config.Libs.graphQlJavaNew) testImplementation(projects.sentryReactor) } diff --git a/sentry-spring/build.gradle.kts b/sentry-spring/build.gradle.kts index 31119022fcb..acac9bcff2b 100644 --- a/sentry-spring/build.gradle.kts +++ b/sentry-spring/build.gradle.kts @@ -15,7 +15,7 @@ plugins { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() - kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion + kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get() } dependencies { @@ -26,13 +26,13 @@ dependencies { compileOnly(Config.Libs.springAop) compileOnly(Config.Libs.springSecurityWeb) compileOnly(Config.Libs.aspectj) - compileOnly(Config.Libs.servletApi) compileOnly(Config.Libs.springWebflux) compileOnly(projects.sentryGraphql) compileOnly(projects.sentryQuartz) compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) compileOnly(libs.otel) + compileOnly(libs.servlet.api) compileOnly(libs.slf4j.api) compileOnly(libs.springboot.starter.graphql) compileOnly(libs.springboot.starter.quartz) @@ -48,6 +48,7 @@ dependencies { testImplementation(projects.sentryGraphql) testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.awaitility.kotlin) + testImplementation(libs.graphql.java17) testImplementation(libs.kotlin.test.junit) testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.inline) @@ -57,7 +58,6 @@ dependencies { testImplementation(libs.springboot.starter.test) testImplementation(libs.springboot.starter.web) testImplementation(libs.springboot.starter.webflux) - testImplementation(Config.Libs.graphQlJava) } configure { diff --git a/sentry-system-test-support/build.gradle.kts b/sentry-system-test-support/build.gradle.kts index 551b5838826..56cb6b4a367 100644 --- a/sentry-system-test-support/build.gradle.kts +++ b/sentry-system-test-support/build.gradle.kts @@ -19,13 +19,15 @@ tasks.withType().configureEach dependencies { api(projects.sentry) api(projects.sentryTestSupport) - api(Config.Libs.apolloKotlin) + api(libs.apollo3.kotlin) + compileOnly(libs.jetbrains.annotations) compileOnly(libs.nopen.annotations) compileOnly(libs.springboot3.starter.test) { exclude(group = "org.junit.vintage", module = "junit-vintage-engine") } compileOnly(libs.springboot3.starter.web) + implementation(libs.jackson.databind) implementation(libs.jackson.kotlin) implementation(libs.okhttp)