Upgrade various dependencies, mostly androidx.

But not test dependencies, b/c LeakCanary's hacky test runner breaks, and the
[non-hacky alternative](square/leakcanary#2244) hasn't
been released yet.

Author: rjrjr

buildSrc/src/main/java/Dependencies.kt

@@ -13,27 +13,27 @@ object Dependencies {
   const val android_gradle_plugin = "com.android.tools.build:gradle:7.0.0"
 
   object AndroidX {
-    const val activity = "androidx.activity:activity:1.3.0"
-    const val activityKtx = "androidx.activity:activity-ktx:1.3.0"
-    const val appcompat = "androidx.appcompat:appcompat:1.3.1"
+    const val activity = "androidx.activity:activity:1.4.0"
+    const val activityKtx = "androidx.activity:activity-ktx:1.4.0"
+    const val appcompat = "androidx.appcompat:appcompat:1.4.1"
 
     object Compose {
-      const val activity = "androidx.activity:activity-compose:1.3.1"
+      const val activity = "androidx.activity:activity-compose:1.4.0"
       const val foundation = "androidx.compose.foundation:foundation:1.1.0-rc01"
       const val material = "androidx.compose.material:material:1.1.0-rc01"
       const val tooling = "androidx.compose.ui:ui-tooling:1.1.0-rc01"
       const val ui = "androidx.compose.ui:ui:1.1.0-rc01"
     }
 
-    const val constraint_layout = "androidx.constraintlayout:constraintlayout:2.1.0"
-    const val fragment = "androidx.fragment:fragment:1.3.6"
-    const val fragmentKtx = "androidx.fragment:fragment-ktx:1.3.6"
+    const val constraint_layout = "androidx.constraintlayout:constraintlayout:2.1.2"
+    const val fragment = "androidx.fragment:fragment:1.4.0"
+    const val fragmentKtx = "androidx.fragment:fragment-ktx:1.4.0"
     const val gridlayout = "androidx.gridlayout:gridlayout:1.0.0"
 
     object Lifecycle {
-      const val ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.3.1"
-      const val viewModel = "androidx.lifecycle:lifecycle-viewmodel:2.3.1"
-      const val viewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1"
+      const val ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.4.0"
+      const val viewModel = "androidx.lifecycle:lifecycle-viewmodel:2.4.0"
+      const val viewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0"
       const val viewModelSavedState = "androidx.lifecycle:lifecycle-viewmodel-savedstate:1.1.0"
     }
 
@@ -53,7 +53,7 @@ object Dependencies {
 
   // Required for Dungeon Crawler sample.
   const val desugar_jdk_libs = "com.android.tools:desugar_jdk_libs:1.1.5"
-  const val leakcanary = "com.squareup.leakcanary:leakcanary-android:2.7"
+  const val leakcanary = "com.squareup.leakcanary:leakcanary-android:2.8.1"
   const val radiography = "com.squareup.radiography:radiography:2.4.0"
   const val rxandroid2 = "io.reactivex.rxjava2:rxandroid:2.1.1"
   const val seismic = "com.squareup:seismic:1.0.2"
@@ -122,11 +122,14 @@ object Dependencies {
     const val intellij = "org.jetbrains:annotations:19.0.0"
   }
 
+  // These are slightly stale. Upgrading them breaks LeakCanary, and the
+  // fix for that requires https://github.com/square/leakcanary/pull/2244
+  // which isn't released yet.
   object Test {
     object AndroidX {
       const val compose = "androidx.compose.ui:ui-test-junit4:1.0.1"
       const val core = "androidx.test:core:1.3.0"
-      const val lifecycle = "androidx.lifecycle:lifecycle-runtime-testing:2.3.1"
+      const val lifecycle = "androidx.lifecycle:lifecycle-runtime-testing:2.4.0"
 
       object Espresso {
         const val core = "androidx.test.espresso:espresso-core:3.3.0"

workflow-ui/container-android/src/main/java/com/squareup/workflow1/ui/modal/ModalContainer.kt

@@ -11,15 +11,14 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.widget.FrameLayout
+import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.Lifecycle.Event.ON_DESTROY
-import androidx.lifecycle.LifecycleObserver
-import androidx.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.LifecycleOwner
 import com.squareup.workflow1.ui.Compatible
 import com.squareup.workflow1.ui.ViewEnvironment
-import com.squareup.workflow1.ui.androidx.WorkflowLifecycleOwner
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.WorkflowViewStub
+import com.squareup.workflow1.ui.androidx.WorkflowLifecycleOwner
 import com.squareup.workflow1.ui.backstack.withBackStackStateKeyPrefix
 import com.squareup.workflow1.ui.compatible
 
@@ -79,19 +78,21 @@ public abstract class ModalContainer<ModalRenderingT : Any> @JvmOverloads constr
 
             dialogView.addOnAttachStateChangeListener(
               object : OnAttachStateChangeListener {
-                val onDestroy = OnDestroy { ref.dismiss() }
+                val dismissOnDestroy = object : DefaultLifecycleObserver {
+                  override fun onDestroy(owner: LifecycleOwner) = ref.dismiss()
+                }
                 var lifecycle: Lifecycle? = null
                 override fun onViewAttachedToWindow(v: View) {
                   // Note this is a different lifecycle than the WorkflowLifecycleOwner – it will
                   // probably be the owning AppCompatActivity.
                   lifecycle = parentLifecycleOwner?.lifecycle
                   // Android makes a lot of logcat noise if it has to close the window for us. :/
                   // https://github.com/square/workflow/issues/51
-                  lifecycle?.addObserver(onDestroy)
+                  lifecycle?.addObserver(dismissOnDestroy)
                 }
 
                 override fun onViewDetachedFromWindow(v: View) {
-                  lifecycle?.removeObserver(onDestroy)
+                  lifecycle?.removeObserver(dismissOnDestroy)
                   lifecycle = null
                 }
               }
@@ -246,10 +247,5 @@ public abstract class ModalContainer<ModalRenderingT : Any> @JvmOverloads constr
   }
 }
 
-private class OnDestroy(private val block: () -> Unit) : LifecycleObserver {
-  @OnLifecycleEvent(ON_DESTROY)
-  fun onDestroy() = block()
-}
-
 private val Dialog.decorView: View?
   get() = window?.decorView

workflow-ui/core-android/build.gradle.kts

@@ -27,6 +27,8 @@ dependencies {
   implementation(Dependencies.AndroidX.activity)
   implementation(Dependencies.AndroidX.fragment)
   implementation(Dependencies.AndroidX.Lifecycle.ktx)
+  implementation(Dependencies.AndroidX.Lifecycle.viewModel)
+  implementation(Dependencies.AndroidX.Lifecycle.viewModelKtx)
   implementation(Dependencies.AndroidX.savedstate)
   implementation(Dependencies.Kotlin.Coroutines.android)
   implementation(Dependencies.Kotlin.Coroutines.core)
@@ -41,6 +43,5 @@ dependencies {
   testImplementation(Dependencies.Test.robolectric)
 
   androidTestImplementation(Dependencies.AndroidX.appcompat)
-  androidTestImplementation(Dependencies.AndroidX.Lifecycle.viewModel)
   androidTestImplementation(Dependencies.Test.truth)
 }