From af570a0298184c536bde20057422e6133c2b2f25 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Wed, 9 Sep 2026 06:49:47 +0200 Subject: [PATCH 1/3] build(compose): Bump Compose and Navigation deps Align sentry-compose and related test surfaces on a newer AndroidX Compose and Navigation baseline. This removes the stale navigation-compose classpath that required explicit test-only foundation overrides and keeps the Compose test/runtime mix coherent again. Co-Authored-By: OpenAI GPT-5.4 --- gradle/libs.versions.toml | 8 ++++---- sentry-compose/build.gradle.kts | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0e95a4cd13..db4b99e1a1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,9 +2,9 @@ animalsniffer = "2.0.1" apollo = "2.5.9" androidxLifecycle = "2.2.0" -androidxNavigation = "2.4.2" +androidxNavigation = "2.9.8" androidxTestCore = "1.7.0" -androidxCompose = "1.6.3" +androidxCompose = "1.9.5" asyncProfiler = "4.4" camerax = "1.4.0" composeCompiler = "1.5.14" @@ -86,7 +86,7 @@ apollo4-kotlin = { module = "com.apollographql.apollo:apollo-runtime", version = androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.3.0" } androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" } androidx-activity = { module = "androidx.activity:activity", version = "1.8.2" } -androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.2" } +androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.9.3" } androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidxCompose" } androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidxCompose" } androidx-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.4.0" } @@ -241,7 +241,7 @@ tomcat-embed-jasper-jakarta = { module = "org.apache.tomcat.embed:tomcat-embed-j # test libraries androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version = "1.4.1" } -androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version = "1.9.5" } +androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version = "1.10.5" } androidx-test-core = { module = "androidx.test:core", version.ref = "androidxTestCore" } androidx-test-core-ktx = { module = "androidx.test:core-ktx", version.ref = "androidxTestCore" } androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" } diff --git a/sentry-compose/build.gradle.kts b/sentry-compose/build.gradle.kts index ad2c123731..28d88f28a2 100644 --- a/sentry-compose/build.gradle.kts +++ b/sentry-compose/build.gradle.kts @@ -62,8 +62,6 @@ kotlin { } getByName("androidUnitTest") { dependencies { - implementation(libs.androidx.compose.foundation) - implementation(libs.androidx.compose.foundation.layout) implementation(libs.androidx.compose.ui.test.junit4) implementation(libs.androidx.navigation.compose) implementation(libs.androidx.test.ext.junit) From fe05cfb95e2a8698d3ec18a923c48d7eab66b40d Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Wed, 9 Sep 2026 09:59:01 +0200 Subject: [PATCH 2/3] Align junit version --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index db4b99e1a1..76143524bc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -241,7 +241,7 @@ tomcat-embed-jasper-jakarta = { module = "org.apache.tomcat.embed:tomcat-embed-j # test libraries androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version = "1.4.1" } -androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version = "1.10.5" } +androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version = "1.9.5" } androidx-test-core = { module = "androidx.test:core", version.ref = "androidxTestCore" } androidx-test-core-ktx = { module = "androidx.test:core-ktx", version.ref = "androidxTestCore" } androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" } From 1007a820712ce8cbf787f7384269174f8473fcd6 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Wed, 9 Sep 2026 10:41:25 +0200 Subject: [PATCH 3/3] fix(uitest): Align requestPermissionLauncher type with activity-compose 1.9.3 The androidx.activity bump to 1.9.3 changed RequestPermission's input generic to non-null String, so registerForActivityResult now returns ActivityResultLauncher. Update the field type to match and fix the compileReleaseKotlin break in sentry-uitest-android-critical. --- .../main/java/io/sentry/uitest/android/critical/MainActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry-android-integration-tests/sentry-uitest-android-critical/src/main/java/io/sentry/uitest/android/critical/MainActivity.kt b/sentry-android-integration-tests/sentry-uitest-android-critical/src/main/java/io/sentry/uitest/android/critical/MainActivity.kt index 7e0ff9d61c..1b98cd59c7 100644 --- a/sentry-android-integration-tests/sentry-uitest-android-critical/src/main/java/io/sentry/uitest/android/critical/MainActivity.kt +++ b/sentry-android-integration-tests/sentry-uitest-android-critical/src/main/java/io/sentry/uitest/android/critical/MainActivity.kt @@ -29,7 +29,7 @@ import java.io.File import kotlinx.coroutines.delay class MainActivity : ComponentActivity() { - private lateinit var requestPermissionLauncher: ActivityResultLauncher + private lateinit var requestPermissionLauncher: ActivityResultLauncher override fun onCreate(savedInstanceState: Bundle?) { setTheme(android.R.style.Theme_DeviceDefault_NoActionBar)