Fixes

Author: rbro112

buildSrc/src/main/java/Config.kt

@@ -43,7 +43,6 @@ object Config {
         private val lifecycleVersion = "2.2.0"
         val lifecycleProcess = "androidx.lifecycle:lifecycle-process:$lifecycleVersion"
         val lifecycleCommonJava8 = "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
-        val androidxCore = "androidx.core:core:1.3.2"
         val androidxSqlite = "androidx.sqlite:sqlite:2.3.1"
         val androidxRecylerView = "androidx.recyclerview:recyclerview:1.2.1"
         val androidxAnnotation = "androidx.annotation:annotation:1.9.1"

gradle/libs.versions.toml

@@ -29,6 +29,8 @@ 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-core = { module = "androidx.core:core", version = "1.3.2"}
+androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.7.0" }
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 
 # test libraries

sentry-android-core/build.gradle.kts

@@ -85,7 +85,7 @@ dependencies {
     // lifecycle processor, session tracking
     implementation(Config.Libs.lifecycleProcess)
     implementation(Config.Libs.lifecycleCommonJava8)
-    implementation(Config.Libs.androidxCore)
+    implementation(libs.androidx.core)
 
     compileOnly(Config.CompileOnly.nopen)
     errorprone(Config.CompileOnly.nopenChecker)
@@ -97,8 +97,8 @@ dependencies {
     testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
     testImplementation(libs.roboelectric)
     testImplementation(libs.kotlin.test.junit)
+    testImplementation(libs.androidx.core.ktx)
     testImplementation(libs.androidx.test.core)
-    testImplementation(libs.androidx.test.core.ktx)
     testImplementation(libs.androidx.test.ext.junit)
     testImplementation(libs.androidx.test.runner)
     testImplementation(libs.mockito.kotlin)

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

@@ -89,7 +89,7 @@ dependencies {
 
     implementation(projects.sentryAndroid)
     implementation(Config.Libs.appCompat)
-    implementation(Config.Libs.androidxCore)
+    implementation(libs.androidx.core)
     implementation(Config.Libs.androidxRecylerView)
     implementation(Config.Libs.constraintLayout)
     implementation(libs.androidx.test.espresso.idling.resource)

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

@@ -49,7 +49,7 @@ android {
 
 dependencies {
     implementation(kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION))
-    implementation(Config.Libs.androidxCore)
+    implementation(libs.androidx.core)
     implementation(Config.Libs.composeActivity)
     implementation(Config.Libs.composeFoundation)
     implementation(Config.Libs.composeMaterial)

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

@@ -101,7 +101,7 @@ dependencies {
         implementation(projects.sentryAndroidCore)
     }
     implementation(Config.Libs.appCompat)
-    implementation(Config.Libs.androidxCore)
+    implementation(libs.androidx.core)
     implementation(Config.Libs.composeActivity)
     implementation(Config.Libs.composeFoundation)
     implementation(Config.Libs.composeMaterial)

sentry-android-navigation/build.gradle.kts

@@ -76,8 +76,8 @@ dependencies {
     testImplementation(libs.mockito.inline)
 
     testImplementation(libs.roboelectric)
-    testImplementation(libs.androidx.test.core)
-    testImplementation(libs.androidx.test.core.ktx)
+    testImplementation(libs.androidx.core)
+    testImplementation(libs.androidx.core.ktx)
     testImplementation(libs.androidx.test.ext.junit)
     testImplementation(libs.androidx.test.runner)
 }