From ecb5eade8f50f1a679d1439aa6e75b69ceff9270 Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Tue, 17 Nov 2026 14:27:30 +0100 Subject: [PATCH] build(replay): Spike AGP test suites for Compose versions Not for merging. Runs the replay unit tests against Compose UI 1.12 and 1.13 as AGP 9.5 custom test suites instead of extra build types, to see what it takes. Co-Authored-By: Claude Opus 5.5 --- gradle.properties | 5 +- sentry-android-core/build.gradle.kts | 5 +- .../core/AndroidOptionsInitializer.java | 8 +- sentry-android-distribution/build.gradle.kts | 1 - sentry-android-fragment/build.gradle.kts | 1 - sentry-android-navigation/build.gradle.kts | 1 - sentry-android-navigation3/build.gradle.kts | 1 - sentry-android-ndk-outproc/build.gradle.kts | 1 - sentry-android-ndk/build.gradle.kts | 1 - sentry-android-replay/build.gradle.kts | 134 +++++++++++++++--- sentry-android-sqlite/build.gradle.kts | 1 - sentry-android-timber/build.gradle.kts | 1 - sentry-android/build.gradle.kts | 1 - sentry-bom/build.gradle.kts | 2 +- sentry-launchdarkly-android/build.gradle.kts | 1 - 15 files changed, 125 insertions(+), 39 deletions(-) diff --git a/gradle.properties b/gradle.properties index ea37b9864f6..36faa935557 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled # AndroidX required by AGP >= 3.6.x android.useAndroidX=true # AGP 9+ migration opt-outs until we remove kotlin-android plugin and adopt built-in Kotlin. -android.builtInKotlin=false +android.builtInKotlin=true android.newDsl=false android.disableAgpUpgradePrompt=true @@ -60,3 +60,6 @@ POM_DEVELOPER_URL=https://github.com/getsentry/ systemProp.org.gradle.internal.http.socketTimeout=120000 android.nonTransitiveRClass=true + +# Session Replay runs its unit tests against several Compose versions as AGP test suites. +android.experimental.testSuiteSupport=true diff --git a/sentry-android-core/build.gradle.kts b/sentry-android-core/build.gradle.kts index 64ea145514b..51748286b1b 100644 --- a/sentry-android-core/build.gradle.kts +++ b/sentry-android-core/build.gradle.kts @@ -4,7 +4,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 plugins { id("com.android.library") - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) alias(libs.plugins.errorprone) alias(libs.plugins.gradle.versions) @@ -105,7 +104,7 @@ dependencies { compileOnly(projects.sentryAndroidFragment) compileOnly(projects.sentryAndroidTimber) compileOnly(projects.sentryAndroidReplay) - compileOnly(projects.sentryCompose) + // SPIKE compileOnly(projects.sentryCompose) compileOnly(projects.sentryAndroidDistribution) // lifecycle processor, session tracking @@ -140,7 +139,7 @@ dependencies { testImplementation(projects.sentryAndroidFragment) testImplementation(projects.sentryAndroidTimber) testImplementation(projects.sentryAndroidReplay) - testImplementation(projects.sentryCompose) + // SPIKE testImplementation(projects.sentryCompose) testImplementation(projects.sentryAndroidNdk) testImplementation(libs.androidx.activity.compose) diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java index 52a54b339dc..ee778796208 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java @@ -46,8 +46,6 @@ import io.sentry.android.timber.SentryTimberIntegration; import io.sentry.cache.PersistingOptionsObserver; import io.sentry.cache.PersistingScopeObserver; -import io.sentry.compose.gestures.ComposeGestureTargetLocator; -import io.sentry.compose.viewhierarchy.ComposeViewHierarchyExporter; import io.sentry.internal.debugmeta.NoOpDebugMetaLoader; import io.sentry.internal.gestures.GestureTargetLocator; import io.sentry.internal.modules.NoOpModulesLoader; @@ -240,7 +238,8 @@ static void initializeIntegrationsAndProcessors( SENTRY_COMPOSE_GESTURE_INTEGRATION_CLASS_NAME, options)); if (isComposeAvailable) { - gestureTargetLocators.add(new ComposeGestureTargetLocator(options.getLogger())); + // SPIKE gestureTargetLocators.add(new + // ComposeGestureTargetLocator(options.getLogger())); } options.setGestureTargetLocators(gestureTargetLocators); } @@ -251,7 +250,8 @@ static void initializeIntegrationsAndProcessors( SENTRY_COMPOSE_VIEW_HIERARCHY_INTEGRATION_CLASS_NAME, options)) { final List viewHierarchyExporters = new ArrayList<>(1); - viewHierarchyExporters.add(new ComposeViewHierarchyExporter(options.getLogger())); + // SPIKE viewHierarchyExporters.add(new + // ComposeViewHierarchyExporter(options.getLogger())); options.setViewHierarchyExporters(viewHierarchyExporters); } diff --git a/sentry-android-distribution/build.gradle.kts b/sentry-android-distribution/build.gradle.kts index 91a1e4afe3a..117b4653cf6 100644 --- a/sentry-android-distribution/build.gradle.kts +++ b/sentry-android-distribution/build.gradle.kts @@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { id("com.android.library") - alias(libs.plugins.kotlin.android) id("io.sentry.detekt") id("io.sentry.spotless") id("io.sentry.jdk-target") diff --git a/sentry-android-fragment/build.gradle.kts b/sentry-android-fragment/build.gradle.kts index 80e04a4b78c..ee33a5b8984 100644 --- a/sentry-android-fragment/build.gradle.kts +++ b/sentry-android-fragment/build.gradle.kts @@ -4,7 +4,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { id("com.android.library") - alias(libs.plugins.kotlin.android) alias(libs.plugins.gradle.versions) id("io.sentry.detekt") id("io.sentry.spotless") diff --git a/sentry-android-navigation/build.gradle.kts b/sentry-android-navigation/build.gradle.kts index 9c23e6111e1..c2da98871d4 100644 --- a/sentry-android-navigation/build.gradle.kts +++ b/sentry-android-navigation/build.gradle.kts @@ -4,7 +4,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { id("com.android.library") - alias(libs.plugins.kotlin.android) alias(libs.plugins.gradle.versions) id("io.sentry.detekt") id("io.sentry.spotless") diff --git a/sentry-android-navigation3/build.gradle.kts b/sentry-android-navigation3/build.gradle.kts index 205f6b95bd6..a9e2287000e 100644 --- a/sentry-android-navigation3/build.gradle.kts +++ b/sentry-android-navigation3/build.gradle.kts @@ -4,7 +4,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { id("com.android.library") - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) alias(libs.plugins.gradle.versions) id("io.sentry.detekt") diff --git a/sentry-android-ndk-outproc/build.gradle.kts b/sentry-android-ndk-outproc/build.gradle.kts index bb8fd5151a4..6bd512e430a 100644 --- a/sentry-android-ndk-outproc/build.gradle.kts +++ b/sentry-android-ndk-outproc/build.gradle.kts @@ -2,7 +2,6 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion plugins { id("com.android.library") - alias(libs.plugins.kotlin.android) alias(libs.plugins.gradle.versions) id("io.sentry.spotless") id("io.sentry.jdk-target") diff --git a/sentry-android-ndk/build.gradle.kts b/sentry-android-ndk/build.gradle.kts index b2a902515ab..2755bcf069c 100644 --- a/sentry-android-ndk/build.gradle.kts +++ b/sentry-android-ndk/build.gradle.kts @@ -2,7 +2,6 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion plugins { id("com.android.library") - alias(libs.plugins.kotlin.android) alias(libs.plugins.gradle.versions) id("io.sentry.spotless") id("io.sentry.jdk-target") diff --git a/sentry-android-replay/build.gradle.kts b/sentry-android-replay/build.gradle.kts index d0d101d1908..0132f9acef9 100644 --- a/sentry-android-replay/build.gradle.kts +++ b/sentry-android-replay/build.gradle.kts @@ -1,5 +1,5 @@ -import com.android.build.api.variant.HasHostTestsBuilder -import com.android.build.api.variant.HostTestBuilder +import com.android.build.api.variant.HasTestSuites +import com.android.build.api.variant.TestSuiteSourceSet import io.gitlab.arturbosch.detekt.Detekt import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinVersion @@ -7,7 +7,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask plugins { id("com.android.library") - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) alias(libs.plugins.gradle.versions) id("io.sentry.detekt") @@ -38,35 +37,41 @@ android { buildFeatures { compose = true } + // SPIKE: built-in Kotlin requires test and main code to share one JVM target. + compileOptions { + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 + } + composeOptions { kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() } buildTypes { getByName("debug") { consumerProguardFiles("proguard-rules.pro") } getByName("release") { consumerProguardFiles("proguard-rules.pro") } - composeUiTestVersions.keys.forEach { name -> - create(name) { - initWith(getByName("release")) - matchingFallbacks += "release" - } - } } // AGP 9 only generates unit tests for the testBuildType. The debug variant is // disabled, so unit tests must target release to run at all. testBuildType = "release" - kotlin { - compilerOptions.jvmTarget = JvmTarget.JVM_1_8 - compilerOptions.languageVersion = KotlinVersion.KOTLIN_1_9 - compilerOptions.apiVersion = KotlinVersion.KOTLIN_1_9 - } - testOptions { animationsDisabled = true unitTests.apply { isReturnDefaultValues = true isIncludeAndroidResources = true } + composeUiTestVersions.keys.forEach { name -> + customSuites.create(name) { + targetVariants += "release" + targets.create("jvm") + hostJar { enableAndroidResources = true } + useJunitEngine { + includeEngines += "junit-vintage" + enginesDependencies.add("org.junit.vintage:junit-vintage-engine:5.12.2") + enginesDependencies.add("org.junit.platform:junit-platform-launcher:1.12.2") + } + } + } } lint { @@ -85,13 +90,24 @@ android { androidComponents.beforeVariants { it.enable = !Config.Android.shouldSkipDebugVariant(it.buildType) - if (it.buildType in composeUiTestVersions) { - (it as HasHostTestsBuilder).hostTests[HostTestBuilder.UNIT_TEST_TYPE]?.enable = true + } + androidComponents.onVariants { variant -> + (variant as HasTestSuites).suites.values.forEach { suite -> + suite.sources.filterIsInstance().forEach { + it.kotlin?.addStaticSourceDirectory("src/test/java") + it.java?.addStaticSourceDirectory("src/test/java") + it.resources.addStaticSourceDirectory("src/test/resources") + } } } } -kotlin { explicitApi() } +kotlin { + explicitApi() + compilerOptions.jvmTarget = JvmTarget.JVM_21 // SPIKE + compilerOptions.languageVersion = KotlinVersion.KOTLIN_1_9 + compilerOptions.apiVersion = KotlinVersion.KOTLIN_1_9 +} dependencies { api(projects.sentry) @@ -117,9 +133,16 @@ dependencies { testImplementation(libs.coil.compose) } -composeUiTestVersions.forEach { (buildType, version) -> +composeUiTestVersions.forEach { (suite, version) -> + val variantSuite = "release${suite.replaceFirstChar { it.uppercase() }}" configurations - .matching { it.name == "${buildType}UnitTestRuntimeClasspath" } + .matching { it.name == "${variantSuite}Implementation" } + .configureEach { extendsFrom(configurations.testImplementation.get()) } + configurations + .matching { + it.name == "${variantSuite}RuntimeClasspath" || + it.name == "${variantSuite}HostRuntimeClasspath" + } .configureEach { resolutionStrategy.eachDependency { if (requested.group == "androidx.compose.ui") useVersion(version) @@ -135,3 +158,74 @@ tasks.withType().configureEach { tasks.withType>().configureEach { compilerOptions.freeCompilerArgs.add("-opt-in=androidx.compose.ui.ExperimentalComposeUiApi") } + +// SPIKE: suites don't get the mockable android.jar that AGP puts on unit test classpaths. +afterEvaluate { + tasks + .withType() + .matching { it.name.endsWith("JvmTestSuite") } + .configureEach { + classpath += + tasks.named("testReleaseUnitTest").get().classpath.filter { it.name == "android.jar" } + // SPIKE: nor the suite's own processed Java resources. + classpath += + files(tasks.named(name.replace("test", "process").replace("JvmTestSuite", "JavaRes"))) + } +} + +// SPIKE: AGP resolves suite runtime classpaths for the standard JVM, which picks Compose's desktop +// artifacts instead of the Android ones. +afterEvaluate { + configurations + .matching { it.name.endsWith("HostRuntimeClasspath") } + .configureEach { + attributes { + attribute( + TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, + objects.named(TargetJvmEnvironment.ANDROID), + ) + attribute( + org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType.attribute, + org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType.androidJvm, + ) + } + } +} + +// SPIKE: suites don't get the test_config.properties Robolectric reads its resources from. +composeUiTestVersions.keys.forEach { suite -> + val v = "release${suite.replaceFirstChar { it.uppercase() }}" + val writeConfig = + tasks.register("write${v}TestConfig") { + val out = layout.buildDirectory.dir("spike/$v") + outputs.dir(out) + doLast { + val f = out.get().file("com/android/tools/test_config.properties").asFile + f.parentFile.mkdirs() + f.writeText( + """ + android_custom_package=io.sentry.android.replay + android_merged_assets=build/intermediates/assets/$v/merge${v.replaceFirstChar { it.uppercase() }}Assets + android_merged_manifest=build/intermediates/packaged_manifests/$v/process${v.replaceFirstChar { it.uppercase() }}Manifest/AndroidManifest.xml + android_resource_apk=build/intermediates/apk_for_local_test/$v/package${v.replaceFirstChar { it.uppercase() }}ForUnitTest/apk-for-local-test.ap_ + """ + .trimIndent(), + ) + } + } + afterEvaluate { + tasks.named("test${v.replaceFirstChar { it.uppercase() }}JvmTestSuite") { + classpath += files(writeConfig) + dependsOn( + "package${v.replaceFirstChar { it.uppercase() }}ForUnitTest", + "merge${v.replaceFirstChar { it.uppercase() }}Assets", + "process${v.replaceFirstChar { it.uppercase() }}Manifest", + ) + } + } +} + +// SPIKE: AGP doesn't hook test suites into check. +afterEvaluate { + tasks.named("check") { dependsOn(tasks.matching { it.name.endsWith("JvmTestSuite") }) } +} diff --git a/sentry-android-sqlite/build.gradle.kts b/sentry-android-sqlite/build.gradle.kts index b37b343208b..c3d9302a5ad 100644 --- a/sentry-android-sqlite/build.gradle.kts +++ b/sentry-android-sqlite/build.gradle.kts @@ -4,7 +4,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { id("com.android.library") - alias(libs.plugins.kotlin.android) alias(libs.plugins.gradle.versions) id("io.sentry.detekt") id("io.sentry.spotless") diff --git a/sentry-android-timber/build.gradle.kts b/sentry-android-timber/build.gradle.kts index 28e67c5c920..815c39d1c0e 100644 --- a/sentry-android-timber/build.gradle.kts +++ b/sentry-android-timber/build.gradle.kts @@ -4,7 +4,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { id("com.android.library") - alias(libs.plugins.kotlin.android) alias(libs.plugins.gradle.versions) id("io.sentry.detekt") id("io.sentry.spotless") diff --git a/sentry-android/build.gradle.kts b/sentry-android/build.gradle.kts index 8a281972d9c..4d93f239412 100644 --- a/sentry-android/build.gradle.kts +++ b/sentry-android/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.library") - alias(libs.plugins.kotlin.android) alias(libs.plugins.gradle.versions) id("io.sentry.spotless") id("io.sentry.jdk-target") diff --git a/sentry-bom/build.gradle.kts b/sentry-bom/build.gradle.kts index bd10c31f831..d32f72bf472 100644 --- a/sentry-bom/build.gradle.kts +++ b/sentry-bom/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { project.rootProject.subprojects .filter { !it.name.startsWith("sentry-samples") && - it.name != project.name && + it.name != project.name && it.name != "sentry-compose" /* SPIKE */ && !it.name.endsWith("-bom") && !it.name.contains("test", ignoreCase = true) } diff --git a/sentry-launchdarkly-android/build.gradle.kts b/sentry-launchdarkly-android/build.gradle.kts index 6ccea5a78a6..6f147c3a636 100644 --- a/sentry-launchdarkly-android/build.gradle.kts +++ b/sentry-launchdarkly-android/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.android.library") - alias(libs.plugins.kotlin.android) alias(libs.plugins.gradle.versions) id("io.sentry.spotless") id("io.sentry.jdk-target")