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

Replace the string coordinates and the Config.Libs constants with catalog entries. Both stay versionless: Spring BOMs manage aspectjweaver and the Kotlin plugin manages kotlin-reflect.

sentry-apollo-4 pinned kotlin-reflect to 2.0.0 in tests, but mockito-kotlin already pulled in 2.1.20, so the pin had no effect. It now resolves to 2.3.21, the same version as stdlib.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Author: runningcode

buildSrc/src/main/java/Config.kt

@@ -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"
     }
 

gradle/libs.versions.toml

@@ -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" }
@@ -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" }

sentry-apollo-4/build.gradle.kts

@@ -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 {

sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts

@@ -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")

sentry-samples/sentry-samples-spring-7/build.gradle.kts

@@ -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")

sentry-samples/sentry-samples-spring-boot-4-log4j2/build.gradle.kts

@@ -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")

sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts

@@ -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")

sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts

@@ -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")

sentry-samples/sentry-samples-spring-boot-4-otlp/build.gradle.kts

@@ -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")

sentry-samples/sentry-samples-spring-boot-4-webflux/build.gradle.kts

@@ -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")