diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index d8f7aecf3e..db323eb7e0 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -5,8 +5,6 @@ object Config { val AGP = System.getenv("VERSION_AGP") ?: "8.6.0" val kotlinStdLib = "stdlib-jdk8" - val springBootVersion = "2.7.18" - val springBoot3Version = "3.5.0" val kotlinCompatibleLanguageVersion = "1.6" val androidComposeCompilerVersion = "1.5.14" @@ -157,16 +155,6 @@ object Config { val versionNameProp = "versionName" } - object CompileOnly { - private val nopenVersion = "1.0.1" - - val jetbrainsAnnotations = "org.jetbrains:annotations:23.0.0" - val nopen = "com.jakewharton.nopen:nopen-annotations:$nopenVersion" - val nopenChecker = "com.jakewharton.nopen:nopen-checker:$nopenVersion" - val errorprone = "com.google.errorprone:error_prone_core:2.11.0" - val errorProneNullAway = "com.uber.nullaway:nullaway:0.9.5" - } - object BuildScript { val androidLibs = setOf( "sentry-android-core", diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a5d6d484e8..06c122fb14 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,11 @@ [versions] androidxNavigation = "2.4.2" androidxTestCore = "1.6.1" -androidxComposeVersion = "1.6.3" -jetbrainsComposeVersion = "1.6.11" +androidxCompose = "1.6.3" +jetbrainsCompose = "1.6.11" espresso = "3.5.0" kotlin = "1.9.24" +nopen = "1.0.1" # 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 okhttp = "4.9.2" @@ -27,7 +28,7 @@ buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.6.5" } dokka = { id = "org.jetbrains.dokka", version = "2.0.0" } 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 = "jetbrainsComposeVersion" } +compose-compiler = { id = "org.jetbrains.compose", version.ref = "jetbrainsCompose" } errorprone = { id = "net.ltgt.errorprone", version = "3.0.1" } gradle-versions = { id = "com.github.ben-manes.versions", version = "0.42.0" } spotless = { id = "com.diffplug.spotless", version = "6.11.0" } @@ -42,10 +43,10 @@ gretty = { id = "org.gretty", version = "4.0.0" } [libraries] androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.2" } -androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidxComposeVersion" } -androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidxComposeVersion" } +androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidxCompose" } +androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidxCompose" } androidx-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.2.1" } -androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidxComposeVersion" } +androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidxCompose" } # Note: don't change without testing forwards compatibility androidx-compose-ui-replay = { module = "androidx.compose.ui:ui", version = "1.5.0" } androidx-core = { module = "androidx.core:core", version = "1.3.2" } @@ -53,7 +54,12 @@ androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.7.0" } androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidxNavigation" } androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" } coil-compose = { module = "io.coil-kt:coil-compose", version = "2.6.0" } +errorprone-core = { module = "com.google.errorprone:error_prone_core", version = "2.11.0" } +jetbrains-annotations = { module = "org.jetbrains:annotations", version = "23.0.0"} kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } +nopen-annotations = { module = "com.jakewharton.nopen:nopen-annotations", version.ref = "nopen"} +nopen-checker = { module = "com.jakewharton.nopen:nopen-checker", version.ref = "nopen"} +nullaway = { module = "com.uber.nullaway:nullaway", version = "0.9.5" } otel = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "otel" } otel-extension-autoconfigure = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", version.ref = "otel" } otel-extension-autoconfigure-spi = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", version.ref = "otel" } diff --git a/sentry-android-core/build.gradle.kts b/sentry-android-core/build.gradle.kts index 4135bcc37e..e21d8b690b 100644 --- a/sentry-android-core/build.gradle.kts +++ b/sentry-android-core/build.gradle.kts @@ -60,7 +60,7 @@ android { // needed because of Kotlin 1.4.x configurations.all { - resolutionStrategy.force(Config.CompileOnly.jetbrainsAnnotations) + resolutionStrategy.force(libs.jetbrains.annotations.get()) } androidComponents.beforeVariants { @@ -77,6 +77,8 @@ tasks.withType().configureEach { dependencies { api(projects.sentry) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) compileOnly(projects.sentryAndroidFragment) compileOnly(projects.sentryAndroidTimber) compileOnly(projects.sentryAndroidReplay) @@ -87,11 +89,9 @@ dependencies { implementation(Config.Libs.lifecycleCommonJava8) implementation(libs.androidx.core) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION)) diff --git a/sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts b/sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts index 9f84c262a2..1b5ec9fd1c 100644 --- a/sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts +++ b/sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts @@ -84,9 +84,7 @@ android { } dependencies { - implementation(kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)) - implementation(projects.sentryAndroid) implementation(Config.Libs.appCompat) implementation(libs.androidx.core) @@ -94,10 +92,11 @@ dependencies { implementation(Config.Libs.constraintLayout) implementation(libs.androidx.test.espresso.idling.resource) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) + compileOnly(libs.nopen.annotations) + + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) androidTestUtil(libs.androidx.test.orchestrator) androidTestImplementation(projects.sentryTestSupport) 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 19a394514f..8758506670 100644 --- a/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts +++ b/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts @@ -110,10 +110,11 @@ dependencies { implementation(libs.androidx.test.espresso.idling.resource) implementation(Config.Libs.leakCanary) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) + compileOnly(libs.nopen.annotations) + + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) androidTestUtil(libs.androidx.test.orchestrator) androidTestImplementation(projects.sentryTestSupport) diff --git a/sentry-android-ndk/build.gradle.kts b/sentry-android-ndk/build.gradle.kts index c1184fdf74..16e5fc1c58 100644 --- a/sentry-android-ndk/build.gradle.kts +++ b/sentry-android-ndk/build.gradle.kts @@ -56,7 +56,7 @@ android { // needed because of Kotlin 1.4.x configurations.all { - resolutionStrategy.force(Config.CompileOnly.jetbrainsAnnotations) + resolutionStrategy.force(libs.jetbrains.annotations.get()) } buildFeatures { @@ -85,7 +85,7 @@ dependencies { implementation(Config.Libs.sentryNativeNdk) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION)) testImplementation(libs.kotlin.test.junit) diff --git a/sentry-apache-http-client-5/build.gradle.kts b/sentry-apache-http-client-5/build.gradle.kts index 38be682d17..0634d0fec4 100644 --- a/sentry-apache-http-client-5/build.gradle.kts +++ b/sentry-apache-http-client-5/build.gradle.kts @@ -19,11 +19,11 @@ dependencies { api(projects.sentry) api(Config.Libs.apacheHttpClient) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(Config.Libs.apacheHttpClient) diff --git a/sentry-apollo-3/build.gradle.kts b/sentry-apollo-3/build.gradle.kts index 0d5b1802bf..aec478ca89 100644 --- a/sentry-apollo-3/build.gradle.kts +++ b/sentry-apollo-3/build.gradle.kts @@ -21,11 +21,11 @@ dependencies { compileOnly(Config.Libs.apolloKotlin) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentryTestSupport) diff --git a/sentry-apollo-4/build.gradle.kts b/sentry-apollo-4/build.gradle.kts index 3fddd18230..23ddc55327 100644 --- a/sentry-apollo-4/build.gradle.kts +++ b/sentry-apollo-4/build.gradle.kts @@ -26,11 +26,11 @@ dependencies { compileOnly(Config.Libs.apolloKotlin4) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentryTestSupport) diff --git a/sentry-apollo/build.gradle.kts b/sentry-apollo/build.gradle.kts index fc1eade4e7..d59d8619df 100644 --- a/sentry-apollo/build.gradle.kts +++ b/sentry-apollo/build.gradle.kts @@ -20,12 +20,11 @@ dependencies { api(projects.sentryKotlinExtensions) compileOnly(Config.Libs.apolloAndroid) - - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentryTestSupport) diff --git a/sentry-graphql-22/build.gradle.kts b/sentry-graphql-22/build.gradle.kts index db1e0b7a84..1a8df4e677 100644 --- a/sentry-graphql-22/build.gradle.kts +++ b/sentry-graphql-22/build.gradle.kts @@ -20,11 +20,11 @@ dependencies { api(projects.sentryGraphqlCore) compileOnly(Config.Libs.graphQlJava22) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentry) diff --git a/sentry-graphql-core/build.gradle.kts b/sentry-graphql-core/build.gradle.kts index 5eff46b329..0d5acae056 100644 --- a/sentry-graphql-core/build.gradle.kts +++ b/sentry-graphql-core/build.gradle.kts @@ -19,11 +19,11 @@ dependencies { api(projects.sentry) compileOnly(Config.Libs.graphQlJava) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentry) diff --git a/sentry-graphql/build.gradle.kts b/sentry-graphql/build.gradle.kts index d358d2f580..a3812b850a 100644 --- a/sentry-graphql/build.gradle.kts +++ b/sentry-graphql/build.gradle.kts @@ -20,11 +20,11 @@ dependencies { api(projects.sentryGraphqlCore) compileOnly(Config.Libs.graphQlJava) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentry) diff --git a/sentry-jdbc/build.gradle.kts b/sentry-jdbc/build.gradle.kts index ae28b0452c..4fc3051765 100644 --- a/sentry-jdbc/build.gradle.kts +++ b/sentry-jdbc/build.gradle.kts @@ -18,11 +18,11 @@ dependencies { api(projects.sentry) api(Config.Libs.p6spy) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) - errorprone(Config.CompileOnly.errorProneNullAway) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentryTestSupport) diff --git a/sentry-jul/build.gradle.kts b/sentry-jul/build.gradle.kts index e2867e55d6..d611d46b5d 100644 --- a/sentry-jul/build.gradle.kts +++ b/sentry-jul/build.gradle.kts @@ -18,11 +18,11 @@ dependencies { api(projects.sentry) compileOnly(Config.Libs.slf4jApi) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentryTestSupport) diff --git a/sentry-kotlin-extensions/build.gradle.kts b/sentry-kotlin-extensions/build.gradle.kts index a694eb5bc0..5ceb0fe2a9 100644 --- a/sentry-kotlin-extensions/build.gradle.kts +++ b/sentry-kotlin-extensions/build.gradle.kts @@ -19,10 +19,10 @@ dependencies { api(projects.sentry) compileOnly(Config.Libs.coroutinesCore) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) // tests testImplementation(projects.sentryTestSupport) diff --git a/sentry-log4j2/build.gradle.kts b/sentry-log4j2/build.gradle.kts index 078ad4a09f..a559782f98 100644 --- a/sentry-log4j2/build.gradle.kts +++ b/sentry-log4j2/build.gradle.kts @@ -20,11 +20,11 @@ dependencies { compileOnly(Config.Libs.log4j2Core) annotationProcessor(Config.Libs.log4j2Core) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentryTestSupport) diff --git a/sentry-logback/build.gradle.kts b/sentry-logback/build.gradle.kts index ad04ecabd0..b38f14cc59 100644 --- a/sentry-logback/build.gradle.kts +++ b/sentry-logback/build.gradle.kts @@ -18,11 +18,11 @@ dependencies { api(projects.sentry) compileOnly(Config.Libs.logbackClassic) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentryTestSupport) diff --git a/sentry-okhttp/build.gradle.kts b/sentry-okhttp/build.gradle.kts index 5b794b1874..9a7ec02401 100644 --- a/sentry-okhttp/build.gradle.kts +++ b/sentry-okhttp/build.gradle.kts @@ -26,11 +26,11 @@ dependencies { implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION)) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentryTestSupport) diff --git a/sentry-openfeign/build.gradle.kts b/sentry-openfeign/build.gradle.kts index 2eda41529a..eb7a7de9b9 100644 --- a/sentry-openfeign/build.gradle.kts +++ b/sentry-openfeign/build.gradle.kts @@ -18,11 +18,11 @@ dependencies { api(projects.sentry) compileOnly(Config.Libs.feignCore) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentryTestSupport) diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts index ab9b60c315..2b9659214e 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts @@ -21,16 +21,16 @@ dependencies { } compileOnly(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) compileOnly(libs.otel) compileOnly(libs.otel.extension.autoconfigure.spi) compileOnly(libs.otel.javaagent.extension.api) compileOnly(libs.otel.javaagent.tooling) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) - errorprone(Config.CompileOnly.errorProneNullAway) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentryTestSupport) diff --git a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts index aa6bd137e3..c7e7168b15 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts @@ -15,14 +15,13 @@ tasks.withType().configureEach { dependencies { compileOnly(projects.sentry) - + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) compileOnly(libs.otel) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) - errorprone(Config.CompileOnly.errorProneNullAway) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentryTestSupport) diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts index 9a56a88b20..e5a1152aa6 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts @@ -26,11 +26,11 @@ dependencies { compileOnly(libs.otel.semconv) compileOnly(libs.otel.semconv.incubating) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) - errorprone(Config.CompileOnly.errorProneNullAway) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap) diff --git a/sentry-quartz/build.gradle.kts b/sentry-quartz/build.gradle.kts index 561f21c763..c043e27f8a 100644 --- a/sentry-quartz/build.gradle.kts +++ b/sentry-quartz/build.gradle.kts @@ -19,11 +19,11 @@ dependencies { api(projects.sentry) compileOnly(Config.Libs.quartz) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentry) diff --git a/sentry-reactor/build.gradle.kts b/sentry-reactor/build.gradle.kts index 5dafa35fbf..183b51490b 100644 --- a/sentry-reactor/build.gradle.kts +++ b/sentry-reactor/build.gradle.kts @@ -25,11 +25,11 @@ dependencies { compileOnly(Config.Libs.reactorCore) compileOnly(Config.Libs.contextPropagation) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentryTestSupport) diff --git a/sentry-servlet-jakarta/build.gradle.kts b/sentry-servlet-jakarta/build.gradle.kts index 9102113d15..0fcc7ac1a9 100644 --- a/sentry-servlet-jakarta/build.gradle.kts +++ b/sentry-servlet-jakarta/build.gradle.kts @@ -19,11 +19,11 @@ dependencies { api(projects.sentry) compileOnly(Config.Libs.servletApiJakarta) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(Config.Libs.servletApiJakarta) diff --git a/sentry-servlet/build.gradle.kts b/sentry-servlet/build.gradle.kts index 72f28a368a..375453406b 100644 --- a/sentry-servlet/build.gradle.kts +++ b/sentry-servlet/build.gradle.kts @@ -19,11 +19,11 @@ dependencies { api(projects.sentry) compileOnly(Config.Libs.servletApi) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentryTestSupport) diff --git a/sentry-spring-boot-jakarta/build.gradle.kts b/sentry-spring-boot-jakarta/build.gradle.kts index 08cf54cb63..d0f10b8545 100644 --- a/sentry-spring-boot-jakarta/build.gradle.kts +++ b/sentry-spring-boot-jakarta/build.gradle.kts @@ -36,6 +36,8 @@ dependencies { compileOnly(Config.Libs.servletApiJakarta) compileOnly(Config.Libs.reactorCore) compileOnly(Config.Libs.contextPropagation) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) compileOnly(libs.otel) compileOnly(libs.springboot3.starter) compileOnly(libs.springboot3.starter.aop) @@ -50,11 +52,9 @@ dependencies { annotationProcessor(Config.AnnotationProcessors.springBootAutoConfigure) annotationProcessor(Config.AnnotationProcessors.springBootConfiguration) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentryLogback) diff --git a/sentry-spring-boot-starter-jakarta/build.gradle.kts b/sentry-spring-boot-starter-jakarta/build.gradle.kts index 20cdb97981..94a4b30011 100644 --- a/sentry-spring-boot-starter-jakarta/build.gradle.kts +++ b/sentry-spring-boot-starter-jakarta/build.gradle.kts @@ -29,11 +29,12 @@ dependencies { annotationProcessor(Config.AnnotationProcessors.springBootAutoConfigure) annotationProcessor(Config.AnnotationProcessors.springBootConfiguration) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) } configure { diff --git a/sentry-spring-boot-starter/build.gradle.kts b/sentry-spring-boot-starter/build.gradle.kts index f4a314de7f..7321e254ee 100644 --- a/sentry-spring-boot-starter/build.gradle.kts +++ b/sentry-spring-boot-starter/build.gradle.kts @@ -24,11 +24,11 @@ dependencies { annotationProcessor(Config.AnnotationProcessors.springBootAutoConfigure) annotationProcessor(Config.AnnotationProcessors.springBootConfiguration) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) } configure { diff --git a/sentry-spring-boot/build.gradle.kts b/sentry-spring-boot/build.gradle.kts index 305f4aeb45..237c50e569 100644 --- a/sentry-spring-boot/build.gradle.kts +++ b/sentry-spring-boot/build.gradle.kts @@ -22,6 +22,8 @@ dependencies { api(projects.sentrySpring) compileOnly(projects.sentryLogback) compileOnly(projects.sentryApacheHttpClient5) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) compileOnly(libs.springboot.starter) compileOnly(libs.springboot.starter.aop) compileOnly(libs.springboot.starter.graphql) @@ -40,11 +42,9 @@ dependencies { annotationProcessor(Config.AnnotationProcessors.springBootAutoConfigure) annotationProcessor(Config.AnnotationProcessors.springBootConfiguration) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentryLogback) diff --git a/sentry-spring-jakarta/build.gradle.kts b/sentry-spring-jakarta/build.gradle.kts index 5c1c161be9..ba134bd81a 100644 --- a/sentry-spring-jakarta/build.gradle.kts +++ b/sentry-spring-jakarta/build.gradle.kts @@ -36,17 +36,13 @@ dependencies { compileOnly(Config.Libs.servletApiJakarta) compileOnly(Config.Libs.slf4jApi) compileOnly(Config.Libs.contextPropagation) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) compileOnly(libs.otel) compileOnly(libs.springboot3.starter.graphql) compileOnly(libs.springboot3.starter.quartz) compileOnly(Config.Libs.springWebflux) - - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) compileOnly(projects.sentryGraphql) compileOnly(projects.sentryGraphql22) compileOnly(projects.sentryQuartz) @@ -54,6 +50,10 @@ dependencies { compileOnly(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap) api(projects.sentryReactor) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) + // tests testImplementation(projects.sentryTestSupport) testImplementation(projects.sentryGraphql) diff --git a/sentry-spring/build.gradle.kts b/sentry-spring/build.gradle.kts index f37a1259fb..319969cd7f 100644 --- a/sentry-spring/build.gradle.kts +++ b/sentry-spring/build.gradle.kts @@ -31,17 +31,17 @@ dependencies { compileOnly(Config.Libs.springWebflux) compileOnly(projects.sentryGraphql) compileOnly(projects.sentryQuartz) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) compileOnly(libs.otel) compileOnly(libs.springboot.starter.graphql) compileOnly(libs.springboot.starter.quartz) compileOnly(projects.sentryOpentelemetry.sentryOpentelemetryAgentcustomization) compileOnly(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - errorprone(Config.CompileOnly.errorProneNullAway) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) // tests testImplementation(projects.sentryTestSupport) diff --git a/sentry-system-test-support/build.gradle.kts b/sentry-system-test-support/build.gradle.kts index 709688a4c2..b7523d21e6 100644 --- a/sentry-system-test-support/build.gradle.kts +++ b/sentry-system-test-support/build.gradle.kts @@ -18,6 +18,8 @@ tasks.withType().configureEach dependencies { api(projects.sentry) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) compileOnly(libs.springboot3.starter.test) { exclude(group = "org.junit.vintage", module = "junit-vintage-engine") } @@ -28,10 +30,8 @@ dependencies { api(projects.sentryTestSupport) implementation(Config.Libs.okhttp) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) // tests implementation(kotlin(Config.kotlinStdLib)) diff --git a/sentry-test-support/build.gradle.kts b/sentry-test-support/build.gradle.kts index c80af69950..31a5e82646 100644 --- a/sentry-test-support/build.gradle.kts +++ b/sentry-test-support/build.gradle.kts @@ -18,10 +18,11 @@ tasks.withType().configureEach dependencies { api(projects.sentry) - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) + + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) // tests implementation(kotlin(Config.kotlinStdLib)) diff --git a/sentry/build.gradle.kts b/sentry/build.gradle.kts index 8a72ce6535..e24967f793 100644 --- a/sentry/build.gradle.kts +++ b/sentry/build.gradle.kts @@ -15,11 +15,11 @@ tasks.withType().configureEach { } dependencies { - compileOnly(Config.CompileOnly.nopen) - errorprone(Config.CompileOnly.nopenChecker) - errorprone(Config.CompileOnly.errorprone) - compileOnly(Config.CompileOnly.jetbrainsAnnotations) - errorprone(Config.CompileOnly.errorProneNullAway) + errorprone(libs.errorprone.core) + errorprone(libs.nopen.checker) + errorprone(libs.nullaway) + compileOnly(libs.jetbrains.annotations) + compileOnly(libs.nopen.annotations) // tests testImplementation(kotlin(Config.kotlinStdLib)) testImplementation(libs.awaitility.kotlin)