Switch to reflection

Author: markushi

gradle/libs.versions.toml

@@ -85,7 +85,7 @@ androidx-compose-material-icons-core = { module = "androidx.compose.material:mat
 androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version="1.7.8" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidxCompose" }
 # Note: don't change without testing forwards compatibility
-androidx-compose-ui-replay = { module = "androidx.compose.ui:ui", version = "1.5.0" }
+androidx-compose-ui-replay = { module = "androidx.compose.ui:ui", version = "1.10.2" }
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.1.3" }
 androidx-core = { module = "androidx.core:core", version = "1.3.2" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.7.0" }

sentry-android-replay/build.gradle.kts

@@ -1,6 +1,5 @@
 import io.gitlab.arturbosch.detekt.Detekt
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   id("com.android.library")
@@ -92,80 +91,6 @@ dependencies {
   testImplementation(libs.coil.compose)
 }
 
-// Compile Compose110Helper.kt against Compose 1.10 where internal LayoutNode accessors
-// are mangled with module name "ui" (e.g. getChildren$ui()) instead of "ui_release"
-val compose110Classpath by
-  configurations.creating {
-    isCanBeConsumed = false
-    isCanBeResolved = true
-    attributes {
-      attribute(Attribute.of("artifactType", String::class.java), "android-classes-jar")
-    }
-  }
-
-val compose110KotlinCompiler by
-  configurations.creating {
-    isCanBeConsumed = false
-    isCanBeResolved = true
-  }
-
-dependencies {
-  //noinspection UseTomlInstead
-  compose110Classpath("androidx.compose.ui:ui-android:1.10.0")
-  //noinspection UseTomlInstead
-  compose110KotlinCompiler("org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.0")
-}
-
-val compileCompose110 by
-  tasks.registering(JavaExec::class) {
-    val sourceDir = file("src/compose110/kotlin")
-    val outputDir = layout.buildDirectory.dir("classes/kotlin/compose110")
-    val compileClasspathFiles = compose110Classpath.incoming.files
-
-    inputs.dir(sourceDir)
-    inputs.files(compileClasspathFiles)
-    outputs.dir(outputDir)
-
-    classpath = compose110KotlinCompiler
-    mainClass.set("org.jetbrains.kotlin.cli.jvm.K2JVMCompiler")
-
-    argumentProviders.add(
-      CommandLineArgumentProvider {
-        val cp = compileClasspathFiles.files.joinToString(File.pathSeparator)
-        outputDir.get().asFile.mkdirs()
-        listOf(
-          sourceDir.absolutePath,
-          "-classpath",
-          cp,
-          "-d",
-          outputDir.get().asFile.absolutePath,
-          "-jvm-target",
-          "1.8",
-          "-language-version",
-          "1.9",
-          "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi",
-          "-Xsuppress-version-warnings",
-          "-no-stdlib",
-        )
-      }
-    )
-  }
-
-// Make compose110 output available to the Android Kotlin compilation
-val compose110Output = files(compileCompose110.map { it.outputs.files })
-
-tasks.withType<KotlinCompile>().configureEach {
-  if (name == "compileReleaseKotlin" || name == "compileDebugKotlin") {
-    dependsOn(compileCompose110)
-    libraries.from(compose110Output)
-  }
-}
-
-// Include compose110 classes in the AAR
-android.libraryVariants.all {
-  registerPreJavacGeneratedBytecode(project.files(compileCompose110.map { it.outputs.files }))
-}
-
 tasks.withType<Detekt>().configureEach {
   // Target version of the generated JVM bytecode. It is used for type resolution.
   jvmTarget = JavaVersion.VERSION_1_8.toString()

sentry-android-replay/src/compose110/kotlin/io/sentry/android/replay/viewhierarchy/Compose110Helper.kt

@@ -36,9 +36,9 @@ import java.lang.reflect.Method
 @SuppressLint("UseRequiresApi")
 @TargetApi(26)
 internal object ComposeViewHierarchyNode {
-  private val getSemanticsConfigurationMethod: Method? by lazy {
+  private val getCollapsedSemanticsMethod: Method? by lazy {
     try {
-      return@lazy LayoutNode::class.java.getDeclaredMethod("getSemanticsConfiguration").apply {
+      return@lazy LayoutNode::class.java.getDeclaredMethod("getCollapsedSemantics").apply {
         isAccessible = true
       }
     } catch (_: Throwable) {
@@ -51,17 +51,15 @@ internal object ComposeViewHierarchyNode {
 
   @JvmStatic
   internal fun retrieveSemanticsConfiguration(node: LayoutNode): SemanticsConfiguration? {
-    // Jetpack Compose 1.8 or newer provides SemanticsConfiguration via SemanticsInfo
-    // See
-    // https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/LayoutNode.kt
-    // and
-    // https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/semantics/SemanticsInfo.kt
-    getSemanticsConfigurationMethod?.let {
-      return it.invoke(node) as SemanticsConfiguration?
+    try {
+      return node.semanticsConfiguration
+    } catch (_: Exception) {
+      // for backwards compatibility
+      // Jetpack Compose 1.8 or older
+      return getCollapsedSemanticsMethod?.let {
+        return it.invoke(node) as SemanticsConfiguration?
+      }
     }
-
-    // for backwards compatibility
-    return node.collapsedSemantics
   }
 
   /**

sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ComposeViewHierarchyNode.kt

@@ -9,51 +9,79 @@
 package io.sentry.android.replay.viewhierarchy
 
 import androidx.compose.ui.node.LayoutNode
+import androidx.compose.ui.node.NodeCoordinator
+import java.lang.reflect.Method
 
 /**
  * Provides access to internal LayoutNode members that are subject to Kotlin name-mangling.
  *
- * LayoutNode.children and LayoutNode.outerCoordinator are Kotlin `internal`, so their getters are
- * mangled with the module name: getChildren$ui_release() in Compose < 1.10 vs getChildren$ui() in
- * Compose >= 1.10. This class detects the version on first use and delegates to the correct
- * accessor.
+ * Compiled against Compose >= 1.10 where the mangled names use the "ui" module suffix (e.g.
+ * getChildren$ui()). For apps still on Compose < 1.10 (where the suffix is "$ui_release"), the
+ * direct call will throw [NoSuchMethodError] and we fall back to reflection-based accessors that
+ * are resolved and cached on first use.
  */
 internal object SentryLayoutNodeHelper {
-  @Volatile private var compose110Helper: Compose110Helper? = null
-  @Volatile private var useCompose110: Boolean? = null
+  private class Fallback(val getChildren: Method?, val getOuterCoordinator: Method?)
 
-  private fun getHelper(): Compose110Helper {
-    compose110Helper?.let {
-      return it
+  @Volatile private var useFallback: Boolean? = null
+  @Volatile private var fallback: Fallback? = null
+
+  private fun tryResolve(clazz: Class<*>, name: String): Method? {
+    return try {
+      clazz.getDeclaredMethod(name).apply { isAccessible = true }
+    } catch (_: NoSuchMethodException) {
+      null
     }
-    val helper = Compose110Helper()
-    compose110Helper = helper
-    return helper
   }
 
+  @Suppress("UNCHECKED_CAST")
   fun getChildren(node: LayoutNode): List<LayoutNode> {
-    return if (useCompose110 == false) {
-      node.children
-    } else {
-      try {
-        getHelper().getChildren(node).also { useCompose110 = true }
-      } catch (_: NoSuchMethodError) {
-        useCompose110 = false
-        node.children
+    when (useFallback) {
+      false -> return node.children
+      true -> {
+        return getFallback().getChildren!!.invoke(node) as List<LayoutNode>
+      }
+      null -> {
+        try {
+          return node.children.also { useFallback = false }
+        } catch (_: NoSuchMethodError) {
+          useFallback = true
+          return getFallback().getChildren!!.invoke(node) as List<LayoutNode>
+        }
       }
     }
   }
 
   fun isTransparent(node: LayoutNode): Boolean {
-    return if (useCompose110 == false) {
-      node.outerCoordinator.isTransparent()
-    } else {
-      try {
-        getHelper().getOuterCoordinator(node).isTransparent().also { useCompose110 = true }
-      } catch (_: NoSuchMethodError) {
-        useCompose110 = false
-        node.outerCoordinator.isTransparent()
+    when (useFallback) {
+      false -> return node.outerCoordinator.isTransparent()
+      true -> {
+        val fb = getFallback()
+        val coordinator = fb.getOuterCoordinator!!.invoke(node) as NodeCoordinator
+        return coordinator.isTransparent()
       }
+      null -> {
+        try {
+          return node.outerCoordinator.isTransparent().also { useFallback = false }
+        } catch (_: NoSuchMethodError) {
+          useFallback = true
+          val fb = getFallback()
+          val coordinator = fb.getOuterCoordinator!!.invoke(node) as NodeCoordinator
+          return coordinator.isTransparent()
+        }
+      }
+    }
+  }
+
+  private fun getFallback(): Fallback {
+    fallback?.let {
+      return it
     }
+
+    val layoutNodeClass = LayoutNode::class.java
+    val getChildren = tryResolve(layoutNodeClass, "getChildren\$ui_release")
+    val getOuterCoordinator = tryResolve(layoutNodeClass, "getOuterCoordinator\$ui_release")
+
+    return Fallback(getChildren, getOuterCoordinator).also { fallback = it }
   }
 }