diff --git a/.cursor/BUGBOT.md b/.cursor/BUGBOT.md index 8882291ee46..2bb66797805 100644 --- a/.cursor/BUGBOT.md +++ b/.cursor/BUGBOT.md @@ -58,7 +58,7 @@ rule file in [`.cursor/rules/`](rules) for the area the diff touches (`api`, `op ## Java and Android specifics -- The core `sentry` module is Java 8 and must not reference Android or JVM-only APIs. Reach optional +- The core `sentry` module is Java 11 and must not reference Android or JVM-only APIs. Reach optional platform code through `Platform`, `LoadClass`, or a separate module. - Android code calling an API newer than `minSdk` must be guarded by `BuildInfoProvider.getSdkInfoVersion()`. diff --git a/AGENTS.md b/AGENTS.md index 46668617274..68c62de7d6e 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -123,7 +123,7 @@ The repository is organized into multiple modules: ## Development Guidelines ### Code Style -- **Languages**: Java 8+ and Kotlin +- **Languages**: Java 11+ and Kotlin - **Formatting**: Enforced via Spotless - **API Compatibility**: Binary compatibility is enforced. `.api` files are generated, never hand-edited diff --git a/CHANGELOG.md b/CHANGELOG.md index c0d6b1dbe1d..61644813607 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Breaking Changes +- The SDK is now compiled for Java 11 instead of Java 8. JVM applications need Java 11 or newer ([#6459](https://github.com/getsentry/sentry-java/pull/6459)) - Default trace context status to `ok` when an active span has no explicit status ([#6418](https://github.com/getsentry/sentry-java/pull/6418)) - Remove the deprecated user feedback APIs ([#6337](https://github.com/getsentry/sentry-java/pull/6337)) - `UserFeedback` and `Sentry.captureUserFeedback(...)`: use `Sentry.feedback().capture(...)` with `io.sentry.protocol.Feedback` instead diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index 60a340c9b85..ef9930894d4 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -16,10 +16,6 @@ gradlePlugin { id = "io.sentry.jdk-target" implementationClass = "io.sentry.gradle.JdkTargetConvention" } - register("sentryAnimalSniffer") { - id = "io.sentry.animalsniffer" - implementationClass = "io.sentry.gradle.SentryAnimalSnifferPlugin" - } register("sentryAnimalSnifferAndroid") { id = "io.sentry.animalsniffer.android" implementationClass = "io.sentry.gradle.SentryAnimalSnifferAndroidPlugin" diff --git a/build-logic/src/main/kotlin/io/sentry/gradle/JdkTargetConvention.kt b/build-logic/src/main/kotlin/io/sentry/gradle/JdkTargetConvention.kt index ca2999f878a..c7bc87be916 100644 --- a/build-logic/src/main/kotlin/io/sentry/gradle/JdkTargetConvention.kt +++ b/build-logic/src/main/kotlin/io/sentry/gradle/JdkTargetConvention.kt @@ -20,18 +20,18 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile /** The JDK every module compiles and tests with, whatever JDK runs Gradle. */ private val BUILD_JDK = JavaLanguageVersion.of(21) -/** The level the SDK publishes, so that Java 8 consumers can still use it. */ -private val PUBLISHED_JAVA_VERSION = JavaVersion.VERSION_1_8 +/** The level the SDK publishes. */ +private val PUBLISHED_JAVA_VERSION = JavaVersion.VERSION_11 /** * Holds every toolchain, bytecode level decision and compilation option of a module. It does the * following * - sample apps target the build JDK (21) * - unit test code will target the build JDK (21) (required for Mockito 5) - * - published JVM modules main code pins the Java 1.8 release, for Java and for Kotlin + * - published JVM modules main code pins the Java 11 release, for Java and for Kotlin * - published modules Java code drops the MethodParameters attribute javac 21 adds, and their * archives are checked for it - * - published Android modules main code targets Java 1.8 + * - published Android modules main code targets Java 11 * - minSdk is set for Android libraries */ class JdkTargetConvention : Plugin { @@ -75,7 +75,7 @@ class JdkTargetConvention : Plugin { } } // -Xjdk-release is the Kotlin counterpart of release: without it Kotlin resolves against the - // build JDK and happily compiles e.g. Files.readString() into Java 8 bytecode. The version + // build JDK and happily compiles e.g. Stream.toList() into Java 11 bytecode. The version // follows jvmTarget, which the modules that publish a higher level set themselves. project.plugins.withId("org.jetbrains.kotlin.jvm") { project.tasks.named("compileKotlin", KotlinJvmCompile::class.java) { @@ -110,8 +110,8 @@ class JdkTargetConvention : Plugin { .toInt() /** - * Mockito 5 and mockito-kotlin 6 are built for Java 11, so test code - which is never published - - * cannot share the Java 8 target of the main code. AGP has no per variant compileOptions, so this + * Test code - which is never published - targets the build JDK, as it does in the JVM modules, + * instead of the Java 11 target of the main code. AGP has no per variant compileOptions, so this * goes through the Kotlin compilations: their compile task providers are configured after AGP * wrote its own compileOptions, which an apply time configureEach would lose against. */ diff --git a/build-logic/src/main/kotlin/io/sentry/gradle/SentryAnimalSnifferPlugin.kt b/build-logic/src/main/kotlin/io/sentry/gradle/SentryAnimalSnifferPlugin.kt index f1bc2bafcf7..1dc906b212c 100644 --- a/build-logic/src/main/kotlin/io/sentry/gradle/SentryAnimalSnifferPlugin.kt +++ b/build-logic/src/main/kotlin/io/sentry/gradle/SentryAnimalSnifferPlugin.kt @@ -20,14 +20,19 @@ abstract class SentryAnimalSnifferExtension { } } -class SentryAnimalSnifferPlugin : Plugin { +/** + * Checks the main code of the JVM modules that Android apps also use against the Android API 21 + * signature. The JVM API needs no signature: javac's release flag and Kotlin's -Xjdk-release + * already limit main code to the published Java version, see JdkTargetConvention. + */ +class SentryAnimalSnifferAndroidPlugin : Plugin { override fun apply(project: Project) { project.pluginManager.apply("ru.vyarus.animalsniffer") val extension = project.extensions.create("sentryAnimalSniffer", SentryAnimalSnifferExtension::class.java) - project.addSignatureDependency("java8-signature") + project.addSignatureDependency("gummy-bears-api21") project.tasks.named("animalsnifferMain", AnimalSniffer::class.java).configure { ignoreClasses = ignoreClasses + extension.ignoredClasses.get() @@ -38,14 +43,6 @@ class SentryAnimalSnifferPlugin : Plugin { } } -class SentryAnimalSnifferAndroidPlugin : Plugin { - override fun apply(project: Project) { - project.pluginManager.apply(SentryAnimalSnifferPlugin::class.java) - - project.addSignatureDependency("gummy-bears-api21") - } -} - private fun Project.addSignatureDependency(libraryName: String) { val libs = extensions.getByType(VersionCatalogsExtension::class.java).named("libs") dependencies.add("signature", signatureNotation(libs.findLibrary(libraryName).get().get())) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7cbe8e626c8..11f51535a32 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,6 @@ coroutines = "1.6.1" espresso = "3.7.0" feign = "11.6" gummyBears = "0.12.0" -java8Signature = "1.0" jackson = "2.18.3" jetbrainsCompose = "1.6.11" kotlin = "2.3.21" @@ -252,7 +251,6 @@ timber = { module = "com.jakewharton.timber:timber", version = "4.7.1" } # Animalsniffer signature gummy-bears-api21 = { module = "com.toasttab.android:gummy-bears-api-21", version.ref = "gummyBears" } -java8-signature = { module = "org.codehaus.mojo.signature:java18", version.ref = "java8Signature" } # tomcat libraries tomcat-catalina = { module = "org.apache.tomcat:tomcat-catalina", version = "9.0.108" } diff --git a/sentry-android-core/build.gradle.kts b/sentry-android-core/build.gradle.kts index 0f791a46019..c216ae3a15a 100644 --- a/sentry-android-core/build.gradle.kts +++ b/sentry-android-core/build.gradle.kts @@ -1,6 +1,6 @@ import net.ltgt.gradle.errorprone.errorprone import org.jetbrains.kotlin.config.KotlinCompilerVersion -import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 +import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 plugins { id("com.android.library") @@ -39,7 +39,7 @@ android { // disabled, so unit tests must target release to run at all. testBuildType = "release" - kotlin { compilerOptions.jvmTarget = JVM_1_8 } + kotlin { compilerOptions.jvmTarget = JVM_11 } testOptions { animationsDisabled = true diff --git a/sentry-android-distribution/build.gradle.kts b/sentry-android-distribution/build.gradle.kts index 074d56c08e6..b575ab5b5ca 100644 --- a/sentry-android-distribution/build.gradle.kts +++ b/sentry-android-distribution/build.gradle.kts @@ -1,4 +1,4 @@ -import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 +import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { @@ -28,7 +28,7 @@ android { } kotlin { - compilerOptions.jvmTarget = JVM_1_8 + compilerOptions.jvmTarget = JVM_11 compilerOptions.languageVersion = KotlinVersion.KOTLIN_1_9 explicitApi() } diff --git a/sentry-android-fragment/build.gradle.kts b/sentry-android-fragment/build.gradle.kts index 3c7a0404970..c7cc6c4f0ea 100644 --- a/sentry-android-fragment/build.gradle.kts +++ b/sentry-android-fragment/build.gradle.kts @@ -31,7 +31,7 @@ android { testBuildType = "release" kotlin { - compilerOptions.jvmTarget = JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = JvmTarget.JVM_11 compilerOptions.languageVersion = KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = KotlinVersion.KOTLIN_1_9 } @@ -75,5 +75,5 @@ dependencies { tasks.withType().configureEach { // Target version of the generated JVM bytecode. It is used for type resolution. - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_11.toString() } diff --git a/sentry-android-navigation/build.gradle.kts b/sentry-android-navigation/build.gradle.kts index ddc6d6f4161..800eb651239 100644 --- a/sentry-android-navigation/build.gradle.kts +++ b/sentry-android-navigation/build.gradle.kts @@ -1,5 +1,5 @@ import io.gitlab.arturbosch.detekt.Detekt -import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 +import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { @@ -31,7 +31,7 @@ android { testBuildType = "release" kotlin { - compilerOptions.jvmTarget = JVM_1_8 + compilerOptions.jvmTarget = JVM_11 compilerOptions.languageVersion = KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = KotlinVersion.KOTLIN_1_9 } @@ -82,5 +82,5 @@ dependencies { tasks.withType().configureEach { // Target version of the generated JVM bytecode. It is used for type resolution. - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_11.toString() } diff --git a/sentry-android-navigation3/build.gradle.kts b/sentry-android-navigation3/build.gradle.kts index 9612fded9d6..435cd836d46 100644 --- a/sentry-android-navigation3/build.gradle.kts +++ b/sentry-android-navigation3/build.gradle.kts @@ -1,5 +1,5 @@ import io.gitlab.arturbosch.detekt.Detekt -import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 +import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { @@ -29,7 +29,7 @@ android { testBuildType = "release" kotlin { - compilerOptions.jvmTarget = JVM_1_8 + compilerOptions.jvmTarget = JVM_11 compilerOptions.languageVersion = KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = KotlinVersion.KOTLIN_1_9 } @@ -77,5 +77,5 @@ dependencies { tasks.withType().configureEach { // Target version of the generated JVM bytecode. It is used for type resolution. - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_11.toString() } diff --git a/sentry-android-ndk/build.gradle.kts b/sentry-android-ndk/build.gradle.kts index dff85906ca1..b59975054aa 100644 --- a/sentry-android-ndk/build.gradle.kts +++ b/sentry-android-ndk/build.gradle.kts @@ -31,7 +31,7 @@ android { // disabled, so unit tests must target release to run at all. testBuildType = "release" - kotlin { compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 } + kotlin { compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } testOptions { animationsDisabled = true diff --git a/sentry-android-replay/build.gradle.kts b/sentry-android-replay/build.gradle.kts index 1a92f9a0b36..ceb48c23d2c 100644 --- a/sentry-android-replay/build.gradle.kts +++ b/sentry-android-replay/build.gradle.kts @@ -39,7 +39,7 @@ android { testBuildType = "release" kotlin { - compilerOptions.jvmTarget = JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = JvmTarget.JVM_11 compilerOptions.languageVersion = KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = KotlinVersion.KOTLIN_1_9 } @@ -95,7 +95,7 @@ dependencies { tasks.withType().configureEach { // Target version of the generated JVM bytecode. It is used for type resolution. - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_11.toString() } tasks.withType>().configureEach { diff --git a/sentry-android-sqlite/build.gradle.kts b/sentry-android-sqlite/build.gradle.kts index 38ea832082f..066ca6c8127 100644 --- a/sentry-android-sqlite/build.gradle.kts +++ b/sentry-android-sqlite/build.gradle.kts @@ -31,7 +31,7 @@ android { testBuildType = "release" kotlin { - compilerOptions.jvmTarget = JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = JvmTarget.JVM_11 compilerOptions.languageVersion = KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = KotlinVersion.KOTLIN_1_9 } @@ -84,5 +84,5 @@ dependencies { tasks.withType().configureEach { // Target version of the generated JVM bytecode. It is used for type resolution. - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_11.toString() } diff --git a/sentry-android-timber/build.gradle.kts b/sentry-android-timber/build.gradle.kts index 92f14b37c8c..1982068b628 100644 --- a/sentry-android-timber/build.gradle.kts +++ b/sentry-android-timber/build.gradle.kts @@ -38,7 +38,7 @@ android { testBuildType = "release" kotlin { - compilerOptions.jvmTarget = JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = JvmTarget.JVM_11 compilerOptions.languageVersion = KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = KotlinVersion.KOTLIN_1_9 } @@ -85,5 +85,5 @@ dependencies { tasks.withType().configureEach { // Target version of the generated JVM bytecode. It is used for type resolution. - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_11.toString() } diff --git a/sentry-apollo-3/build.gradle.kts b/sentry-apollo-3/build.gradle.kts index ae8721b22b2..a388d0f7100 100644 --- a/sentry-apollo-3/build.gradle.kts +++ b/sentry-apollo-3/build.gradle.kts @@ -13,7 +13,7 @@ plugins { } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } diff --git a/sentry-apollo-4/build.gradle.kts b/sentry-apollo-4/build.gradle.kts index 63c8b5431c6..a7ba68db5dd 100644 --- a/sentry-apollo-4/build.gradle.kts +++ b/sentry-apollo-4/build.gradle.kts @@ -13,7 +13,7 @@ plugins { } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } diff --git a/sentry-apollo-5/build.gradle.kts b/sentry-apollo-5/build.gradle.kts index 2d78dff8fa1..a4f76c5da02 100644 --- a/sentry-apollo-5/build.gradle.kts +++ b/sentry-apollo-5/build.gradle.kts @@ -12,7 +12,7 @@ plugins { } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } diff --git a/sentry-apollo/build.gradle.kts b/sentry-apollo/build.gradle.kts index 72a183bb7b3..4a1e06b60d1 100644 --- a/sentry-apollo/build.gradle.kts +++ b/sentry-apollo/build.gradle.kts @@ -13,7 +13,7 @@ plugins { } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } diff --git a/sentry-async-profiler/build.gradle.kts b/sentry-async-profiler/build.gradle.kts index fbb4a8fc353..c999a526343 100644 --- a/sentry-async-profiler/build.gradle.kts +++ b/sentry-async-profiler/build.gradle.kts @@ -8,11 +8,10 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } kotlin { explicitApi() } diff --git a/sentry-compose/build.gradle.kts b/sentry-compose/build.gradle.kts index 19fce9f95b5..2794d81e20e 100644 --- a/sentry-compose/build.gradle.kts +++ b/sentry-compose/build.gradle.kts @@ -19,7 +19,7 @@ kotlin { androidTarget { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) apiVersion.set(KotlinVersion.KOTLIN_1_9) languageVersion.set(KotlinVersion.KOTLIN_1_9) } @@ -27,7 +27,7 @@ kotlin { } jvm("desktop") { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) apiVersion.set(KotlinVersion.KOTLIN_1_9) languageVersion.set(KotlinVersion.KOTLIN_1_9) } @@ -126,7 +126,7 @@ detekt { source.setFrom("src/androidMain/kotlin", "src/androidUnitTest/kotlin") tasks.withType().configureEach { // Target version of the generated JVM bytecode. It is used for type resolution. - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_11.toString() } tasks.withType().configureEach { diff --git a/sentry-graphql-22/build.gradle.kts b/sentry-graphql-22/build.gradle.kts index 9da6bcc1e36..221d00a4362 100644 --- a/sentry-graphql-22/build.gradle.kts +++ b/sentry-graphql-22/build.gradle.kts @@ -8,11 +8,10 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } diff --git a/sentry-graphql-core/build.gradle.kts b/sentry-graphql-core/build.gradle.kts index df0496f070e..20f8b504bba 100644 --- a/sentry-graphql-core/build.gradle.kts +++ b/sentry-graphql-core/build.gradle.kts @@ -8,11 +8,10 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } diff --git a/sentry-graphql/build.gradle.kts b/sentry-graphql/build.gradle.kts index 25613e1fdd6..3aec272cfcb 100644 --- a/sentry-graphql/build.gradle.kts +++ b/sentry-graphql/build.gradle.kts @@ -8,11 +8,10 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } diff --git a/sentry-jcache/build.gradle.kts b/sentry-jcache/build.gradle.kts index b773c42c340..9ffc344e383 100644 --- a/sentry-jcache/build.gradle.kts +++ b/sentry-jcache/build.gradle.kts @@ -8,11 +8,10 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } diff --git a/sentry-jdbc/build.gradle.kts b/sentry-jdbc/build.gradle.kts index 9d0aa1596fe..24d32f65a51 100644 --- a/sentry-jdbc/build.gradle.kts +++ b/sentry-jdbc/build.gradle.kts @@ -8,11 +8,10 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } dependencies { diff --git a/sentry-jul/build.gradle.kts b/sentry-jul/build.gradle.kts index 451cbf1991b..3f4563e3e81 100644 --- a/sentry-jul/build.gradle.kts +++ b/sentry-jul/build.gradle.kts @@ -8,11 +8,10 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } dependencies { diff --git a/sentry-kafka/build.gradle.kts b/sentry-kafka/build.gradle.kts index eb293ada057..6a670195f1f 100644 --- a/sentry-kafka/build.gradle.kts +++ b/sentry-kafka/build.gradle.kts @@ -8,11 +8,10 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } dependencies { diff --git a/sentry-kotlin-extensions/build.gradle.kts b/sentry-kotlin-extensions/build.gradle.kts index ded17d445e7..80356c18fad 100644 --- a/sentry-kotlin-extensions/build.gradle.kts +++ b/sentry-kotlin-extensions/build.gradle.kts @@ -12,7 +12,7 @@ plugins { } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } @@ -36,7 +36,7 @@ dependencies { tasks.withType().configureEach { // Target version of the generated JVM bytecode. It is used for type resolution. - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_11.toString() } kotlin { explicitApi() } diff --git a/sentry-ktor-client/build.gradle.kts b/sentry-ktor-client/build.gradle.kts index 28edd1689e0..757f99477ab 100644 --- a/sentry-ktor-client/build.gradle.kts +++ b/sentry-ktor-client/build.gradle.kts @@ -13,7 +13,7 @@ plugins { } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } diff --git a/sentry-launchdarkly-android/build.gradle.kts b/sentry-launchdarkly-android/build.gradle.kts index df081b21213..b38f6ee6925 100644 --- a/sentry-launchdarkly-android/build.gradle.kts +++ b/sentry-launchdarkly-android/build.gradle.kts @@ -32,7 +32,7 @@ android { // disabled, so unit tests must target release to run at all. testBuildType = "release" - kotlin { compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 } + kotlin { compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } testOptions { animationsDisabled = true diff --git a/sentry-launchdarkly-server/build.gradle.kts b/sentry-launchdarkly-server/build.gradle.kts index f2ed3d15742..f7ccdec6b73 100644 --- a/sentry-launchdarkly-server/build.gradle.kts +++ b/sentry-launchdarkly-server/build.gradle.kts @@ -8,11 +8,10 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } diff --git a/sentry-log4j2/build.gradle.kts b/sentry-log4j2/build.gradle.kts index 68cdaa9b726..73a06ae6b3e 100644 --- a/sentry-log4j2/build.gradle.kts +++ b/sentry-log4j2/build.gradle.kts @@ -8,11 +8,10 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } dependencies { diff --git a/sentry-logback/build.gradle.kts b/sentry-logback/build.gradle.kts index 48f84725a78..6d06d9baa49 100644 --- a/sentry-logback/build.gradle.kts +++ b/sentry-logback/build.gradle.kts @@ -8,11 +8,10 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } dependencies { diff --git a/sentry-okhttp/build.gradle.kts b/sentry-okhttp/build.gradle.kts index 0b3e2388415..29a7f82eac5 100644 --- a/sentry-okhttp/build.gradle.kts +++ b/sentry-okhttp/build.gradle.kts @@ -13,7 +13,7 @@ plugins { } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } diff --git a/sentry-openfeature/build.gradle.kts b/sentry-openfeature/build.gradle.kts index 6750e22e61c..0590aa4d389 100644 --- a/sentry-openfeature/build.gradle.kts +++ b/sentry-openfeature/build.gradle.kts @@ -8,11 +8,10 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } diff --git a/sentry-openfeign/build.gradle.kts b/sentry-openfeign/build.gradle.kts index 209e5c34e54..12d71aa061b 100644 --- a/sentry-openfeign/build.gradle.kts +++ b/sentry-openfeign/build.gradle.kts @@ -8,11 +8,10 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } dependencies { diff --git a/sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts index b4b1a8b840d..046a9650bde 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts @@ -4,14 +4,13 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { `java-library` - id("io.sentry.animalsniffer") id("io.sentry.javadoc") alias(libs.plugins.kotlin.jvm) alias(libs.plugins.shadow) } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } fun relocatePackages(shadowJar: ShadowJar) { diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts index 3390f2695c8..06a5272d78c 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts @@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { `java-library` - id("io.sentry.animalsniffer") id("io.sentry.javadoc") alias(libs.plugins.kotlin.jvm) alias(libs.plugins.errorprone) @@ -11,7 +10,7 @@ plugins { } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } dependencies { diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts index 5a94dcd4422..c02ca0ca468 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts @@ -2,7 +2,6 @@ plugins { `java-library` id("io.sentry.javadoc") alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } dependencies { diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentless/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agentless/build.gradle.kts index 32d029746c1..8816e311040 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-agentless/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-agentless/build.gradle.kts @@ -5,11 +5,10 @@ plugins { id("io.sentry.javadoc") alias(libs.plugins.kotlin.jvm) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } dependencies { diff --git a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts index 28a1b030e15..315f4049017 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/build.gradle.kts @@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { `java-library` - id("io.sentry.animalsniffer") id("io.sentry.javadoc") alias(libs.plugins.kotlin.jvm) alias(libs.plugins.errorprone) @@ -11,7 +10,7 @@ plugins { } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } dependencies { diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts index 1c1e7f984ba..628f1186cbd 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts @@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { `java-library` - id("io.sentry.animalsniffer") id("io.sentry.javadoc") alias(libs.plugins.kotlin.jvm) alias(libs.plugins.errorprone) @@ -11,7 +10,7 @@ plugins { } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } dependencies { diff --git a/sentry-opentelemetry/sentry-opentelemetry-otlp-spring/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-otlp-spring/build.gradle.kts index 8a5093a6570..1ff16cd0a31 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-otlp-spring/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-otlp-spring/build.gradle.kts @@ -1,6 +1,5 @@ plugins { `java-library` - id("io.sentry.animalsniffer") id("io.sentry.javadoc") } diff --git a/sentry-opentelemetry/sentry-opentelemetry-otlp/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-otlp/build.gradle.kts index fb95d722d6f..ef0fd634ff3 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-otlp/build.gradle.kts +++ b/sentry-opentelemetry/sentry-opentelemetry-otlp/build.gradle.kts @@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { `java-library` - id("io.sentry.animalsniffer") id("io.sentry.javadoc") alias(libs.plugins.kotlin.jvm) alias(libs.plugins.errorprone) @@ -11,7 +10,7 @@ plugins { } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } dependencies { diff --git a/sentry-quartz/build.gradle.kts b/sentry-quartz/build.gradle.kts index b5387daf207..965b3ee8bb0 100644 --- a/sentry-quartz/build.gradle.kts +++ b/sentry-quartz/build.gradle.kts @@ -8,11 +8,10 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } diff --git a/sentry-samples/sentry-samples-ktor-client/build.gradle.kts b/sentry-samples/sentry-samples-ktor-client/build.gradle.kts index 08a08b01c88..caeaaf605b9 100644 --- a/sentry-samples/sentry-samples-ktor-client/build.gradle.kts +++ b/sentry-samples/sentry-samples-ktor-client/build.gradle.kts @@ -7,12 +7,12 @@ plugins { application { mainClass.set("io.sentry.samples.ktorClient.Main") } configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } tasks.withType().configureEach { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } dependencies { diff --git a/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts b/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts index 90bc1ffc86f..2f1f252d17e 100644 --- a/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts +++ b/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts @@ -15,9 +15,9 @@ group = "io.sentry.sample.spring-boot" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_1_8 +java.sourceCompatibility = JavaVersion.VERSION_11 -java.targetCompatibility = JavaVersion.VERSION_1_8 +java.targetCompatibility = JavaVersion.VERSION_11 dependencies { implementation(platform(libs.springboot2.bom)) @@ -61,6 +61,6 @@ tasks.withType().configureEach { useJUnitPlatform() } tasks.withType().configureEach { kotlin { compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict") - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } } diff --git a/sentry-samples/sentry-samples-openfeign/build.gradle.kts b/sentry-samples/sentry-samples-openfeign/build.gradle.kts index 8da1dfe785a..39193a3383c 100644 --- a/sentry-samples/sentry-samples-openfeign/build.gradle.kts +++ b/sentry-samples/sentry-samples-openfeign/build.gradle.kts @@ -7,8 +7,8 @@ plugins { application { mainClass.set("io.sentry.samples.openfeign.Main") } configure { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } dependencies { diff --git a/sentry-samples/sentry-samples-servlet/build.gradle.kts b/sentry-samples/sentry-samples-servlet/build.gradle.kts index 01ecef54154..ee758c3e129 100644 --- a/sentry-samples/sentry-samples-servlet/build.gradle.kts +++ b/sentry-samples/sentry-samples-servlet/build.gradle.kts @@ -4,9 +4,9 @@ group = "io.sentry.sample.servlet" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_1_8 +java.sourceCompatibility = JavaVersion.VERSION_11 -java.targetCompatibility = JavaVersion.VERSION_1_8 +java.targetCompatibility = JavaVersion.VERSION_11 dependencies { implementation(projects.sentryServlet) diff --git a/sentry-samples/sentry-samples-spring/build.gradle.kts b/sentry-samples/sentry-samples-spring/build.gradle.kts index b64fcab92a3..15df9480dcc 100644 --- a/sentry-samples/sentry-samples-spring/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring/build.gradle.kts @@ -13,10 +13,10 @@ plugins { // the Spring Boot 2.x matrix covers (2.4.13, Spring 5.3.13) fails on class files as new as the // toolchain's: "Unsupported class file major version 65". Only the app is scanned, so its test // code keeps following the toolchain. -tasks.named("compileJava") { options.release.set(8) } +tasks.named("compileJava") { options.release.set(11) } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } application { mainClass.set("io.sentry.samples.spring.Main") } diff --git a/sentry-servlet-jakarta/build.gradle.kts b/sentry-servlet-jakarta/build.gradle.kts index b9d6ffc2ec4..8d1db1473ee 100644 --- a/sentry-servlet-jakarta/build.gradle.kts +++ b/sentry-servlet-jakarta/build.gradle.kts @@ -8,11 +8,10 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } diff --git a/sentry-servlet/build.gradle.kts b/sentry-servlet/build.gradle.kts index 08ac7d45284..8cf9f631434 100644 --- a/sentry-servlet/build.gradle.kts +++ b/sentry-servlet/build.gradle.kts @@ -8,11 +8,10 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } diff --git a/sentry-spotlight/build.gradle.kts b/sentry-spotlight/build.gradle.kts index 072cb360e61..19d39bc5532 100644 --- a/sentry-spotlight/build.gradle.kts +++ b/sentry-spotlight/build.gradle.kts @@ -12,7 +12,7 @@ plugins { } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } dependencies { diff --git a/sentry-spring-boot-starter/build.gradle.kts b/sentry-spring-boot-starter/build.gradle.kts index 641b335becb..bfe0d3ed09d 100644 --- a/sentry-spring-boot-starter/build.gradle.kts +++ b/sentry-spring-boot-starter/build.gradle.kts @@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { `java-library` - id("io.sentry.animalsniffer") id("io.sentry.javadoc") alias(libs.plugins.kotlin.jvm) alias(libs.plugins.errorprone) @@ -11,7 +10,7 @@ plugins { } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } diff --git a/sentry-spring-boot/build.gradle.kts b/sentry-spring-boot/build.gradle.kts index 1b41b918edb..daf5f86660e 100644 --- a/sentry-spring-boot/build.gradle.kts +++ b/sentry-spring-boot/build.gradle.kts @@ -10,11 +10,10 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } diff --git a/sentry-spring/build.gradle.kts b/sentry-spring/build.gradle.kts index f11087c1b07..3c8be18663f 100644 --- a/sentry-spring/build.gradle.kts +++ b/sentry-spring/build.gradle.kts @@ -9,11 +9,10 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id("io.sentry.animalsniffer") } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = JvmTarget.JVM_11 compilerOptions.languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9 } diff --git a/sentry/build.gradle.kts b/sentry/build.gradle.kts index 9cbcf5bf2c0..d05bf8a1474 100644 --- a/sentry/build.gradle.kts +++ b/sentry/build.gradle.kts @@ -12,7 +12,7 @@ plugins { } tasks.named("compileKotlin") { - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 } dependencies {