Upgrade Compose to beta02.

.github/workflows/android.yml

@@ -15,11 +15,6 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
-      - uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          key: gradle-${{ runner.os }}-${{ hashFiles('buildSrc/**') }}-${{ hashFiles('**/*.gradle*') }}
-          restore-keys: gradle-${{ runner.os }}-
       - run: ./gradlew build
 
   ui-tests:
@@ -40,11 +35,6 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
-      - uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          key: gradle-${{ runner.os }}-${{ hashFiles('buildSrc/**') }}-${{ hashFiles('**/*.gradle*') }}
-          restore-keys: gradle-${{ runner.os }}-
       - uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ matrix.api-level }}

build.gradle.kts

@@ -42,9 +42,7 @@ subprojects {
       apiVersion = "1.3"
 
       freeCompilerArgs = listOf(
-          "-Xopt-in=kotlin.RequiresOptIn",
-          "-Xallow-jvm-ir-dependencies",
-          "-Xskip-prerelease-check"
+          "-Xopt-in=kotlin.RequiresOptIn"
       )
     }
   }

buildSrc/src/main/java/Dependencies.kt

@@ -15,33 +15,21 @@ object Dependencies {
   val androidGradlePlugin = "com.android.tools.build:gradle:${Versions.agp}"
 
   object AndroidX {
-    const val activity = "androidx.activity:activity:1.1.0"
-    const val annotations = "androidx.annotation:annotation:1.1.0"
-    const val appcompat = "androidx.appcompat:appcompat:1.1.0"
-    const val constraintLayout = "androidx.constraintlayout:constraintlayout:1.1.3"
-    const val fragment = "androidx.fragment:fragment:1.2.2"
+    const val appcompat = "androidx.appcompat:appcompat:1.3.0-beta01"
 
     // Note that we're not using the actual androidx material dep yet, it's still alpha.
     const val material = "com.google.android.material:material:1.1.0"
-    const val recyclerview = "androidx.recyclerview:recyclerview:1.1.0"
-
-    // Note that we are *not* using lifecycle-viewmodel-savedstate, which at this
-    // writing is still in beta and still fixing bad bugs. Probably we'll never bother to,
-    // it doesn't really add value for us.
-    const val savedstate = "androidx.savedstate:savedstate:1.0.0"
-    const val transition = "androidx.transition:transition:1.3.1"
-    const val viewbinding = "androidx.databinding:viewbinding:3.6.1"
 
     const val junitExt = "androidx.test.ext:junit:1.1.1"
   }
 
   object Compose {
+    const val activity = "androidx.activity:activity-compose:1.3.0-alpha02"
     val foundation = "androidx.compose.foundation:foundation:${Versions.compose}"
     val icons = "androidx.compose.material:material-icons-extended:${Versions.compose}"
     val material = "androidx.compose.material:material:${Versions.compose}"
-    val savedstate = "androidx.compose.runtime:runtime-saved-instance-state:${Versions.compose}"
-    val test = "androidx.ui:ui-test:${Versions.compose}"
-    val tooling = "androidx.ui:ui-tooling:${Versions.compose}"
+    val test = "androidx.compose.ui:ui-test-junit4:${Versions.compose}"
+    val tooling = "androidx.compose.ui:ui-tooling:${Versions.compose}"
     val util = "androidx.compose.ui:ui-util:${Versions.compose}"
   }
 
@@ -50,13 +38,9 @@ object Dependencies {
       "org.jetbrains.kotlinx:binary-compatibility-validator:0.2.1"
     val dokka = "org.jetbrains.dokka:dokka-gradle-plugin:${Versions.dokka}"
     val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
-    val reflect = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}"
 
     object Test {
       const val common = "org.jetbrains.kotlin:kotlin-test-common"
-      const val annotations = "org.jetbrains.kotlin:kotlin-test-annotations-common"
-      const val jdk = "org.jetbrains.kotlin:kotlin-test-junit"
-      const val mockito = "com.nhaarman:mockito-kotlin-kt1.1:1.6.0"
     }
   }
 

buildSrc/src/main/java/default-android-config.gradle.kts

@@ -29,4 +29,9 @@ configure<BaseExtension> {
     kotlinCompilerVersion = Versions.kotlin
     kotlinCompilerExtensionVersion = Versions.compose
   }
+
+  packagingOptions {
+    excludes += "META-INF/AL2.0"
+    excludes += "META-INF/LGPL2.1"
+  }
 }

buildSrc/src/main/resources/versions.properties

@@ -2,6 +2,6 @@
 releaseVersion=0.7.0
 
 androidGradlePluginVersion=4.2.0-alpha15
-kotlinVersion=1.4.10
+kotlinVersion=1.4.31
 dokkaVersion=1.4.0
-composeDevVersion=alpha05
+composeDevVersion=beta02

compose-backstack-viewer/build.gradle.kts

@@ -22,7 +22,6 @@ dependencies {
   implementation(Dependencies.Compose.icons)
   implementation(Dependencies.Compose.foundation)
   implementation(Dependencies.Compose.material)
-  implementation(Dependencies.Compose.savedstate)
   implementation(Dependencies.Compose.tooling)
 
   testImplementation(Dependencies.Test.junit)

compose-backstack-viewer/src/androidTest/java/com/zachklipp/compose/backstack/viewer/BackstackViewerTest.kt

@@ -1,15 +1,14 @@
 package com.zachklipp.compose.backstack.viewer
 
+import androidx.compose.ui.test.assertHasClickAction
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsNotSelected
+import androidx.compose.ui.test.assertIsSelected
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.ui.test.assertHasClickAction
-import androidx.ui.test.assertIsDisplayed
-import androidx.ui.test.assertIsNotSelected
-import androidx.ui.test.assertIsSelected
-import androidx.ui.test.createComposeRule
-import androidx.ui.test.onNodeWithSubstring
-import androidx.ui.test.onNodeWithTag
-import androidx.ui.test.onNodeWithText
-import androidx.ui.test.performClick
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -27,14 +26,14 @@ class BackstackViewerTest {
     }
 
     compose.onNodeWithText("Slide Transition").assertIsDisplayed()
-    compose.onNodeWithSubstring("Slow animations").assertIsDisplayed()
+    compose.onNodeWithText("Slow animations", substring = true).assertIsDisplayed()
 
     compose.onNodeWithText("one").assertIsSelected()
     compose.onNodeWithText("one, two").assertIsNotSelected()
     compose.onNodeWithText("one, two, three").assertIsNotSelected()
 
     compose.onNodeWithText("Screen one").assertIsDisplayed()
-    compose.onNodeWithSubstring("Counter:").assertIsDisplayed()
+    compose.onNodeWithText("Counter:", substring = true).assertIsDisplayed()
   }
 
   @Test

compose-backstack-viewer/src/main/java/com/zachklipp/compose/backstack/viewer/AppModel.kt

@@ -4,8 +4,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.savedinstancestate.listSaver
-import androidx.compose.runtime.savedinstancestate.rememberSavedInstanceState
+import androidx.compose.runtime.saveable.listSaver
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import com.zachklipp.compose.backstack.BackstackTransition
 
@@ -51,14 +51,14 @@ internal class AppModel private constructor(
 
   companion object {
     /**
-     * Creates an instance of [AppModel] and saves it using [rememberSavedInstanceState].
+     * Creates an instance of [AppModel] and saves it using [rememberSaveable].
      */
     @Composable
     fun create(
       namedTransitions: List<Pair<String, BackstackTransition>>,
       prefabBackstacks: List<List<String>>
     ): AppModel {
-      return rememberSavedInstanceState(saver = saver(namedTransitions, prefabBackstacks)) {
+      return rememberSaveable(saver = saver(namedTransitions, prefabBackstacks)) {
         AppModel(namedTransitions, prefabBackstacks)
       }
     }

compose-backstack-viewer/src/main/java/com/zachklipp/compose/backstack/viewer/AppScreen.kt

@@ -3,24 +3,24 @@
 package com.zachklipp.compose.backstack.viewer
 
 import android.os.Handler
-import androidx.compose.foundation.Icon
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.material.FloatingActionButton
+import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.Scaffold
+import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Menu
 import androidx.compose.runtime.*
-import androidx.compose.runtime.savedinstancestate.savedInstanceState
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
-import androidx.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 
 internal fun addTestTag(screen: String) = "add screen to $screen"
 internal fun backTestTag(screen: String) = "go back from $screen"
@@ -44,42 +44,44 @@ internal fun AppScreen(
         TopAppBar(
             navigationIcon = {
               IconButton(onClick = onBack, modifier = Modifier.testTag(backTestTag(name))) {
-                Icon(navigationIcon)
+                Icon(navigationIcon, contentDescription = "Back")
               }
             },
             title = { Text("Screen $name") })
       },
       floatingActionButton = {
         FloatingActionButton(onClick = onAdd, modifier = Modifier.testTag(addTestTag(name))) {
-          Icon(Icons.Default.Add)
+          Icon(Icons.Default.Add, contentDescription = "Add screen")
         }
       }
   ) {
     Text(
-        text = "Counter: ${Counter(200)}",
-        modifier = Modifier.fillMaxSize().wrapContentSize(Alignment.Center)
+      text = "Counter: ${rememberCounter(200)}",
+      modifier = Modifier
+        .fillMaxSize()
+        .wrapContentSize(Alignment.Center)
     )
   }
 }
 
 @Suppress("SameParameterValue")
 @Composable
-private fun Counter(periodMs: Long): Int = key(periodMs) {
+private fun rememberCounter(periodMs: Long): Int = key(periodMs) {
   // If the screen is temporarily removed from the composition, the counter will effectively
   // be "paused": it will stop incrementing, but will resume from its last value when restored to
   // the composition.
-  var value by savedInstanceState { 0 }
-  onActive {
+  var value by rememberSaveable { mutableStateOf(0) }
+  DisposableEffect(periodMs) {
     val mainHandler = Handler()
     var disposed = false
-    onDispose { disposed = true }
     fun schedule() {
       mainHandler.postDelayed({
         value++
         if (!disposed) schedule()
       }, periodMs)
     }
     schedule()
+    onDispose { disposed = true }
   }
   return@key value
 }