Merge pull request #184 from zirman/main

Updates Compose to 1.10.1 and fixed tests

Author: zach-klippenstein

compose-tests/build.gradle.kts

@@ -6,16 +6,16 @@ plugins {
 }
 
 android {
-  compileSdk = 34
+  compileSdk = 35
 
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
   }
 
   defaultConfig {
-    minSdk = 21
-    targetSdk = 34
+    minSdk = 23
+    targetSdk = 35
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
 

compose-tests/src/androidTest/java/radiography/test/compose/ComposeUiTest.kt

@@ -614,7 +614,7 @@ class ComposeUiTest {
       """
       |Box:
       |${BLANK}Box { test-tag:"parent" }
-      |${BLANK}╰─LazyColumn { vertical-scroll-axis-range:"ScrollAxisRange(value=0.0, maxValue=0.0)", test-tag:"list" }
+      |${BLANK}╰─LazyColumn { test-tag:"list", vertical-scroll-axis-range:"ScrollAxisRange(value=0.0, maxValue=0.0)" }
       |${BLANK}  ├─<subcomposition of LazyColumn>
       |${BLANK}  │ ╰─SkippableItem { test-tag:"child:1" }
       |${BLANK}  ├─<subcomposition of LazyColumn>

compose-unsupported-tests/build.gradle.kts

@@ -6,16 +6,16 @@ plugins {
 }
 
 android {
-  compileSdk = 34
+  compileSdk = 35
 
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
   }
 
   defaultConfig {
-    minSdk = 21
-    targetSdk = 34
+    minSdk = 23
+    targetSdk = 35
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
 
@@ -52,7 +52,7 @@ dependencies {
   androidTestImplementation(libs.appCompat)
   androidTestImplementation(libs.compose.old.activity)
   androidTestImplementation(libs.compose.old.material)
-  androidTestImplementation(libs.compose.old.testing)
+  androidTestImplementation(libs.compose.testing)
   androidTestImplementation(libs.test.androidx.rules)
   androidTestImplementation(libs.test.junit)
   androidTestImplementation(libs.test.androidx.runner)

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ compose-compiler = "1.5.3"
 # We compile against an older version of Compose intentionally to support consumers that aren't on
 # the latest.
 #noinspection GradleDependency
-compose = "1.7.0-beta05"
+compose = "1.10.1"
 # Allows using a different version of Compose to validate that we degrade gracefully on apps
 # built with unsupported Compose versions.
 #noinspection GradleDependency
@@ -52,8 +52,6 @@ compose-sample-tooling = { module = "androidx.compose.ui:ui-tooling", version.re
 compose-old-activity = "androidx.activity:activity-compose:1.3.0-alpha02"
 #noinspection SimilarGradleDependency
 compose-old-material = { module = "androidx.compose.material:material", version.ref = "compose-old" }
-#noinspection SimilarGradleDependency
-compose-old-testing = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose-old" }
 
 test-junit = "junit:junit:4.13"
 test-mockito = "org.mockito:mockito-core:3.11.2"

radiography/build.gradle.kts

@@ -22,16 +22,16 @@ plugins {
 }
 
 android {
-  compileSdk = 34
+  compileSdk = 35
 
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
   }
 
   defaultConfig {
-    minSdk = 17
-    targetSdk = 34
+    minSdk = 23
+    targetSdk = 35
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
 

radiography/src/main/java/radiography/ViewStateRenderers.kt

@@ -75,20 +75,23 @@ public object ViewStateRenderers {
         // Technically there can be multiple semantic modifiers on a single node, so read them
         // all.
         .flatten()
+        .sortedBy { it.key.name }
         .forEach { (key, value) ->
           when (key) {
             SemanticsProperties.TestTag -> appendLabeledValue("test-tag", value)
             SemanticsProperties.ContentDescription -> appendLabeledValue(
               "content-description",
               (value as List<*>).map { "\"$it\"" }
             )
+
             SemanticsProperties.StateDescription -> appendLabeledValue("state-description", value)
             SemanticsProperties.Disabled -> append("DISABLED")
             SemanticsProperties.Focused -> if (value == true) append("FOCUSED")
             SemanticsProperties.IsDialog -> append("DIALOG")
             SemanticsProperties.IsPopup -> append("POPUP")
             SemanticsProperties.ProgressBarRangeInfo ->
               appendLabeledValue("progress-bar-range", value)
+
             SemanticsProperties.PaneTitle -> appendLabeledValue("pane-title", value)
             SemanticsProperties.SelectableGroup -> append("SELECTABLE-GROUP")
             SemanticsProperties.Heading -> append("HEADING")
@@ -98,11 +101,13 @@ public object ViewStateRenderers {
                 "horizontal-scroll-axis-range",
                 scrollAxisRangeToString(value as? ScrollAxisRange)
               )
+
             SemanticsProperties.VerticalScrollAxisRange ->
               appendLabeledValue(
                 "vertical-scroll-axis-range",
                 scrollAxisRangeToString(value as? ScrollAxisRange)
               )
+
             SemanticsProperties.Role -> appendLabeledValue("role", value)
             SemanticsProperties.TextSelectionRange -> append("SELECTED-TEXT")
             SemanticsProperties.ImeAction -> appendLabeledValue("ime-action", value)
@@ -244,7 +249,8 @@ public object ViewStateRenderers {
    */
   // This function is only visible to Java consumers of this library.
   @JvmStatic
-  @PublishedApi internal fun <T : Any> androidViewStateRendererFor(
+  @PublishedApi
+  internal fun <T : Any> androidViewStateRendererFor(
     renderedClass: Class<T>,
     renderer: AttributeAppendable.(T) -> Unit
   ): ViewStateRenderer = ViewStateRenderer { scannableView ->

radiography/src/main/java/radiography/internal/CompositionContexts.kt

@@ -13,6 +13,8 @@ private val REFLECTION_CONSTANTS by lazy(PUBLICATION) {
         Class.forName("androidx.compose.runtime.ComposerImpl\$CompositionContextHolder")
       val CompositionContextImplClass =
         Class.forName("androidx.compose.runtime.ComposerImpl\$CompositionContextImpl")
+      val ReusableRememberObserverHolderClass =
+        Class.forName("androidx.compose.runtime.ReusableRememberObserverHolder")
       val CompositionContextHolderRefField =
         CompositionContextHolderClass.getDeclaredField("ref")
           .apply { isAccessible = true }
@@ -29,8 +31,13 @@ private val REFLECTION_CONSTANTS by lazy(PUBLICATION) {
 internal fun Group.getCompositionContexts(): Sequence<CompositionContext> {
   return REFLECTION_CONSTANTS?.run {
     data.asSequence()
-      .filter { it != null && it::class.java == CompositionContextHolderClass }
-      .mapNotNull { holder -> holder.tryGetCompositionContext() }
+      .filter { it != null && it::class.java == ReusableRememberObserverHolderClass }
+      .mapNotNull { holder ->
+        holder
+          ?.let { holder::class.java.getMethod("getWrapped") }
+          ?.invoke(holder)
+          ?.tryGetCompositionContext()
+      }
   } ?: emptySequence()
 }
 

sample-compose/build.gradle.kts

@@ -6,16 +6,16 @@ plugins {
 }
 
 android {
-  compileSdk = 34
+  compileSdk = 35
 
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
   }
 
   defaultConfig {
-    minSdk = 21
-    targetSdk = 34
+    minSdk = 23
+    targetSdk = 35
     applicationId = "com.squareup.radiography.sample.compose"
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }

sample/build.gradle.kts

@@ -20,16 +20,16 @@ plugins {
 }
 
 android {
-  compileSdk = 34
+  compileSdk = 35
 
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
   }
 
   defaultConfig {
-    minSdk = 21
-    targetSdk = 34
+    minSdk = 23
+    targetSdk = 35
     applicationId = "com.squareup.radiography.sample"
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }