Revert "update kotlin for spring7 projects"

lbloder · lbloder · commit f90071ae759c · 2026-06-22T09:17:31.000+02:00
This reverts commit 1c71af7.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ gummyBears = "0.12.0"
 jackson = "2.18.3"
 jetbrainsCompose = "1.6.11"
 kotlin = "2.2.0"
-kotlinSpring7 = "2.3.21"
+kotlinSpring7 = "2.2.0"
 kotlin-compatible-version = "1.9"
 ksp = "2.3.9"
 ktorClient = "3.0.0"
diff --git a/sentry-samples/sentry-samples-spring-7/build.gradle.kts b/sentry-samples/sentry-samples-spring-7/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
   alias(libs.plugins.springboot4) apply false
   alias(libs.plugins.spring.dependency.management)
   alias(libs.plugins.kotlin.jvm)
-  alias(libs.plugins.kotlin.spring7)
+  alias(libs.plugins.kotlin.spring)
   id("war")
   alias(libs.plugins.gretty)
 }
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
   alias(libs.plugins.springboot4)
   alias(libs.plugins.spring.dependency.management)
   alias(libs.plugins.kotlin.jvm)
-  alias(libs.plugins.kotlin.spring7)
+  alias(libs.plugins.kotlin.spring)
 }
 
 group = "io.sentry.sample.spring-boot-4"
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
   alias(libs.plugins.springboot4)
   alias(libs.plugins.spring.dependency.management)
   alias(libs.plugins.kotlin.jvm)
-  alias(libs.plugins.kotlin.spring7)
+  alias(libs.plugins.kotlin.spring)
 }
 
 group = "io.sentry.sample.spring-boot-4"
diff --git a/sentry-samples/sentry-samples-spring-boot-4-otlp/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-otlp/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
   alias(libs.plugins.springboot4)
   alias(libs.plugins.spring.dependency.management)
   alias(libs.plugins.kotlin.jvm)
-  alias(libs.plugins.kotlin.spring7)
+  alias(libs.plugins.kotlin.spring)
 }
 
 group = "io.sentry.sample.spring-boot-4-otlp"
diff --git a/sentry-samples/sentry-samples-spring-boot-4-webflux/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-webflux/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
   alias(libs.plugins.springboot4)
   alias(libs.plugins.spring.dependency.management)
   alias(libs.plugins.kotlin.jvm)
-  alias(libs.plugins.kotlin.spring7)
+  alias(libs.plugins.kotlin.spring)
 }
 
 group = "io.sentry.sample.spring-boot-4-webflux"
diff --git a/sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
   alias(libs.plugins.springboot4)
   alias(libs.plugins.spring.dependency.management)
   alias(libs.plugins.kotlin.jvm)
-  alias(libs.plugins.kotlin.spring7)
+  alias(libs.plugins.kotlin.spring)
 }
 
 group = "io.sentry.sample.spring-boot-4"

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ plugins {`
`7`	`7`	`alias(libs.plugins.springboot4) apply false`
`8`	`8`	`alias(libs.plugins.spring.dependency.management)`
`9`	`9`	`alias(libs.plugins.kotlin.jvm)`
`10`		`- alias(libs.plugins.kotlin.spring7)`
	`10`	`+ alias(libs.plugins.kotlin.spring)`
`11`	`11`	`id("war")`
`12`	`12`	`alias(libs.plugins.gretty)`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ plugins {`
`5`	`5`	`alias(libs.plugins.springboot4)`
`6`	`6`	`alias(libs.plugins.spring.dependency.management)`
`7`	`7`	`alias(libs.plugins.kotlin.jvm)`
`8`		`- alias(libs.plugins.kotlin.spring7)`
	`8`	`+ alias(libs.plugins.kotlin.spring)`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`group = "io.sentry.sample.spring-boot-4"`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ plugins {`
`6`	`6`	`alias(libs.plugins.springboot4)`
`7`	`7`	`alias(libs.plugins.spring.dependency.management)`
`8`	`8`	`alias(libs.plugins.kotlin.jvm)`
`9`		`- alias(libs.plugins.kotlin.spring7)`
	`9`	`+ alias(libs.plugins.kotlin.spring)`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`group = "io.sentry.sample.spring-boot-4"`