Updates to alpha12, re-enables tests

Author: JoseAlcerreca

Jetchat/app/build.gradle

@@ -119,4 +119,8 @@ dependencies {
     androidTestImplementation Libs.AndroidX.Test.rules
     androidTestImplementation Libs.AndroidX.Test.Ext.junit
     androidTestImplementation Libs.AndroidX.Compose.uiTest
+
+    // FIXME: Temporary for alpha12
+    androidTestImplementation Libs.AndroidX.Activity.activityCompose
+
 }

Jetchat/app/src/androidTest/java/com/example/compose/jetchat/ConversationTest.kt

@@ -16,6 +16,9 @@
 
 package com.example.compose.jetchat
 
+import androidx.activity.ComponentActivity
+import androidx.compose.runtime.Providers
+import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.center
@@ -26,22 +29,25 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performGesture
 import androidx.compose.ui.test.swipe
+import com.example.compose.jetchat.conversation.ConversationContent
 import com.example.compose.jetchat.conversation.ConversationTestTag
+import com.example.compose.jetchat.conversation.LocalBackPressedDispatcher
+import com.example.compose.jetchat.data.exampleUiState
+import com.example.compose.jetchat.theme.JetchatTheme
+import dev.chrisbanes.accompanist.insets.LocalWindowInsets
 import dev.chrisbanes.accompanist.insets.WindowInsets
 import kotlinx.coroutines.flow.MutableStateFlow
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 
 /**
  * Checks that the features in the Conversation screen work as expected.
  */
-@Ignore("b/nnnnnnn Sync problems related to AndroidView, app never idle")
 class ConversationTest {
 
     @get:Rule
-    val composeTestRule = createAndroidComposeRule<NavActivity>()
+    val composeTestRule = createAndroidComposeRule<ComponentActivity>()
 
     private val themeIsDark = MutableStateFlow(false)
 
@@ -50,22 +56,22 @@ class ConversationTest {
         // Provide empty insets. We can modify this value as necessary
         val windowInsets = WindowInsets()
 
-//        // Launch the conversation screen
-//        composeTestRule.setContent {
-//            val onBackPressedDispatcher = composeTestRule.activity.onBackPressedDispatcher
-//            Providers(
-//                AmbientBackPressedDispatcher provides onBackPressedDispatcher,
-//                LocalWindowInsets provides windowInsets
-//            ) {
-//                JetchatTheme(isDarkTheme = themeIsDark.collectAsState(false).value) {
-//                    ConversationContent(
-//                        uiState = exampleUiState,
-//                        navigateToProfile = { },
-//                        onNavIconPressed = { }
-//                    )
-//                }
-//            }
-//        }
+        // Launch the conversation screen
+        composeTestRule.setContent {
+            val onBackPressedDispatcher = composeTestRule.activity.onBackPressedDispatcher
+            Providers(
+                LocalBackPressedDispatcher provides onBackPressedDispatcher,
+                LocalWindowInsets provides windowInsets
+            ) {
+                JetchatTheme(isDarkTheme = themeIsDark.collectAsState(false).value) {
+                    ConversationContent(
+                        uiState = exampleUiState,
+                        navigateToProfile = { },
+                        onNavIconPressed = { }
+                    )
+                }
+            }
+        }
     }
 
     @Test

Jetchat/app/src/androidTest/java/com/example/compose/jetchat/UserInputTest.kt

@@ -33,9 +33,9 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTextInput
 import androidx.test.espresso.Espresso
-import com.example.compose.jetchat.conversation.AmbientBackPressedDispatcher
 import com.example.compose.jetchat.conversation.ConversationContent
 import com.example.compose.jetchat.conversation.KeyboardShownKey
+import com.example.compose.jetchat.conversation.LocalBackPressedDispatcher
 import com.example.compose.jetchat.data.exampleUiState
 import com.example.compose.jetchat.theme.JetchatTheme
 import dev.chrisbanes.accompanist.insets.LocalWindowInsets
@@ -65,7 +65,7 @@ class UserInputTest {
         val onBackPressedDispatcher = composeTestRule.activity.onBackPressedDispatcher
         composeTestRule.setContent {
             Providers(
-                AmbientBackPressedDispatcher provides onBackPressedDispatcher,
+                LocalBackPressedDispatcher provides onBackPressedDispatcher,
                 LocalWindowInsets provides windowInsets,
             ) {
                 JetchatTheme {

Jetchat/app/src/main/java/com/example/compose/jetchat/NavActivity.kt

@@ -34,8 +34,8 @@ import androidx.core.view.WindowCompat
 import androidx.navigation.findNavController
 import androidx.viewbinding.ViewBinding
 import com.example.compose.jetchat.components.JetchatScaffold
-import com.example.compose.jetchat.conversation.AmbientBackPressedDispatcher
 import com.example.compose.jetchat.conversation.BackPressHandler
+import com.example.compose.jetchat.conversation.LocalBackPressedDispatcher
 import com.example.compose.jetchat.databinding.ContentMainBinding
 import dev.chrisbanes.accompanist.insets.ProvideWindowInsets
 
@@ -56,7 +56,7 @@ class NavActivity : AppCompatActivity() {
             // Provide WindowInsets to our content. We don't want to consume them, so that
             // they keep being pass down the view hierarchy (since we're using fragments).
             ProvideWindowInsets(consumeWindowInsets = false) {
-                Providers(AmbientBackPressedDispatcher provides this.onBackPressedDispatcher) {
+                Providers(LocalBackPressedDispatcher provides this.onBackPressedDispatcher) {
                     val scaffoldState = rememberScaffoldState()
 
                     val openDrawerEvent = viewModel.drawerShouldBeOpened.observeAsState()

Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/BackHandler.kt

@@ -19,14 +19,15 @@ package com.example.compose.jetchat.conversation
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.OnBackPressedDispatcher
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocal
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.staticCompositionLocalOf
 
 /**
- * This [Composable] can be used with a [AmbientBackPressedDispatcher] to intercept a back press.
+ * This [Composable] can be used with a [LocalBackPressedDispatcher] to intercept a back press.
  *
  * @param onBackPressed (Event) What to do when back is intercepted
  *
@@ -45,7 +46,7 @@ fun BackPressHandler(onBackPressed: () -> Unit) {
         }
     }
 
-    val backDispatcher = AmbientBackPressedDispatcher.current
+    val backDispatcher = LocalBackPressedDispatcher.current
 
     // Whenever there's a new dispatcher set up the callback
     DisposableEffect(backDispatcher) {
@@ -58,13 +59,13 @@ fun BackPressHandler(onBackPressed: () -> Unit) {
 }
 
 /**
- * This [Ambient] is used to provide an [OnBackPressedDispatcher]:
+ * This [CompositionLocal] is used to provide an [OnBackPressedDispatcher]:
  *
  * ```
- * Providers(AmbientBackPressedDispatcher provides requireActivity().onBackPressedDispatcher) { }
+ * Providers(LocalBackPressedDispatcher provides requireActivity().onBackPressedDispatcher) { }
  * ```
  *
  * and setting up the callbacks with [BackPressHandler].
  */
-val AmbientBackPressedDispatcher =
+val LocalBackPressedDispatcher =
     staticCompositionLocalOf<OnBackPressedDispatcher> { error("No Back Dispatcher provided") }

Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/ConversationFragment.kt

@@ -59,7 +59,7 @@ class ConversationFragment : Fragment() {
 
         setContent {
             Providers(
-                AmbientBackPressedDispatcher provides requireActivity().onBackPressedDispatcher,
+                LocalBackPressedDispatcher provides requireActivity().onBackPressedDispatcher,
                 LocalWindowInsets provides windowInsets,
             ) {
                 JetchatTheme {

Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt

@@ -17,7 +17,7 @@
 package com.example.compose.jetchat.buildsrc
 
 object Versions {
-    const val ktlint = "0.39.0"
+    const val ktlint = "0.40.0"
 }
 
 object Libs {
@@ -43,7 +43,7 @@ object Libs {
     }
 
     object Accompanist {
-        private const val version = "0.5.1.compose-7123292-SNAPSHOT"
+        private const val version = "0.5.1"
         const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
     }
 
@@ -52,12 +52,12 @@ object Libs {
         const val coreKtx = "androidx.core:core-ktx:1.5.0-beta01"
 
         object Activity {
-            const val activityCompose = "androidx.activity:activity-compose:1.3.0-SNAPSHOT"
+            const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha02"
         }
 
         object Compose {
-            const val snapshot = "7123292"
-            const val version = "1.0.0-SNAPSHOT"
+            const val snapshot = ""
+            const val version = "1.0.0-alpha12"
 
             const val foundation = "androidx.compose.foundation:foundation:$version"
             const val layout = "androidx.compose.foundation:foundation-layout:$version"
@@ -79,29 +79,30 @@ object Libs {
         }
 
         object Test {
-            private const val version = "1.2.0"
+            private const val version = "1.3.0"
             const val core = "androidx.test:core:$version"
             const val rules = "androidx.test:rules:$version"
 
             object Ext {
-                private const val version = "1.1.2-rc01"
+                private const val version = "1.1.2"
                 const val junit = "androidx.test.ext:junit-ktx:$version"
             }
 
-            const val espressoCore = "androidx.test.espresso:espresso-core:3.2.0"
+            const val espressoCore = "androidx.test.espresso:espresso-core:3.3.0"
         }
 
         object Lifecycle {
             private const val version = "2.3.0-beta01"
             const val extensions = "androidx.lifecycle:lifecycle-extensions:$version"
             const val livedata = "androidx.lifecycle:lifecycle-livedata-ktx:$version"
             const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
-            const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT"
+            const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha01"
         }
     }
 }
 
 object Urls {
-    const val composeSnapshotRepo = "https://storage.googleapis.com/temp-androidx-snapshot.appspot.com/7123292/"
+    const val composeSnapshotRepo = "https://androidx.dev/snapshots/builds/" +
+        "${Libs.AndroidX.Compose.snapshot}/artifacts/repository/"
     const val accompanistSnapshotRepo = "https://oss.sonatype.org/content/repositories/snapshots"
 }

Jetchat/gradle/wrapper/gradle-wrapper.properties

@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip

Owl/app/build.gradle

@@ -96,7 +96,6 @@ dependencies {
     implementation Libs.AndroidX.Compose.animation
     implementation Libs.AndroidX.Compose.iconsExtended
     implementation Libs.AndroidX.Compose.tooling
-    implementation "org.jetbrains.kotlin:kotlin-reflect:1.4.30"
 
     implementation Libs.Accompanist.coil
     implementation Libs.Accompanist.insets