diff --git a/build.gradle.kts b/build.gradle.kts index 2d7543beb7f..6c2d0480f97 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,6 +26,7 @@ plugins { alias(libs.plugins.compose.compiler) apply false alias(libs.plugins.errorprone) apply false alias(libs.plugins.gradle.versions) apply false + alias(libs.plugins.spring.dependency.management) apply false } buildscript { diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index b4eebaf547a..11fe2511e3b 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -13,9 +13,6 @@ object Config { object BuildPlugins { val androidGradle = "com.android.tools.build:gradle:$AGP" - val springBoot = "org.springframework.boot" - val springDependencyManagement = "io.spring.dependency-management" - val springDependencyManagementVersion = "1.0.11.RELEASE" val gretty = "org.gretty" val grettyVersion = "4.0.0" val commonsCompressOverride = "org.apache.commons:commons-compress:1.25.0" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6c2d9776bdf..c0c37eb0408 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,6 +3,8 @@ kotlin = "1.9.24" # 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 composeVersion = "1.6.11" +springTwo = "2.7.18" +springThree = "3.4.2" [plugins] kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } @@ -19,6 +21,9 @@ detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8"} jacoco-android = { id = "com.mxalbert.gradle.jacoco-android", version = "0.2.0" } kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.3" } vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" } +spring-boot-two = { id = "org.springframework.boot", version.ref = "springTwo" } +spring-boot-three = { id = "org.springframework.boot", version.ref = "springThree" } +spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE"} [libraries] kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } diff --git a/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts b/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts index 8c5619f0e14..e055cc2cd46 100644 --- a/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts +++ b/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts @@ -2,8 +2,8 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id(Config.BuildPlugins.springBoot) version Config.springBootVersion - id(Config.BuildPlugins.springDependencyManagement) version Config.BuildPlugins.springDependencyManagementVersion + alias(libs.plugins.spring.boot.two) + alias(libs.plugins.spring.dependency.management) kotlin("jvm") alias(libs.plugins.kotlin.spring) } 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 7e53aadc66d..1b7c1023ddd 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 @@ -2,8 +2,8 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id(Config.BuildPlugins.springBoot) version Config.springBoot3Version - id(Config.BuildPlugins.springDependencyManagement) version Config.BuildPlugins.springDependencyManagementVersion + alias(libs.plugins.spring.boot.three) + alias(libs.plugins.spring.dependency.management) kotlin("jvm") alias(libs.plugins.kotlin.spring) } 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 055145a406a..41709ab3dca 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 @@ -3,8 +3,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.springframework.boot.gradle.tasks.run.BootRun plugins { - id(Config.BuildPlugins.springBoot) version Config.springBoot3Version - id(Config.BuildPlugins.springDependencyManagement) version Config.BuildPlugins.springDependencyManagementVersion + alias(libs.plugins.spring.boot.three) + alias(libs.plugins.spring.dependency.management) kotlin("jvm") alias(libs.plugins.kotlin.spring) } 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 c2eda071b57..46841194ef5 100644 --- a/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts @@ -2,8 +2,8 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id(Config.BuildPlugins.springBoot) version Config.springBoot3Version - id(Config.BuildPlugins.springDependencyManagement) version Config.BuildPlugins.springDependencyManagementVersion + alias(libs.plugins.spring.boot.three) + alias(libs.plugins.spring.dependency.management) kotlin("jvm") alias(libs.plugins.kotlin.spring) } 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 d30763def84..f3288cd93b7 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 @@ -2,8 +2,8 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id(Config.BuildPlugins.springBoot) version Config.springBootVersion - id(Config.BuildPlugins.springDependencyManagement) version Config.BuildPlugins.springDependencyManagementVersion + alias(libs.plugins.spring.boot.two) + alias(libs.plugins.spring.dependency.management) kotlin("jvm") alias(libs.plugins.kotlin.spring) } 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 41a91570ffe..df2bae9cc32 100644 --- a/sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts @@ -3,8 +3,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.springframework.boot.gradle.tasks.run.BootRun plugins { - id(Config.BuildPlugins.springBoot) version Config.springBootVersion - id(Config.BuildPlugins.springDependencyManagement) version Config.BuildPlugins.springDependencyManagementVersion + alias(libs.plugins.spring.boot.two) + alias(libs.plugins.spring.dependency.management) kotlin("jvm") alias(libs.plugins.kotlin.spring) } 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 2dfb0e3ea7b..34ec83ab8e0 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 @@ -2,8 +2,8 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id(Config.BuildPlugins.springBoot) version Config.springBoot3Version - id(Config.BuildPlugins.springDependencyManagement) version Config.BuildPlugins.springDependencyManagementVersion + alias(libs.plugins.spring.boot.three) + alias(libs.plugins.spring.dependency.management) kotlin("jvm") alias(libs.plugins.kotlin.spring) } 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 a35f041c3e2..00286e6dc10 100644 --- a/sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts @@ -2,8 +2,8 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id(Config.BuildPlugins.springBoot) version Config.springBootVersion - id(Config.BuildPlugins.springDependencyManagement) version Config.BuildPlugins.springDependencyManagementVersion + alias(libs.plugins.spring.boot.two) + alias(libs.plugins.spring.dependency.management) kotlin("jvm") alias(libs.plugins.kotlin.spring) } diff --git a/sentry-samples/sentry-samples-spring-boot/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot/build.gradle.kts index 37ff5f78ea9..30f4cda219a 100644 --- a/sentry-samples/sentry-samples-spring-boot/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-boot/build.gradle.kts @@ -2,8 +2,8 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id(Config.BuildPlugins.springBoot) version Config.springBootVersion - id(Config.BuildPlugins.springDependencyManagement) version Config.BuildPlugins.springDependencyManagementVersion + alias(libs.plugins.spring.boot.two) + alias(libs.plugins.spring.dependency.management) kotlin("jvm") alias(libs.plugins.kotlin.spring) } diff --git a/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts index 9e59caf0ac0..622eb210d35 100644 --- a/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts @@ -4,8 +4,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.springframework.boot.gradle.plugin.SpringBootPlugin plugins { - id(Config.BuildPlugins.springBoot) version Config.springBoot3Version apply false - id(Config.BuildPlugins.springDependencyManagement) version Config.BuildPlugins.springDependencyManagementVersion + alias(libs.plugins.spring.boot.three) apply false + alias(libs.plugins.spring.dependency.management) kotlin("jvm") alias(libs.plugins.kotlin.spring) id("war") @@ -23,7 +23,7 @@ repositories { dependencyManagement { imports { - mavenBom(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES) + mavenBom(SpringBootPlugin.BOM_COORDINATES) } } diff --git a/sentry-samples/sentry-samples-spring/build.gradle.kts b/sentry-samples/sentry-samples-spring/build.gradle.kts index 85f6e8f4eaa..5f257a1ee5f 100644 --- a/sentry-samples/sentry-samples-spring/build.gradle.kts +++ b/sentry-samples/sentry-samples-spring/build.gradle.kts @@ -2,8 +2,8 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id(Config.BuildPlugins.springBoot) version Config.springBootVersion apply false - id(Config.BuildPlugins.springDependencyManagement) version Config.BuildPlugins.springDependencyManagementVersion + alias(libs.plugins.spring.boot.two) apply false + alias(libs.plugins.spring.dependency.management) kotlin("jvm") alias(libs.plugins.kotlin.spring) id("war") diff --git a/sentry-spring-boot-jakarta/build.gradle.kts b/sentry-spring-boot-jakarta/build.gradle.kts index b1634ca38c5..9f43c1f67cc 100644 --- a/sentry-spring-boot-jakarta/build.gradle.kts +++ b/sentry-spring-boot-jakarta/build.gradle.kts @@ -9,7 +9,7 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id(Config.BuildPlugins.springBoot) version Config.springBoot3Version apply false + alias(libs.plugins.spring.boot.three) } configure { diff --git a/sentry-spring-boot-starter-jakarta/build.gradle.kts b/sentry-spring-boot-starter-jakarta/build.gradle.kts index ad67907f1e2..b420a35f4cc 100644 --- a/sentry-spring-boot-starter-jakarta/build.gradle.kts +++ b/sentry-spring-boot-starter-jakarta/build.gradle.kts @@ -8,7 +8,7 @@ plugins { jacoco alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) - id(Config.BuildPlugins.springBoot) version Config.springBoot3Version apply false + alias(libs.plugins.spring.boot.three) apply false } configure { diff --git a/sentry-spring-boot-starter/build.gradle.kts b/sentry-spring-boot-starter/build.gradle.kts index 0dd9d26014e..ca044221cd2 100644 --- a/sentry-spring-boot-starter/build.gradle.kts +++ b/sentry-spring-boot-starter/build.gradle.kts @@ -8,7 +8,7 @@ plugins { jacoco alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) - id(Config.BuildPlugins.springBoot) version Config.springBootVersion apply false + alias(libs.plugins.spring.boot.two) apply false } tasks.withType().configureEach { diff --git a/sentry-spring-boot/build.gradle.kts b/sentry-spring-boot/build.gradle.kts index 56920c5bb86..417d4e2b58d 100644 --- a/sentry-spring-boot/build.gradle.kts +++ b/sentry-spring-boot/build.gradle.kts @@ -9,7 +9,7 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id(Config.BuildPlugins.springBoot) version Config.springBootVersion apply false + alias(libs.plugins.spring.boot.two) apply false } tasks.withType().configureEach { diff --git a/sentry-spring-jakarta/build.gradle.kts b/sentry-spring-jakarta/build.gradle.kts index 770f4de3761..2b11ef82d5c 100644 --- a/sentry-spring-jakarta/build.gradle.kts +++ b/sentry-spring-jakarta/build.gradle.kts @@ -10,7 +10,7 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id(Config.BuildPlugins.springBoot) version Config.springBoot3Version apply false + alias(libs.plugins.spring.boot.three) apply false } configure { diff --git a/sentry-spring/build.gradle.kts b/sentry-spring/build.gradle.kts index b1aea772be1..6cf8598481a 100644 --- a/sentry-spring/build.gradle.kts +++ b/sentry-spring/build.gradle.kts @@ -10,7 +10,7 @@ plugins { alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) alias(libs.plugins.buildconfig) - id(Config.BuildPlugins.springBoot) version Config.springBootVersion apply false + alias(libs.plugins.spring.boot.two) apply false } tasks.withType().configureEach {