Run AGP test matrix with/without sentry integrations (#2743)

Co-authored-by: Markus Hintersteiner <[email protected]>

Author: romtsn

.github/workflows/agp-matrix.yml

@@ -23,12 +23,12 @@ jobs:
       fail-fast: false
       matrix:
         agp: [ '8.0.0','8.1.0-alpha11' ]
-        ndk: [ true, false ]
+        integrations: [ true, false ]
 
-    name: AGP Matrix Release - AGP ${{ matrix.agp }} - NDK ${{ matrix.ndk }}
+    name: AGP Matrix Release - AGP ${{ matrix.agp }} - Integrations ${{ matrix.integrations }}
     env:
       VERSION_AGP: ${{ matrix.agp }}
-      APPLY_NDK: ${{ matrix.ndk }}
+      APPLY_SENTRY_INTEGRATIONS: ${{ matrix.integrations }}
 
     steps:
       - name: Checkout Repo

CHANGELOG.md

@@ -6,6 +6,10 @@
 
 - Add SentryWrapper for Callable and Supplier Interface ([#2720](https://github.com/getsentry/sentry-java/pull/2720))
 
+### Fixes
+
+- Don't warn R8 on missing `ComposeViewHierarchyExporter` class ([#2743](https://github.com/getsentry/sentry-java/pull/2743))
+
 ## 6.20.0
 
 ### Features

sentry-android-core/proguard-rules.pro

@@ -24,6 +24,7 @@
 -dontwarn io.sentry.android.timber.SentryTimberIntegration
 -dontwarn io.sentry.android.fragment.FragmentLifecycleIntegration
 -dontwarn io.sentry.compose.gestures.ComposeGestureTargetLocator
+-dontwarn io.sentry.compose.viewhierarchy.ComposeViewHierarchyExporter
 
 # To ensure that stack traces is unambiguous
 # https://developer.android.com/studio/build/shrink-code#decode-stack-trace

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

@@ -88,18 +88,18 @@ android {
     }
 }
 
-val applyNdk = System.getenv("APPLY_NDK")?.toBoolean() ?: false
+val applySentryIntegrations = System.getenv("APPLY_SENTRY_INTEGRATIONS")?.toBoolean() ?: true
 
 dependencies {
 
     implementation(kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION))
 
-    if (applyNdk) {
+    if (applySentryIntegrations) {
         implementation(projects.sentryAndroid)
+        implementation(projects.sentryCompose)
     } else {
         implementation(projects.sentryAndroidCore)
     }
-    implementation(projects.sentryCompose)
     implementation(Config.Libs.appCompat)
     implementation(Config.Libs.androidxCore)
     implementation(Config.Libs.composeActivity)

sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/BaseUiTest.kt

@@ -99,3 +99,13 @@ fun waitUntilIdle() {
     // We rely on Espresso's idling resources.
     Espresso.onIdle()
 }
+
+fun classExists(className: String): Boolean {
+    try {
+        Class.forName(className)
+        return true
+    } catch (exception: ClassNotFoundException) {
+        // no-op
+    }
+    return false
+}

sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/UserInteractionTests.kt

@@ -15,13 +15,24 @@ import io.sentry.Breadcrumb
 import io.sentry.SentryLevel
 import io.sentry.SentryOptions
 import io.sentry.android.core.SentryAndroidOptions
+import org.hamcrest.CoreMatchers.`is`
+import org.junit.Assume.assumeThat
+import org.junit.Before
 import org.junit.runner.RunWith
 import kotlin.test.Test
 import kotlin.test.assertTrue
 
 @RunWith(AndroidJUnit4::class)
 class UserInteractionTests : BaseUiTest() {
 
+    @Before
+    fun setup() {
+        assumeThat(
+            classExists("io.sentry.compose.gestures.ComposeGestureTargetLocator"),
+            `is`(true)
+        )
+    }
+
     @Test
     fun composableClickGeneratesMatchingBreadcrumb() {
         val breadcrumbs = mutableListOf<Breadcrumb>()