Skip to content

Migrate Spring Plugins to Version Catalog #4421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
runningcode merged 1 commit into from
May 20, 2025
Merged

Migrate Spring Plugins to Version Catalog #4421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 0 additions & 3 deletions buildSrc/src/main/java/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -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" }
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
6 changes: 3 additions & 3 deletions sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -23,7 +23,7 @@ repositories {

dependencyManagement {
imports {
mavenBom(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)
mavenBom(SpringBootPlugin.BOM_COORDINATES)
}
}

Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion sentry-spring-boot-jakarta/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<JavaPluginExtension> {
Expand Down
2 changes: 1 addition & 1 deletion sentry-spring-boot-starter-jakarta/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<JavaPluginExtension> {
Expand Down
2 changes: 1 addition & 1 deletion sentry-spring-boot-starter/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<KotlinCompile>().configureEach {
Expand Down
2 changes: 1 addition & 1 deletion sentry-spring-boot/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<KotlinCompile>().configureEach {
Expand Down
2 changes: 1 addition & 1 deletion sentry-spring-jakarta/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<JavaPluginExtension> {
Expand Down
2 changes: 1 addition & 1 deletion sentry-spring/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<KotlinCompile>().configureEach {
Expand Down
Loading