Compose runtime 1.2.1, Android compileSdk 32, plus transitives

buildSrc/src/main/java/android-defaults.gradle.kts

@@ -1,16 +1,18 @@
 import com.android.build.gradle.TestedExtension
+import com.squareup.workflow1.libsCatalog
+import com.squareup.workflow1.version
 
 configure<TestedExtension> {
-  compileSdkVersion(31)
+  compileSdkVersion(libsCatalog.version("compileSdk").toInt())
 
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
   }
 
   defaultConfig {
-    minSdk = 21
-    targetSdk = 30
+    minSdk = libsCatalog.version("minSdk").toInt()
+    targetSdk = libsCatalog.version("targetSdk").toInt()
     versionCode = 1
     versionName = "1.0"
   }

buildSrc/src/main/java/android-ui-tests.gradle.kts

@@ -9,7 +9,6 @@ plugins {
 configure<TestedExtension> {
   defaultConfig {
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    testInstrumentationRunnerArguments["listener"] = "leakcanary.FailTestOnLeakRunListener"
   }
 
   testOptions {

gradle/libs.versions.toml

@@ -2,15 +2,15 @@
 
 androidTools = "7.4.1"
 
-compileSdk = "31"
-minSdkVersion = "21"
-targetSdk = "30"
+compileSdk = "32"
+minSdk = "21"
+targetSdk = "31"
 
 androidx-activity = "1.3.0"
 androidx-appcompat = "1.3.1"
 androidx-benchmark = "1.1.0-rc03"
 androidx-cardview = "1.0.0"
-androidx-compose = "1.1.0-rc01"
+androidx-compose = "1.2.1"
 androidx-compose-compiler = "1.3.2"
 androidx-constraintlayout = "2.1.2"
 androidx-core = "1.6.0"
@@ -24,7 +24,7 @@ androidx-recyclerview = "1.2.1"
 androidx-room = "2.4.0-alpha04"
 androidx-savedstate = "1.1.0"
 androidx-startup = "1.1.0"
-androidx-test = "1.3.0"
+androidx-test = "1.4.0"
 androidx-test-espresso = "3.3.0"
 androidx-test-junit-ext = "1.1.3"
 androidx-test-truth-ext = "1.4.0"
@@ -64,14 +64,14 @@ mockito-core = "3.3.3"
 mockito-kotlin = "3.2.0"
 
 mockk = "1.11.0"
-robolectric = "4.6.1"
+robolectric = "4.7.3"
 
 rxjava2-android = "2.1.1"
 rxjava2-core = "2.2.21"
 
 squareup-curtains = "1.2.2"
 squareup-cycler = "0.1.9"
-squareup-leakcanary = "2.8.1"
+squareup-leakcanary = "2.10"
 squareup-moshi = "1.13.0"
 squareup-okhttp = "4.9.1"
 squareup-okio = "3.0.0"

samples/compose-samples/src/androidTest/java/com/squareup/sample/compose/hellocompose/HelloComposeTest.kt

@@ -6,12 +6,12 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
 import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
 import com.squareup.workflow1.ui.internal.test.compose.settleForNextRendering
 import com.squareup.workflow1.ui.internal.test.retry
 import kotlinx.coroutines.runBlocking
+import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain

samples/compose-samples/src/androidTest/java/com/squareup/sample/compose/hellocomposebinding/HelloBindingTest.kt

@@ -6,9 +6,9 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
 import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
+import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain

samples/compose-samples/src/androidTest/java/com/squareup/sample/compose/hellocomposeworkflow/HelloComposeWorkflowTest.kt

@@ -6,9 +6,9 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
 import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
+import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain

samples/compose-samples/src/androidTest/java/com/squareup/sample/compose/inlinerendering/InlineRenderingTest.kt

@@ -7,12 +7,12 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
 import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
 import com.squareup.workflow1.ui.internal.test.compose.settleForNextRendering
 import com.squareup.workflow1.ui.internal.test.retry
 import kotlinx.coroutines.runBlocking
+import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain

samples/compose-samples/src/androidTest/java/com/squareup/sample/compose/launcher/SampleLauncherTest.kt

@@ -12,9 +12,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.squareup.sample.compose.R
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
 import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
+import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain

samples/compose-samples/src/androidTest/java/com/squareup/sample/compose/nestedrenderings/NestedRenderingsTest.kt

@@ -10,9 +10,9 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
 import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
+import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain

samples/compose-samples/src/androidTest/java/com/squareup/sample/compose/preview/PreviewTest.kt

@@ -6,9 +6,9 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
 import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
+import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain

samples/compose-samples/src/androidTest/java/com/squareup/sample/compose/textinput/TextInputTest.kt

@@ -10,12 +10,12 @@ import androidx.compose.ui.test.performTextInput
 import androidx.compose.ui.test.performTextReplacement
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
 import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
 import com.squareup.workflow1.ui.internal.test.compose.settleForNextRendering
 import com.squareup.workflow1.ui.internal.test.retry
 import kotlinx.coroutines.runBlocking
+import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain

samples/compose-samples/src/main/AndroidManifest.xml

@@ -9,20 +9,22 @@
       tools:ignore="GoogleAppIndexingWarning,MissingApplicationIcon"
       >
 
-    <activity android:name=".launcher.SampleLauncherActivity">
+    <activity
+        android:name=".launcher.SampleLauncherActivity"
+        android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
         <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
     </activity>
 
-    <activity android:name=".hellocompose.HelloComposeActivity" />
+    <activity android:name=".hellocompose.HelloComposeActivity"/>
     <activity android:name=".hellocomposebinding.HelloBindingActivity"/>
     <activity android:name=".hellocomposeworkflow.HelloComposeWorkflowActivity"/>
     <activity android:name=".inlinerendering.InlineRenderingActivity"/>
     <activity android:name=".nestedrenderings.NestedRenderingsActivity"/>
-    <activity android:name=".preview.PreviewActivity" />
-    <activity android:name=".textinput.TextInputActivity" />
+    <activity android:name=".preview.PreviewActivity"/>
+    <activity android:name=".textinput.TextInputActivity"/>
 
   </application>
 </manifest>

samples/compose-samples/src/main/java/com/squareup/sample/compose/launcher/SampleLauncherApp.kt

@@ -8,6 +8,7 @@ import androidx.compose.foundation.gestures.forEachGesture
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.requiredHeight
 import androidx.compose.foundation.layout.requiredWidth
 import androidx.compose.foundation.lazy.LazyColumn
@@ -27,7 +28,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.PointerEventPass.Initial
-import androidx.compose.ui.input.pointer.consumeDownChange
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.layout.LayoutCoordinates
 import androidx.compose.ui.layout.boundsInRoot
@@ -50,8 +50,8 @@ import com.squareup.sample.compose.R
           Text(stringResource(R.string.app_name))
         })
       }
-    ) {
-      LazyColumn {
+    ) { padding ->
+      LazyColumn(Modifier.padding(padding)) {
         items(samples) {
           SampleItem(it)
         }
@@ -152,7 +152,7 @@ private fun Modifier.disableTouchInput(): Modifier = pointerInput(Unit) {
     awaitPointerEventScope {
       awaitPointerEvent(Initial).let { event ->
         event.changes.forEach { change ->
-          change.consumeDownChange()
+          change.consume()
         }
       }
     }

samples/containers/app-poetry/src/androidTest/java/com/squareup/sample/poetryapp/PoetryAppTest.kt

@@ -7,9 +7,9 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.squareup.sample.container.poetryapp.R
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
 import com.squareup.workflow1.ui.internal.test.inAnyView
+import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain

samples/containers/app-poetry/src/main/AndroidManifest.xml

@@ -9,11 +9,13 @@
       tools:ignore="AllowBackup,GoogleAppIndexingWarning,MissingApplicationIcon"
       >
 
-    <activity android:name="com.squareup.sample.poetryapp.PoetryActivity">
+    <activity
+        android:name="com.squareup.sample.poetryapp.PoetryActivity"
+        android:exported="true">
 
       <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
 
     </activity>

samples/containers/app-raven/src/androidTest/java/com/squareup/sample/ravenapp/RavenAppTest.kt

@@ -6,9 +6,9 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
 import com.squareup.workflow1.ui.internal.test.inAnyView
+import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain

samples/containers/app-raven/src/main/AndroidManifest.xml

@@ -9,11 +9,13 @@
       tools:ignore="AllowBackup,GoogleAppIndexingWarning,MissingApplicationIcon"
       >
 
-    <activity android:name="com.squareup.sample.ravenapp.RavenActivity">
+    <activity
+        android:name="com.squareup.sample.ravenapp.RavenActivity"
+        android:exported="true">
 
       <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
 
     </activity>

samples/containers/hello-back-button/src/androidTest/java/com/squareup/sample/hellobackbutton/HelloBackButtonEspressoTest.kt

@@ -8,11 +8,11 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
 import com.squareup.workflow1.ui.internal.test.actuallyPressBack
 import com.squareup.workflow1.ui.internal.test.inAnyView
 import com.squareup.workflow1.ui.internal.test.retryBlocking
+import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain

samples/containers/hello-back-button/src/main/AndroidManifest.xml

@@ -9,11 +9,13 @@
       tools:ignore="GoogleAppIndexingWarning,MissingApplicationIcon"
       >
 
-    <activity android:name=".HelloBackButtonActivity">
+    <activity
+        android:name=".HelloBackButtonActivity"
+        android:exported="true">
 
       <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
 
     </activity>

samples/dungeon/app/src/androidTest/java/com/squareup/sample/dungeon/DungeonAppTest.kt

@@ -6,9 +6,9 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
 import com.squareup.workflow1.ui.internal.test.inAnyView
+import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain

samples/dungeon/app/src/main/AndroidManifest.xml

@@ -12,6 +12,7 @@
 
     <activity
         android:name="com.squareup.sample.dungeon.DungeonActivity"
+        android:exported="true"
         android:screenOrientation="portrait">
 
       <intent-filter>

samples/hello-workflow-fragment/src/androidTest/java/com/squareup/sample/helloworkflowfragment/HelloWorkflowFragmentAppTest.kt

@@ -7,9 +7,9 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
 import com.squareup.workflow1.ui.internal.test.inAnyView
+import leakcanary.DetectLeaksAfterTestSuccess
 import org.hamcrest.Matchers.containsString
 import org.junit.Rule
 import org.junit.Test

samples/hello-workflow-fragment/src/main/AndroidManifest.xml

@@ -3,12 +3,14 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application
+      android:allowBackup="true"
       android:label="@string/app_name"
       android:theme="@style/AppTheme"
-      android:allowBackup="true"
       >
 
-    <activity android:name="com.squareup.sample.helloworkflowfragment.HelloWorkflowFragmentActivity">
+    <activity
+        android:name="com.squareup.sample.helloworkflowfragment.HelloWorkflowFragmentActivity"
+        android:exported="true">
 
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>

samples/hello-workflow/src/androidTest/java/com/squareup/sample/helloworkflow/HelloWorkflowAppTest.kt

@@ -7,9 +7,9 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.internal.test.DetectLeaksAfterTestSuccess
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
 import com.squareup.workflow1.ui.internal.test.inAnyView
+import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain

samples/hello-workflow/src/main/AndroidManifest.xml

@@ -9,11 +9,13 @@
       tools:ignore="GoogleAppIndexingWarning,MissingApplicationIcon"
       >
 
-    <activity android:name="com.squareup.sample.helloworkflow.HelloWorkflowActivity">
+    <activity
+        android:name="com.squareup.sample.helloworkflow.HelloWorkflowActivity"
+        android:exported="true">
 
       <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
 
     </activity>