Skip to content

build: Move aspectjweaver and kotlin-reflect to the version catalog #6514

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
Nov 9, 2026
Merged

build: Move aspectjweaver and kotlin-reflect to the version catalog #6514

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
2 changes: 0 additions & 2 deletions buildSrc/src/main/java/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ object Config {
val springSecurityWeb = "org.springframework.security:spring-security-web"
val springSecurityConfig = "org.springframework.security:spring-security-config"
val springAop = "org.springframework:spring-aop"
val aspectj = "org.aspectj:aspectjweaver"

val kotlinReflect = "org.jetbrains.kotlin:kotlin-reflect"
val kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib"
}

Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ androidx-sqlite-bundled = { module = "androidx.sqlite:sqlite-bundled", version.r
androidx-sqlite-framework = { module = "androidx.sqlite:sqlite-framework", version.ref = "sqliteRc" }
androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.4.0" }
androidx-browser = { module = "androidx.browser:browser", version = "1.10.0" }
aspectjweaver = { module = "org.aspectj:aspectjweaver" }
async-profiler = { module = "tools.profiler:async-profiler", version.ref = "asyncProfiler" }
async-profiler-jfr-converter = { module = "tools.profiler:jfr-converter", version.ref = "asyncProfiler" }
caffeine = { module = "com.github.ben-manes.caffeine:caffeine" }
Expand All @@ -148,6 +149,7 @@ jackson-bom = { module = "com.fasterxml.jackson:jackson-bom", version.ref = "jac
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
jetbrains-annotations = { module = "org.jetbrains:annotations", version = "23.0.0" }
kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect" }
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
Expand Down
2 changes: 1 addition & 1 deletion sentry-apollo-4/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ dependencies {
testImplementation(libs.mockito.kotlin)
testImplementation(libs.mockito.core)
testImplementation(libs.okhttp.mockwebserver)
testImplementation("org.jetbrains.kotlin:kotlin-reflect:2.0.0")
testImplementation(libs.kotlin.reflect)
}

tasks.withType<JavaCompile>().configureEach {
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -27,7 +27,7 @@ java.targetCompatibility = JavaVersion.VERSION_1_8
dependencies {
implementation(platform(libs.springboot2.bom))
implementation(libs.springboot.starter.web)
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
implementation("io.sentry:sentry-spring-boot-starter:$sentryVersion")
implementation("io.sentry:sentry-graphql:$sentryVersion")
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-7/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ dependencyManagement {
dependencies {
implementation("org.springframework:spring-webmvc")
implementation("org.springframework:spring-aop")
implementation("org.aspectj:aspectjweaver")
implementation(libs.aspectjweaver)
implementation("org.springframework.security:spring-security-web")
implementation("org.springframework.security:spring-security-config")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
implementation("io.sentry:sentry-spring-7:$sentryVersion")
implementation("io.sentry:sentry-logback:$sentryVersion")
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot-4-log4j2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ dependencies {
implementation(libs.springboot4.starter.websocket)
implementation(libs.springboot4.starter.restclient)
implementation(libs.springboot4.starter.webclient)
implementation("org.aspectj:aspectjweaver")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.aspectjweaver)
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
implementation("io.sentry:sentry-spring-boot-4-starter:$sentryVersion")
implementation("io.sentry:sentry-graphql-22:$sentryVersion")
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ dependencies {
implementation(libs.springboot4.starter.websocket)
implementation(libs.springboot4.starter.webclient)
implementation(libs.springboot4.starter.restclient)
implementation("org.aspectj:aspectjweaver")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.aspectjweaver)
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
implementation("io.sentry:sentry-spring-boot-4-starter:$sentryVersion")
implementation("io.sentry:sentry-logback:$sentryVersion")
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ dependencies {
implementation(libs.springboot4.starter.websocket)
implementation(libs.springboot4.starter.webclient)
implementation(libs.springboot4.starter.restclient)
implementation("org.aspectj:aspectjweaver")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.aspectjweaver)
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
implementation("io.sentry:sentry-spring-boot-4-starter:$sentryVersion")
implementation("io.sentry:sentry-logback:$sentryVersion")
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot-4-otlp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ dependencies {
implementation(libs.springboot4.starter.websocket)
implementation(libs.springboot4.starter.restclient)
implementation(libs.springboot4.starter.webclient)
implementation("org.aspectj:aspectjweaver")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.aspectjweaver)
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
implementation("io.sentry:sentry-spring-boot-4-starter:$sentryVersion")
implementation("io.sentry:sentry-logback:$sentryVersion")
Expand Down
2 changes: 1 addition & 1 deletion sentry-samples/sentry-samples-spring-boot-4-webflux/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ group = "io.sentry.sample.spring-boot-4-webflux"
version = "0.0.1-SNAPSHOT"

dependencies {
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
implementation("io.sentry:sentry-spring-boot-4-starter:$sentryVersion")
implementation("io.sentry:sentry-logback:$sentryVersion")
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ dependencies {
implementation(libs.springboot4.starter.websocket)
implementation(libs.springboot4.starter.restclient)
implementation(libs.springboot4.starter.webclient)
implementation("org.aspectj:aspectjweaver")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.aspectjweaver)
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
implementation("io.sentry:sentry-spring-boot-4-starter:$sentryVersion")
implementation("io.sentry:sentry-logback:$sentryVersion")
Expand Down
4 changes: 2 additions & 2 deletions sentry-samples/sentry-samples-spring-boot-jakarta-log4j2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ dependencies {
implementation(libs.springboot3.starter.web)
implementation(libs.springboot3.starter.webflux)
implementation(libs.springboot3.starter.websocket)
implementation("org.aspectj:aspectjweaver")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.aspectjweaver)
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
implementation("io.sentry:sentry-spring-boot-starter-jakarta:$sentryVersion")
implementation("io.sentry:sentry-log4j2:$sentryVersion")
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 @@ -43,8 +43,8 @@ dependencies {
implementation(libs.springboot3.starter.web)
implementation(libs.springboot3.starter.webflux)
implementation(libs.springboot3.starter.websocket)
implementation("org.aspectj:aspectjweaver")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.aspectjweaver)
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
implementation("io.sentry:sentry-spring-boot-starter-jakarta:$sentryVersion")
implementation("io.sentry:sentry-logback:$sentryVersion")
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 @@ -43,8 +43,8 @@ dependencies {
implementation(libs.springboot3.starter.web)
implementation(libs.springboot3.starter.webflux)
implementation(libs.springboot3.starter.websocket)
implementation("org.aspectj:aspectjweaver")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.aspectjweaver)
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
implementation("io.sentry:sentry-spring-boot-starter-jakarta:$sentryVersion")
implementation("io.sentry:sentry-logback:$sentryVersion")
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 @@ -42,8 +42,8 @@ dependencies {
implementation(libs.springboot3.starter.web)
implementation(libs.springboot3.starter.webflux)
implementation(libs.springboot3.starter.websocket)
implementation("org.aspectj:aspectjweaver")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.aspectjweaver)
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
implementation("io.sentry:sentry-spring-boot-starter-jakarta:$sentryVersion")
implementation("io.sentry:sentry-logback:$sentryVersion")
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 @@ -49,8 +49,8 @@ dependencies {
implementation(libs.springboot.starter.web)
implementation(libs.springboot.starter.webflux)
implementation(libs.springboot.starter.websocket)
implementation("org.aspectj:aspectjweaver")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.aspectjweaver)
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
implementation("io.sentry:sentry-spring-boot-starter:$sentryVersion")
implementation("io.sentry:sentry-logback:$sentryVersion")
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 @@ -48,8 +48,8 @@ dependencies {
implementation(libs.springboot.starter.web)
implementation(libs.springboot.starter.webflux)
implementation(libs.springboot.starter.websocket)
implementation("org.aspectj:aspectjweaver")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.aspectjweaver)
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
implementation("io.sentry:sentry-spring-boot-starter:$sentryVersion")
implementation("io.sentry:sentry-logback:$sentryVersion")
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -26,7 +26,7 @@ dependencyManagement {
extra["kotlin-coroutines.version"] = "1.9.0"

dependencies {
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
implementation("io.sentry:sentry-spring-boot-starter-jakarta:$sentryVersion")
implementation("io.sentry:sentry-logback:$sentryVersion")
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -35,7 +35,7 @@ dependencies {
implementation(libs.springboot.starter.actuator)
implementation(libs.springboot.starter.graphql)
implementation(libs.springboot.starter.webflux)
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
implementation("io.sentry:sentry-spring-boot-starter:$sentryVersion")
implementation("io.sentry:sentry-logback:$sentryVersion")
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 @@ -53,8 +53,8 @@ dependencies {

implementation(libs.spring.kafka2)
implementation("io.sentry:sentry-kafka:$sentryVersion")
implementation("org.aspectj:aspectjweaver")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.aspectjweaver)
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
implementation("io.sentry:sentry-spring-boot-starter:$sentryVersion")
implementation("io.sentry:sentry-logback:$sentryVersion")
Expand Down
4 changes: 2 additions & 2 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 @@ -33,10 +33,10 @@ dependencyManagement {
dependencies {
implementation("org.springframework:spring-webmvc")
implementation("org.springframework:spring-aop")
implementation("org.aspectj:aspectjweaver")
implementation(libs.aspectjweaver)
implementation("org.springframework.security:spring-security-web")
implementation("org.springframework.security:spring-security-config")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8"))
implementation("io.sentry:sentry-spring-jakarta:$sentryVersion")
implementation("io.sentry:sentry-logback:$sentryVersion")
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 @@ -44,10 +44,10 @@ dependencyManagement {
dependencies {
implementation("org.springframework:spring-webmvc")
implementation("org.springframework:spring-aop")
implementation("org.aspectj:aspectjweaver")
implementation(libs.aspectjweaver)
implementation("org.springframework.security:spring-security-web")
implementation("org.springframework.security:spring-security-config")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation(libs.kotlin.reflect)
implementation(kotlin("stdlib-jdk8"))
implementation("io.sentry:sentry-spring:$sentryVersion")
implementation("io.sentry:sentry-logback:$sentryVersion")
Expand Down
2 changes: 1 addition & 1 deletion sentry-spring-7/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dependencies {
compileOnly(Config.Libs.springWeb)
compileOnly(Config.Libs.springAop)
compileOnly(Config.Libs.springSecurityWeb)
compileOnly(Config.Libs.aspectj)
compileOnly(libs.aspectjweaver)
compileOnly(libs.context.propagation)
compileOnly(libs.jetbrains.annotations)
compileOnly(libs.nopen.annotations)
Expand Down
2 changes: 1 addition & 1 deletion sentry-spring-boot-4/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ dependencies {
testImplementation(projects.sentryReactor)
testImplementation(projects.sentryTestSupport)
testImplementation(kotlin(Config.kotlinStdLib))
testImplementation(Config.Libs.kotlinReflect)
testImplementation(libs.kotlin.reflect)
testImplementation(platform(SpringBootPlugin.BOM_COORDINATES))
testImplementation(libs.context.propagation)
testImplementation(libs.kotlin.test.junit)
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 @@ -37,7 +37,7 @@ dependencies {
compileOnly(Config.Libs.springWeb)
compileOnly(Config.Libs.springAop)
compileOnly(Config.Libs.springSecurityWeb)
compileOnly(Config.Libs.aspectj)
compileOnly(libs.aspectjweaver)
compileOnly(libs.context.propagation)
compileOnly(libs.jetbrains.annotations)
compileOnly(libs.nopen.annotations)
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 @@ -30,7 +30,7 @@ dependencies {
compileOnly(Config.Libs.springWeb)
compileOnly(Config.Libs.springAop)
compileOnly(Config.Libs.springSecurityWeb)
compileOnly(Config.Libs.aspectj)
compileOnly(libs.aspectjweaver)
compileOnly(Config.Libs.springWebflux)
compileOnly(projects.sentryGraphql)
compileOnly(projects.sentryKafka)
Expand Down
Loading