fix ci

adinauer · adinauer · commit 1ae3d929136a · 2025-08-13T16:19:54.000+02:00
diff --git a/sentry-samples/sentry-samples-jul/build.gradle.kts b/sentry-samples/sentry-samples-jul/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
   java
   application
-  kotlin("jvm")
+  alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.gradle.versions)
   id("com.github.johnrengelman.shadow") version "8.1.1"
 }
@@ -22,9 +22,9 @@ configure<JavaPluginExtension> {
 }
 
 tasks.withType<KotlinCompile>().configureEach {
-  kotlinOptions {
-    freeCompilerArgs = listOf("-Xjsr305=strict")
-    jvmTarget = JavaVersion.VERSION_17.toString()
+  kotlin {
+    compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict")
+    compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
   }
 }
 
diff --git a/sentry-samples/sentry-samples-log4j2/build.gradle.kts b/sentry-samples/sentry-samples-log4j2/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
   java
   application
-  kotlin("jvm")
+  alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.gradle.versions)
   id("com.github.johnrengelman.shadow") version "8.1.1"
 }
@@ -22,9 +22,9 @@ configure<JavaPluginExtension> {
 }
 
 tasks.withType<KotlinCompile>().configureEach {
-  kotlinOptions {
-    freeCompilerArgs = listOf("-Xjsr305=strict")
-    jvmTarget = JavaVersion.VERSION_17.toString()
+  kotlin {
+    compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict")
+    compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
   }
 }
 
diff --git a/sentry-samples/sentry-samples-logback/build.gradle.kts b/sentry-samples/sentry-samples-logback/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
   java
   application
-  kotlin("jvm")
+  alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.gradle.versions)
   id("com.github.johnrengelman.shadow") version "8.1.1"
 }
@@ -22,9 +22,9 @@ configure<JavaPluginExtension> {
 }
 
 tasks.withType<KotlinCompile>().configureEach {
-  kotlinOptions {
-    freeCompilerArgs = listOf("-Xjsr305=strict")
-    jvmTarget = JavaVersion.VERSION_17.toString()
+  kotlin {
+    compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict")
+    compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
   }
 }
 
diff --git a/sentry-samples/sentry-samples-spring-boot/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot/build.gradle.kts
@@ -23,10 +23,6 @@ configure<JavaPluginExtension> {
   targetCompatibility = JavaVersion.VERSION_17
 }
 
-tasks.withType<KotlinCompile>().configureEach {
-  compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
-}
-
 tasks.withType<KotlinCompile>().configureEach {
   kotlin {
     compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict")

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
`3`	`3`	`plugins {`
`4`	`4`	`java`
`5`	`5`	`application`
`6`		`- kotlin("jvm")`
	`6`	`+ alias(libs.plugins.kotlin.jvm)`
`7`	`7`	`alias(libs.plugins.gradle.versions)`
`8`	`8`	`id("com.github.johnrengelman.shadow") version "8.1.1"`
`9`	`9`	`}`
`@@ -22,9 +22,9 @@ configure<JavaPluginExtension> {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`tasks.withType<KotlinCompile>().configureEach {`
`25`		`- kotlinOptions {`
`26`		`- freeCompilerArgs = listOf("-Xjsr305=strict")`
`27`		`- jvmTarget = JavaVersion.VERSION_17.toString()`
	`25`	`+ kotlin {`
	`26`	`+ compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict")`
	`27`	`+ compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`