Move compose deps to version catalog (#4425)

* Move compose deps to version catalog

* Toml changes

* Fix compose

* Fix activity

Author: rbro112

buildSrc/src/main/java/Config.kt

@@ -129,20 +129,6 @@ object Config {
         val kotlinReflect = "org.jetbrains.kotlin:kotlin-reflect"
         val kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib"
 
-        private val navigationVersion = "2.4.2"
-        val navigationRuntime = "androidx.navigation:navigation-runtime:$navigationVersion"
-
-        // compose deps
-        val composeNavigation = "androidx.navigation:navigation-compose:$navigationVersion"
-        val composeActivity = "androidx.activity:activity-compose:1.8.2"
-        val composeFoundation = "androidx.compose.foundation:foundation:1.6.3"
-        val composeUi = "androidx.compose.ui:ui:1.6.3"
-        val composeFoundationLayout = "androidx.compose.foundation:foundation-layout:1.6.3"
-        val composeMaterial = "androidx.compose.material3:material3:1.2.1"
-
-        val composeUiReplay = "androidx.compose.ui:ui:1.5.0" // Note: don't change without testing forwards compatibility
-        val composeCoil = "io.coil-kt:coil-compose:2.6.0"
-
         val apolloKotlin = "com.apollographql.apollo3:apollo-runtime:3.8.2"
         val apolloKotlin4 = "com.apollographql.apollo:apollo-runtime:4.1.1"
 

gradle/libs.versions.toml

@@ -1,6 +1,8 @@
 [versions]
+androidxNavigation = "2.4.2"
 androidxTestCore = "1.6.1"
-composeVersion = "1.6.11"
+androidxComposeVersion = "1.6.3"
+jetbrainsComposeVersion = "1.6.11"
 espresso = "3.5.0"
 kotlin = "1.9.24"
 # see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility
@@ -16,7 +18,7 @@ buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.6.5" }
 dokka = { id = "org.jetbrains.dokka", version = "2.0.0" }
 dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version = "2.0.0" }
 binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.0" }
-compose-compiler = { id = "org.jetbrains.compose", version.ref = "composeVersion" }
+compose-compiler = { id = "org.jetbrains.compose", version.ref = "jetbrainsComposeVersion" }
 errorprone = { id = "net.ltgt.errorprone", version = "3.0.1" }
 gradle-versions = { id = "com.github.ben-manes.versions", version = "0.42.0" }
 spotless = { id = "com.diffplug.spotless", version = "6.11.0" }
@@ -29,8 +31,18 @@ spring-boot-three = { id = "org.springframework.boot", version.ref = "springThre
 spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE" }
 
 [libraries]
+androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.2" }
+androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidxComposeVersion" }
+androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidxComposeVersion" }
+androidx-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.2.1" }
+androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidxComposeVersion" }
+# Note: don't change without testing forwards compatibility
+androidx-compose-ui-replay = { module = "androidx.compose.ui:ui", version = "1.5.0" }
 androidx-core = { module = "androidx.core:core", version = "1.3.2"}
 androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.7.0" }
+androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidxNavigation" }
+androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" }
+coil-compose = { module = "io.coil-kt:coil-compose", version = "2.6.0" }
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 
 # test libraries

sentry-android-core/build.gradle.kts

@@ -110,7 +110,7 @@ dependencies {
     testImplementation(projects.sentryAndroidReplay)
     testImplementation(projects.sentryCompose)
     testImplementation(projects.sentryAndroidNdk)
-    testRuntimeOnly(Config.Libs.composeUi)
+    testRuntimeOnly(libs.androidx.compose.ui)
     testRuntimeOnly(Config.Libs.timber)
     testRuntimeOnly(Config.Libs.fragment)
 }

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

@@ -50,9 +50,9 @@ android {
 dependencies {
     implementation(kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION))
     implementation(libs.androidx.core)
-    implementation(Config.Libs.composeActivity)
-    implementation(Config.Libs.composeFoundation)
-    implementation(Config.Libs.composeMaterial)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.compose.foundation)
+    implementation(libs.androidx.compose.material3)
     implementation(Config.Libs.constraintLayout)
     implementation(projects.sentryAndroidCore)
 }

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

@@ -102,9 +102,9 @@ dependencies {
     }
     implementation(Config.Libs.appCompat)
     implementation(libs.androidx.core)
-    implementation(Config.Libs.composeActivity)
-    implementation(Config.Libs.composeFoundation)
-    implementation(Config.Libs.composeMaterial)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.compose.foundation)
+    implementation(libs.androidx.compose.material3)
     implementation(Config.Libs.androidxRecylerView)
     implementation(Config.Libs.constraintLayout)
     implementation(libs.androidx.test.espresso.idling.resource)

sentry-android-navigation/build.gradle.kts

@@ -66,10 +66,10 @@ kotlin {
 dependencies {
     api(projects.sentry)
 
-    compileOnly(Config.Libs.navigationRuntime)
+    compileOnly(libs.androidx.navigation.runtime)
 
     // tests
-    testImplementation(Config.Libs.navigationRuntime)
+    testImplementation(libs.androidx.navigation.runtime)
 
     testImplementation(libs.kotlin.test.junit)
     testImplementation(libs.mockito.kotlin)

sentry-android-replay/build.gradle.kts

@@ -80,25 +80,25 @@ kotlin {
 dependencies {
     api(projects.sentry)
 
-    compileOnly(Config.Libs.composeUiReplay)
+    compileOnly(libs.androidx.compose.ui.replay)
     implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
 
     // tests
     testImplementation(projects.sentryTestSupport)
     testImplementation(projects.sentryAndroidCore)
     testImplementation(libs.roboelectric)
     testImplementation(libs.kotlin.test.junit)
+    testImplementation(libs.androidx.activity.compose)
     testImplementation(libs.androidx.test.ext.junit)
     testImplementation(libs.androidx.test.runner)
     testImplementation(libs.mockito.kotlin)
     testImplementation(libs.mockito.inline)
     testImplementation(Config.TestLibs.awaitility)
-    testImplementation(Config.Libs.composeActivity)
-    testImplementation(Config.Libs.composeUi)
-    testImplementation(Config.Libs.composeCoil)
-    testImplementation(Config.Libs.composeFoundation)
-    testImplementation(Config.Libs.composeFoundationLayout)
-    testImplementation(Config.Libs.composeMaterial)
+    testImplementation(libs.androidx.compose.ui)
+    testImplementation(libs.androidx.compose.foundation)
+    testImplementation(libs.androidx.compose.foundation.layout)
+    testImplementation(libs.androidx.compose.material3)
+    testImplementation(libs.coil.compose)
 }
 
 tasks.withType<Detekt>().configureEach {

sentry-compose/build.gradle.kts

@@ -49,7 +49,7 @@ kotlin {
                 api(projects.sentry)
                 api(projects.sentryAndroidNavigation)
 
-                compileOnly(Config.Libs.composeNavigation)
+                compileOnly(libs.androidx.navigation.compose)
                 implementation(Config.Libs.lifecycleCommonJava8)
             }
         }
@@ -58,7 +58,7 @@ kotlin {
                 implementation(libs.kotlin.test.junit)
                 implementation(libs.mockito.kotlin)
                 implementation(libs.mockito.inline)
-                implementation(Config.Libs.composeNavigation)
+                implementation(libs.androidx.navigation.compose)
                 implementation(libs.roboelectric)
                 implementation(libs.androidx.test.rules)
                 implementation(libs.androidx.test.runner)

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

@@ -161,12 +161,12 @@ dependencies {
     implementation(Config.Libs.retrofit2)
     implementation(Config.Libs.retrofit2Gson)
 
-    implementation(Config.Libs.composeActivity)
-    implementation(Config.Libs.composeFoundation)
-    implementation(Config.Libs.composeFoundationLayout)
-    implementation(Config.Libs.composeNavigation)
-    implementation(Config.Libs.composeMaterial)
-    implementation(Config.Libs.composeCoil)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.compose.foundation)
+    implementation(libs.androidx.compose.foundation.layout)
+    implementation(libs.androidx.navigation.compose)
+    implementation(libs.androidx.compose.material3)
+    implementation(libs.coil.compose)
     implementation(Config.Libs.sentryNativeNdk)
 
     implementation(projects.sentryKotlinExtensions)