Move more dependencies to version catalog

Author: rbro112

buildSrc/src/main/java/Config.kt

@@ -23,25 +23,6 @@ object Config {
     }
 
     object Libs {
-        val okHttpVersion = "4.9.2"
-        val timber = "com.jakewharton.timber:timber:4.7.1"
-        val okhttp = "com.squareup.okhttp3:okhttp:$okHttpVersion"
-        val leakCanary = "com.squareup.leakcanary:leakcanary-android:2.14"
-
-        val slf4jApi = "org.slf4j:slf4j-api:1.7.30"
-        val slf4jApi2 = "org.slf4j:slf4j-api:2.0.5"
-        val slf4jJdk14 = "org.slf4j:slf4j-jdk14:1.7.30"
-        val logbackVersion = "1.2.9"
-        val logbackClassic = "ch.qos.logback:logback-classic:$logbackVersion"
-        val logbackCore = "ch.qos.logback:logback-core:$logbackVersion"
-
-        val log4j2Version = "2.20.0"
-        val log4j2Api = "org.apache.logging.log4j:log4j-api:$log4j2Version"
-        val log4j2Core = "org.apache.logging.log4j:log4j-core:$log4j2Version"
-
-        val jacksonDatabind = "com.fasterxml.jackson.core:jackson-databind:2.18.3"
-        val jacksonKotlin = "com.fasterxml.jackson.module:jackson-module-kotlin:2.18.3"
-
         val springWeb = "org.springframework:spring-webmvc"
         val springWebflux = "org.springframework:spring-webflux"
         val springSecurityWeb = "org.springframework.security:spring-security-web"
@@ -53,15 +34,6 @@ object Config {
 
         val apacheHttpClient = "org.apache.httpcomponents.client5:httpclient5:5.0.4"
 
-        private val retrofit2Version = "2.9.0"
-        private val retrofit2Group = "com.squareup.retrofit2"
-        val retrofit2 = "$retrofit2Group:retrofit:$retrofit2Version"
-        val retrofit2Gson = "$retrofit2Group:converter-gson:$retrofit2Version"
-
-        val coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1"
-
-        val coroutinesAndroid = "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1"
-
         val reactorCore = "io.projectreactor:reactor-core:3.5.3"
         val contextPropagation = "io.micrometer:context-propagation:1.1.0"
 

gradle/libs.versions.toml

@@ -3,9 +3,13 @@ androidxLifecycle = "2.2.0"
 androidxNavigation = "2.4.2"
 androidxTestCore = "1.6.1"
 androidxCompose = "1.6.3"
-jetbrainsCompose = "1.6.11"
+coroutines = "1.6.1"
 espresso = "3.5.0"
+jackson = "2.18.3"
+jetbrainsCompose = "1.6.11"
 kotlin = "1.9.24"
+logback = "1.2.9"
+log4j2 = "2.20.0"
 nopen = "1.0.1"
 # 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
@@ -15,6 +19,8 @@ otelInstrumentation = "2.10.0"
 otelInstrumentationAlpha = "2.10.0-alpha"
 # check https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/dependencyManagement/build.gradle.kts#L49 for release version above to find a compatible version
 otelSemanticConventions = "1.28.0-alpha"
+retrofit = "2.9.0"
+slf4j = "1.7.30"
 springboot2 = "2.7.18"
 springboot3 = "3.5.0"
 targetSdk = "34"
@@ -64,11 +70,20 @@ androidx-sqlite = { module = "androidx.sqlite:sqlite", version = "2.3.1" }
 androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.2.1" }
 coil-compose = { module = "io.coil-kt:coil-compose", version = "2.6.0" }
 errorprone-core = { module = "com.google.errorprone:error_prone_core", version = "2.11.0" }
-jetbrains-annotations = { module = "org.jetbrains:annotations", version = "23.0.0"}
+jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
+jackson-kotlin = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
+jetbrains-annotations = { module = "org.jetbrains:annotations", version = "23.0.0" }
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
-nopen-annotations = { module = "com.jakewharton.nopen:nopen-annotations", version.ref = "nopen"}
-nopen-checker = { module = "com.jakewharton.nopen:nopen-checker", version.ref = "nopen"}
+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" }
+log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j2" }
+log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j2" }
+leakcanary = { module = "com.squareup.leakcanary:leakcanary-android", version = "2.14" }
+logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
+nopen-annotations = { module = "com.jakewharton.nopen:nopen-annotations", version.ref = "nopen" }
+nopen-checker = { module = "com.jakewharton.nopen:nopen-checker", version.ref = "nopen" }
 nullaway = { module = "com.uber.nullaway:nullaway", version = "0.9.5" }
+okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 otel = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "otel" }
 otel-extension-autoconfigure = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", version.ref = "otel" }
 otel-extension-autoconfigure-spi = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi", version.ref = "otel" }
@@ -78,6 +93,11 @@ otel-javaagent-tooling = { module = "io.opentelemetry.javaagent:opentelemetry-ja
 otel-javaagent-extension-api = { module = "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api", version.ref = "otelInstrumentationAlpha" }
 otel-semconv = { module = "io.opentelemetry.semconv:opentelemetry-semconv", version.ref = "otelSemanticConventions" }
 otel-semconv-incubating = { module = "io.opentelemetry.semconv:opentelemetry-semconv-incubating", version.ref = "otelSemanticConventions" }
+retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
+retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
+slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
+slf4j-jdk14 = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" }
+slf4j2-api = { module = "org.slf4j:slf4j-api", version = "2.0.5" }
 springboot-starter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "springboot2" }
 springboot-starter-graphql = { module = "org.springframework.boot:spring-boot-starter-graphql", version.ref = "springboot2" }
 springboot-starter-quartz = { module = "org.springframework.boot:spring-boot-starter-quartz", version.ref = "springboot2" }
@@ -101,6 +121,7 @@ springboot3-starter-aop = { module = "org.springframework.boot:spring-boot-start
 springboot3-starter-security = { module = "org.springframework.boot:spring-boot-starter-security", version.ref = "springboot3" }
 springboot3-starter-jdbc = { module = "org.springframework.boot:spring-boot-starter-jdbc", version.ref = "springboot3" }
 springboot3-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator", version.ref = "springboot3" }
+timber = { module = "com.jakewharton.timber:timber", version = "4.7.1" }
 
 # test libraries
 androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version = "1.6.8" }
@@ -116,7 +137,7 @@ awaitility-kotlin = { module = "org.awaitility:awaitility-kotlin", version = "4.
 awaitility3-kotlin = { module = "org.awaitility:awaitility-kotlin", version = "3.1.6" }
 hsqldb = { module = "org.hsqldb:hsqldb", version = "2.6.1" }
 javafaker = { module = "com.github.javafaker:javafaker", version = "1.0.2" }
-kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.6.1" }
+kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 leakcanary-instrumentation = { module = "com.squareup.leakcanary:leakcanary-android-instrumentation", version = "2.14" }
 mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version = "4.1.0" }
 mockito-inline = { module = "org.mockito:mockito-inline", version = "4.8.0" }

sentry-android-core/build.gradle.kts

@@ -112,5 +112,5 @@ dependencies {
     testImplementation(projects.sentryAndroidNdk)
     testRuntimeOnly(libs.androidx.compose.ui)
     testRuntimeOnly(libs.androidx.fragment.ktx)
-    testRuntimeOnly(Config.Libs.timber)
+    testRuntimeOnly(libs.timber)
 }

sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts

@@ -108,7 +108,7 @@ dependencies {
     implementation(libs.androidx.core)
     implementation(libs.androidx.recyclerview)
     implementation(libs.androidx.test.espresso.idling.resource)
-    implementation(Config.Libs.leakCanary)
+    implementation(libs.leakcanary)
 
     compileOnly(libs.nopen.annotations)
 

sentry-android-timber/build.gradle.kts

@@ -70,12 +70,12 @@ kotlin {
 dependencies {
     api(projects.sentry)
 
-    compileOnly(Config.Libs.timber)
+    compileOnly(libs.timber)
 
     implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
 
     // tests
-    testImplementation(Config.Libs.timber)
+    testImplementation(libs.timber)
     testImplementation(libs.kotlin.test.junit)
     testImplementation(libs.androidx.test.ext.junit)
     testImplementation(libs.mockito.kotlin)

sentry-apollo-3/build.gradle.kts

@@ -29,9 +29,9 @@ dependencies {
 
     // tests
     testImplementation(projects.sentryTestSupport)
-    testImplementation(Config.Libs.coroutinesCore)
     testImplementation(kotlin(Config.kotlinStdLib))
     testImplementation(libs.kotlin.test.junit)
+    testImplementation(libs.kotlinx.coroutines)
     testImplementation(libs.mockito.kotlin)
     testImplementation(libs.mockito.inline)
     testImplementation(libs.okhttp.mockwebserver)

sentry-apollo-4/build.gradle.kts

@@ -34,9 +34,9 @@ dependencies {
 
     // tests
     testImplementation(projects.sentryTestSupport)
-    testImplementation(Config.Libs.coroutinesCore)
     testImplementation(kotlin(Config.kotlinStdLib))
     testImplementation(libs.kotlin.test.junit)
+    testImplementation(libs.kotlinx.coroutines)
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.mockito.kotlin)
     testImplementation(libs.mockito.inline)

sentry-apollo/build.gradle.kts

@@ -28,9 +28,9 @@ dependencies {
 
     // tests
     testImplementation(projects.sentryTestSupport)
-    testImplementation(Config.Libs.coroutinesCore)
     testImplementation(kotlin(Config.kotlinStdLib))
     testImplementation(libs.kotlin.test.junit)
+    testImplementation(libs.kotlinx.coroutines)
     testImplementation(libs.mockito.kotlin)
     testImplementation(libs.mockito.inline)
     testImplementation(libs.okhttp.mockwebserver)

sentry-graphql-22/build.gradle.kts

@@ -33,9 +33,9 @@ dependencies {
     testImplementation(libs.kotlin.test.junit)
     testImplementation(libs.mockito.kotlin)
     testImplementation(libs.mockito.inline)
+    testImplementation(libs.okhttp)
     testImplementation(libs.okhttp.mockwebserver)
     testImplementation(libs.springboot.starter.graphql)
-    testImplementation(Config.Libs.okhttp)
     testImplementation("com.netflix.graphql.dgs:graphql-error-types:4.9.2")
     testImplementation(Config.Libs.graphQlJava22)
 }

sentry-graphql-core/build.gradle.kts

@@ -32,9 +32,9 @@ dependencies {
     testImplementation(libs.kotlin.test.junit)
     testImplementation(libs.mockito.kotlin)
     testImplementation(libs.mockito.inline)
+    testImplementation(libs.okhttp)
     testImplementation(libs.okhttp.mockwebserver)
     testImplementation(libs.springboot.starter.graphql)
-    testImplementation(Config.Libs.okhttp)
     testImplementation("com.netflix.graphql.dgs:graphql-error-types:4.9.2")
     testImplementation(Config.Libs.graphQlJava)
 }

sentry-graphql/build.gradle.kts

@@ -33,9 +33,9 @@ dependencies {
     testImplementation(libs.kotlin.test.junit)
     testImplementation(libs.mockito.kotlin)
     testImplementation(libs.mockito.inline)
+    testImplementation(libs.okhttp)
     testImplementation(libs.okhttp.mockwebserver)
     testImplementation(libs.springboot.starter.graphql)
-    testImplementation(Config.Libs.okhttp)
     testImplementation("com.netflix.graphql.dgs:graphql-error-types:4.9.2")
     testImplementation(Config.Libs.graphQlJava)
 }

sentry-jul/build.gradle.kts

@@ -16,7 +16,7 @@ tasks.withType<KotlinCompile>().configureEach {
 
 dependencies {
     api(projects.sentry)
-    compileOnly(Config.Libs.slf4jApi)
+    compileOnly(libs.slf4j.api)
 
     compileOnly(libs.jetbrains.annotations)
     compileOnly(libs.nopen.annotations)
@@ -28,9 +28,9 @@ dependencies {
     testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
     testImplementation(libs.kotlin.test.junit)
+    testImplementation(libs.logback.classic)
     testImplementation(libs.mockito.kotlin)
-    testImplementation(Config.Libs.logbackClassic)
-    testImplementation(Config.Libs.slf4jApi)
+    testImplementation(libs.slf4j.api)
 }
 
 configure<SourceSetContainer> {

sentry-kotlin-extensions/build.gradle.kts

@@ -17,8 +17,7 @@ tasks.withType<KotlinCompile>().configureEach {
 
 dependencies {
     api(projects.sentry)
-    compileOnly(Config.Libs.coroutinesCore)
-
+    compileOnly(libs.kotlinx.coroutines)
     compileOnly(libs.jetbrains.annotations)
     compileOnly(libs.nopen.annotations)
     errorprone(libs.errorprone.core)
@@ -28,9 +27,9 @@ dependencies {
     testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
     testImplementation(libs.kotlin.test.junit)
+    testImplementation(libs.kotlinx.coroutines)
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.mockito.kotlin)
-    testImplementation(Config.Libs.coroutinesCore)
 }
 
 configure<SourceSetContainer> {

sentry-log4j2/build.gradle.kts

@@ -16,9 +16,9 @@ tasks.withType<KotlinCompile>().configureEach {
 
 dependencies {
     api(projects.sentry)
-    compileOnly(Config.Libs.log4j2Api)
-    compileOnly(Config.Libs.log4j2Core)
-    annotationProcessor(Config.Libs.log4j2Core)
+    compileOnly(libs.log4j.api)
+    compileOnly(libs.log4j.core)
+    annotationProcessor(libs.log4j.core)
 
     compileOnly(libs.jetbrains.annotations)
     compileOnly(libs.nopen.annotations)
@@ -30,9 +30,9 @@ dependencies {
     testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
     testImplementation(libs.kotlin.test.junit)
+    testImplementation(libs.log4j.api)
+    testImplementation(libs.log4j.core)
     testImplementation(libs.mockito.kotlin)
-    testImplementation(Config.Libs.log4j2Api)
-    testImplementation(Config.Libs.log4j2Core)
 }
 
 configure<SourceSetContainer> {

sentry-logback/build.gradle.kts

@@ -16,7 +16,7 @@ tasks.withType<KotlinCompile>().configureEach {
 
 dependencies {
     api(projects.sentry)
-    compileOnly(Config.Libs.logbackClassic)
+    compileOnly(libs.logback.classic)
 
     compileOnly(libs.jetbrains.annotations)
     compileOnly(libs.nopen.annotations)
@@ -28,8 +28,8 @@ dependencies {
     testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
     testImplementation(libs.kotlin.test.junit)
+    testImplementation(libs.logback.classic)
     testImplementation(libs.mockito.kotlin)
-    testImplementation(Config.Libs.logbackClassic)
 }
 
 configure<SourceSetContainer> {

sentry-okhttp/build.gradle.kts

@@ -22,22 +22,22 @@ kotlin {
 dependencies {
     api(projects.sentry)
 
-    compileOnly(Config.Libs.okhttp)
 
     implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
 
     compileOnly(libs.jetbrains.annotations)
     compileOnly(libs.nopen.annotations)
+    compileOnly(libs.okhttp)
     errorprone(libs.errorprone.core)
     errorprone(libs.nopen.checker)
     errorprone(libs.nullaway)
 
     // tests
     testImplementation(projects.sentryTestSupport)
-    testImplementation(Config.Libs.okhttp)
     testImplementation(libs.kotlin.test.junit)
     testImplementation(libs.mockito.kotlin)
     testImplementation(libs.mockito.inline)
+    testImplementation(libs.okhttp)
     testImplementation(libs.okhttp.mockwebserver)
 }
 

sentry-samples/sentry-samples-android/build.gradle.kts

@@ -147,7 +147,6 @@ dependencies {
     implementation(projects.sentryCompose)
     implementation(projects.sentryKotlinExtensions)
     implementation(projects.sentryOkhttp)
-    implementation(Config.Libs.timber)
 
 //    how to exclude androidx if release health feature is disabled
 //    implementation(projects.sentryAndroid) {
@@ -156,9 +155,6 @@ dependencies {
 //        exclude(group = "androidx.core", module = "core")
 //    }
 
-    implementation(Config.Libs.coroutinesAndroid)
-    implementation(Config.Libs.retrofit2)
-    implementation(Config.Libs.retrofit2Gson)
     implementation(Config.Libs.sentryNativeNdk)
 
     implementation(libs.androidx.activity.compose)
@@ -170,8 +166,12 @@ dependencies {
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.recyclerview)
     implementation(libs.coil.compose)
+    implementation(libs.kotlinx.coroutines.android)
+    implementation(libs.retrofit)
+    implementation(libs.retrofit.gson)
+    implementation(libs.timber)
 
-    debugImplementation(Config.Libs.leakCanary)
+    debugImplementation(libs.leakcanary)
 }
 
 abstract class ToggleNativeLoggingTask : Exec() {

sentry-samples/sentry-samples-jul/build.gradle.kts

@@ -17,5 +17,5 @@ configure<JavaPluginExtension> {
 
 dependencies {
     implementation(projects.sentryJul)
-    implementation(Config.Libs.slf4jJdk14)
+    implementation(libs.slf4j.jdk14)
 }

sentry-samples/sentry-samples-log4j2/build.gradle.kts

@@ -15,5 +15,5 @@ configure<JavaPluginExtension> {
 
 dependencies {
     implementation(projects.sentryLog4j2)
-    implementation(Config.Libs.log4j2Api)
+    implementation(libs.log4j.api)
 }

sentry-samples/sentry-samples-logback/build.gradle.kts

@@ -15,5 +15,5 @@ configure<JavaPluginExtension> {
 
 dependencies {
     implementation(projects.sentryLogback)
-    implementation(Config.Libs.logbackClassic)
+    implementation(libs.logback.classic)
 }

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

@@ -54,15 +54,15 @@ dependencies {
     implementation(projects.sentryJdbc)
     runtimeOnly(libs.hsqldb)
 
+    testImplementation(kotlin(Config.kotlinStdLib))
     testImplementation(projects.sentrySystemTestSupport)
+    testImplementation(libs.kotlin.test.junit)
+    testImplementation(libs.slf4j2.api)
     testImplementation(libs.springboot3.starter.test) {
         exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
     }
-    testImplementation(kotlin(Config.kotlinStdLib))
-    testImplementation(libs.kotlin.test.junit)
     testImplementation("ch.qos.logback:logback-classic:1.5.16")
     testImplementation("ch.qos.logback:logback-core:1.5.16")
-    testImplementation(Config.Libs.slf4jApi2)
     testImplementation(Config.Libs.apolloKotlin)
 }