Finish remaining simple migrations to version catalogs

build.gradle.kts

@@ -39,7 +39,7 @@ buildscript {
         // add classpath of sentry android gradle plugin
         // classpath("io.sentry:sentry-android-gradle-plugin:{version}")
 
-        classpath(Config.BuildPlugins.commonsCompressOverride)
+        classpath(libs.commons.compress)
     }
 }
 

buildSrc/src/main/java/Config.kt

@@ -5,13 +5,8 @@ object Config {
     val AGP = System.getenv("VERSION_AGP") ?: "8.6.0"
     val kotlinStdLib = "stdlib-jdk8"
 
-    val kotlinCompatibleLanguageVersion = "1.6"
-
-    val androidComposeCompilerVersion = "1.5.14"
-
     object BuildPlugins {
         val androidGradle = "com.android.tools.build:gradle:$AGP"
-        val commonsCompressOverride = "org.apache.commons:commons-compress:1.25.0"
     }
 
     object Android {
@@ -29,37 +24,9 @@ object Config {
         val springSecurityConfig = "org.springframework.security:spring-security-config"
         val springAop = "org.springframework:spring-aop"
         val aspectj = "org.aspectj:aspectjweaver"
-        val servletApi = "javax.servlet:javax.servlet-api:3.1.0"
-        val servletApiJakarta = "jakarta.servlet:jakarta.servlet-api:5.0.0"
-
-        val apacheHttpClient = "org.apache.httpcomponents.client5:httpclient5:5.0.4"
-
-        val reactorCore = "io.projectreactor:reactor-core:3.5.3"
-        val contextPropagation = "io.micrometer:context-propagation:1.1.0"
-
-        private val feignVersion = "11.6"
-        val feignCore = "io.github.openfeign:feign-core:$feignVersion"
-        val feignGson = "io.github.openfeign:feign-gson:$feignVersion"
-
-        private val apolloVersion = "2.5.9"
-        val apolloAndroid = "com.apollographql.apollo:apollo-runtime:$apolloVersion"
-        val apolloCoroutines = "com.apollographql.apollo:apollo-coroutines-support:$apolloVersion"
-
-        val p6spy = "p6spy:p6spy:3.9.1"
-
-        val graphQlJava = "com.graphql-java:graphql-java:17.3"
-        val graphQlJava22 = "com.graphql-java:graphql-java:22.1"
-        val graphQlJavaNew = "com.graphql-java:graphql-java:24.0"
-
-        val quartz = "org.quartz-scheduler:quartz:2.3.0"
 
         val kotlinReflect = "org.jetbrains.kotlin:kotlin-reflect"
         val kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib"
-
-        val apolloKotlin = "com.apollographql.apollo3:apollo-runtime:3.8.2"
-        val apolloKotlin4 = "com.apollographql.apollo:apollo-runtime:4.1.1"
-
-        val sentryNativeNdk = "io.sentry:sentry-native-ndk:0.8.4"
     }
 
     object AnnotationProcessors {

gradle/libs.versions.toml

@@ -1,13 +1,18 @@
 [versions]
+apollo = "2.5.9"
 androidxLifecycle = "2.2.0"
 androidxNavigation = "2.4.2"
 androidxTestCore = "1.6.1"
 androidxCompose = "1.6.3"
+composeCompiler = "1.5.14"
 coroutines = "1.6.1"
 espresso = "3.5.0"
+feign = "11.6"
+jacoco = "0.8.7"
 jackson = "2.18.3"
 jetbrainsCompose = "1.6.11"
 kotlin = "1.9.24"
+kotlin-compatible-version = "1.6"
 logback = "1.2.9"
 log4j2 = "2.20.0"
 nopen = "1.0.1"
@@ -23,10 +28,10 @@ retrofit = "2.9.0"
 slf4j = "1.7.30"
 springboot2 = "2.7.18"
 springboot3 = "3.5.0"
+# Android
 targetSdk = "34"
 compileSdk = "34"
 minSdk = "21"
-jacoco = "0.8.7"
 
 [plugins]
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
@@ -49,6 +54,11 @@ spring-dependency-management = { id = "io.spring.dependency-management", version
 gretty = { id = "org.gretty", version = "4.0.0" }
 
 [libraries]
+apache-httpclient = { module = "org.apache.httpcomponents.client5:httpclient5", version = "5.0.4" }
+apollo2-coroutines = { module = "com.apollographql.apollo:apollo-coroutines-support", version.ref = "apollo" }
+apollo2-runtime = { module = "com.apollographql.apollo:apollo-runtime", version.ref = "apollo" }
+apollo3-kotlin = { module = "com.apollographql.apollo3:apollo-runtime", version = "3.8.2" }
+apollo4-kotlin = { module = "com.apollographql.apollo:apollo-runtime", version = "4.1.1" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.3.0" }
 androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.2" }
@@ -69,7 +79,14 @@ androidx-navigation-compose = { module = "androidx.navigation:navigation-compose
 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" }
+commons-compress = {module = "org.apache.commons:commons-compress", version = "1.25.0"}
+context-propagation = { module = "io.micrometer:context-propagation", version = "1.1.0" }
 errorprone-core = { module = "com.google.errorprone:error_prone_core", version = "2.11.0" }
+feign-core = { module = "io.github.openfeign:feign-core", version.ref = "feign" }
+feign-gson = { module = "io.github.openfeign:feign-gson", version.ref = "feign" }
+graphql-java17 = { module = "com.graphql-java:graphql-java", version = "17.3" }
+graphql-java22 = { module = "com.graphql-java:graphql-java", version = "22.1" }
+graphql-java24 = { module = "com.graphql-java:graphql-java", version = "24.0" }
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
 jackson-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
 jetbrains-annotations = { module = "org.jetbrains:annotations", version = "23.0.0" }
@@ -93,8 +110,14 @@ 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" }
+p6spy = { module = "p6spy:p6spy", version = "3.9.1" }
+quartz = { module = "org.quartz-scheduler:quartz", version = "2.3.0" }
+reactor-core = { module = "io.projectreactor:reactor-core", version = "3.5.3" }
 retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
+sentry-native-ndk = { module = "io.sentry:sentry-native-ndk", version = "0.8.4" }
+servlet-api = { module = "javax.servlet:javax.servlet-api", version = "3.1.0" }
+servlet-jakarta-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "5.0.0" }
 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" }

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

@@ -40,7 +40,7 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = Config.androidComposeCompilerVersion
+        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
     }
     androidComponents.beforeVariants {
         it.enable = !Config.Android.shouldSkipDebugVariant(it.buildType)

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

@@ -42,7 +42,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = Config.androidComposeCompilerVersion
+        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
     }
 
     signingConfigs {

sentry-android-navigation/build.gradle.kts

@@ -31,7 +31,7 @@ android {
 
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
-        kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
+        kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get()
     }
 
     testOptions {

sentry-android-ndk/build.gradle.kts

@@ -83,10 +83,10 @@ dependencies {
     api(projects.sentry)
     api(projects.sentryAndroidCore)
 
-    implementation(Config.Libs.sentryNativeNdk)
-
     compileOnly(libs.jetbrains.annotations)
 
+    implementation(libs.sentry.native.ndk)
+
     testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
     testImplementation(libs.kotlin.test.junit)
     testImplementation(libs.mockito.kotlin)

sentry-android-replay/build.gradle.kts

@@ -30,7 +30,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = Config.androidComposeCompilerVersion
+        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
         useLiveLiterals = false
     }
 
@@ -45,7 +45,7 @@ android {
 
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
-        kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
+        kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get()
     }
 
     testOptions {

sentry-android-sqlite/build.gradle.kts

@@ -32,7 +32,7 @@ android {
 
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
-        kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
+        kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get()
     }
 
     testOptions {

sentry-android-timber/build.gradle.kts

@@ -35,7 +35,7 @@ android {
 
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
-        kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
+        kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get()
     }
 
     testOptions {

sentry-apache-http-client-5/build.gradle.kts

@@ -12,12 +12,12 @@ plugins {
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
-    kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
+    kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get()
 }
 
 dependencies {
     api(projects.sentry)
-    api(Config.Libs.apacheHttpClient)
+    api(libs.apache.httpclient)
 
     compileOnly(libs.jetbrains.annotations)
     compileOnly(libs.nopen.annotations)
@@ -26,7 +26,7 @@ dependencies {
     errorprone(libs.nullaway)
 
     // tests
-    testImplementation(Config.Libs.apacheHttpClient)
+    testImplementation(libs.apache.httpclient)
     testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
     testImplementation(libs.kotlin.test.junit)

sentry-apollo-3/build.gradle.kts

@@ -12,15 +12,14 @@ plugins {
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
-    kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
+    kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get()
 }
 
 dependencies {
     api(projects.sentry)
     api(projects.sentryKotlinExtensions)
 
-    compileOnly(Config.Libs.apolloKotlin)
-
+    compileOnly(libs.apollo3.kotlin)
     compileOnly(libs.jetbrains.annotations)
     compileOnly(libs.nopen.annotations)
     errorprone(libs.errorprone.core)
@@ -30,12 +29,12 @@ dependencies {
     // tests
     testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
+    testImplementation(libs.apollo3.kotlin)
     testImplementation(libs.kotlin.test.junit)
     testImplementation(libs.kotlinx.coroutines)
     testImplementation(libs.mockito.kotlin)
     testImplementation(libs.mockito.inline)
     testImplementation(libs.okhttp.mockwebserver)
-    testImplementation(Config.Libs.apolloKotlin)
 }
 
 configure<SourceSetContainer> {

sentry-apollo-4/build.gradle.kts

@@ -17,15 +17,14 @@ configure<JavaPluginExtension> {
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
-    kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
+    kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get()
 }
 
 dependencies {
     api(projects.sentry)
     api(projects.sentryKotlinExtensions)
 
-    compileOnly(Config.Libs.apolloKotlin4)
-
+    compileOnly(libs.apollo4.kotlin)
     compileOnly(libs.jetbrains.annotations)
     compileOnly(libs.nopen.annotations)
     errorprone(libs.errorprone.core)
@@ -35,13 +34,13 @@ dependencies {
     // tests
     testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
+    testImplementation(libs.apollo4.kotlin)
     testImplementation(libs.kotlin.test.junit)
     testImplementation(libs.kotlinx.coroutines)
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.mockito.kotlin)
     testImplementation(libs.mockito.inline)
     testImplementation(libs.okhttp.mockwebserver)
-    testImplementation(Config.Libs.apolloKotlin4)
     testImplementation("org.jetbrains.kotlin:kotlin-reflect:2.0.0")
 }
 

sentry-apollo/build.gradle.kts

@@ -12,14 +12,14 @@ plugins {
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
-    kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
+    kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get()
 }
 
 dependencies {
     api(projects.sentry)
     api(projects.sentryKotlinExtensions)
 
-    compileOnly(Config.Libs.apolloAndroid)
+    compileOnly(libs.apollo2.runtime)
     compileOnly(libs.jetbrains.annotations)
     compileOnly(libs.nopen.annotations)
     errorprone(libs.errorprone.core)
@@ -29,13 +29,13 @@ dependencies {
     // tests
     testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
+    testImplementation(libs.apollo2.coroutines)
+    testImplementation(libs.apollo2.runtime)
     testImplementation(libs.kotlin.test.junit)
     testImplementation(libs.kotlinx.coroutines)
     testImplementation(libs.mockito.kotlin)
     testImplementation(libs.mockito.inline)
     testImplementation(libs.okhttp.mockwebserver)
-    testImplementation(Config.Libs.apolloCoroutines)
-    testImplementation(Config.Libs.apolloAndroid)
 }
 
 configure<SourceSetContainer> {

sentry-graphql-22/build.gradle.kts

@@ -12,13 +12,13 @@ plugins {
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
-    kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
+    kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get()
 }
 
 dependencies {
     api(projects.sentry)
     api(projects.sentryGraphqlCore)
-    compileOnly(Config.Libs.graphQlJava22)
+    compileOnly(libs.graphql.java22)
 
     compileOnly(libs.jetbrains.annotations)
     compileOnly(libs.nopen.annotations)
@@ -30,14 +30,14 @@ dependencies {
     testImplementation(projects.sentry)
     testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
+    testImplementation(libs.graphql.java22)
     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("com.netflix.graphql.dgs:graphql-error-types:4.9.2")
-    testImplementation(Config.Libs.graphQlJava22)
 }
 
 configure<SourceSetContainer> {

sentry-graphql-core/build.gradle.kts

@@ -12,13 +12,13 @@ plugins {
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
-    kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
+    kotlinOptions.languageVersion = libs.versions.kotlin.compatible.version.get()
 }
 
 dependencies {
     api(projects.sentry)
-    compileOnly(Config.Libs.graphQlJava)
 
+    compileOnly(libs.graphql.java17)
     compileOnly(libs.jetbrains.annotations)
     compileOnly(libs.nopen.annotations)
     errorprone(libs.errorprone.core)
@@ -29,14 +29,14 @@ dependencies {
     testImplementation(projects.sentry)
     testImplementation(projects.sentryTestSupport)
     testImplementation(kotlin(Config.kotlinStdLib))
+    testImplementation(libs.graphql.java17)
     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("com.netflix.graphql.dgs:graphql-error-types:4.9.2")
-    testImplementation(Config.Libs.graphQlJava)
 }
 
 configure<SourceSetContainer> {