Merge pull request android#435 from android/dev_beta02

[All] Update to beta02
newshqyang · Mar 12, 2021 · 651b6dd · 651b6dd
2 parents 92f2f16 + 59e6fe6
commit 651b6dd
Show file tree

Hide file tree

Showing 20 changed files with 153 additions and 131 deletions.
diff --git a/Crane/app/build.gradle b/Crane/app/build.gradle
@@ -110,6 +110,7 @@ dependencies {
 
     implementation Libs.Accompanist.coil
     implementation Libs.AndroidX.Activity.activityCompose
+    implementation Libs.AndroidX.appcompat
     implementation Libs.AndroidX.Compose.runtime
     implementation Libs.AndroidX.Compose.runtimeLivedata
     implementation Libs.AndroidX.Compose.foundation

diff --git a/Crane/app/src/androidTest/java/androidx/compose/samples/crane/home/HomeTest.kt b/Crane/app/src/androidTest/java/androidx/compose/samples/crane/home/HomeTest.kt
@@ -23,7 +23,6 @@ import androidx.compose.ui.test.performClick
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 
@@ -43,7 +42,6 @@ class HomeTest {
         }
     }
 
-    @Ignore("Swipeable bug makes the app crash: https://issuetracker.google.com/180488877")
     @Test
     fun home_navigatesToAllScreens() {
         composeTestRule.onNodeWithText("Explore Flights by Destination").assertIsDisplayed()

diff --git a/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt b/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt
@@ -21,7 +21,7 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha08"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha09"
     const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}"
 
     object GoogleMaps {
@@ -30,12 +30,12 @@ object Libs {
     }
 
     object Accompanist {
-        private const val version = "0.6.0"
+        private const val version = "0.6.2"
         const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
     }
 
     object Kotlin {
-        private const val version = "1.4.30"
+        private const val version = "1.4.31"
         const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
         const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
         const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -49,12 +49,14 @@ object Libs {
 
     object AndroidX {
         object Activity {
-            const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha03"
+            const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha04"
         }
 
+        const val appcompat = "androidx.appcompat:appcompat:1.3.0-beta01"
+
         object Compose {
             const val snapshot = ""
-            private const val version = "1.0.0-beta01"
+            private const val version = "1.0.0-beta02"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
@@ -68,7 +70,7 @@ object Libs {
 
         object Lifecycle {
             private const val version = "2.3.0"
-            const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha02"
+            const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
             const val viewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
         }
 

diff --git a/JetNews/app/build.gradle b/JetNews/app/build.gradle
@@ -91,13 +91,13 @@ dependencies {
     implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
 
     implementation 'androidx.appcompat:appcompat:1.3.0-beta01'
-    implementation 'androidx.activity:activity-ktx:1.2.0'
-    implementation 'androidx.core:core-ktx:1.5.0-beta01'
-    implementation "androidx.activity:activity-compose:1.3.0-alpha03"
+    implementation 'androidx.activity:activity-ktx:1.2.1'
+    implementation 'androidx.core:core-ktx:1.5.0-beta03'
+    implementation "androidx.activity:activity-compose:1.3.0-alpha04"
 
     implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha02"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
 
     androidTestImplementation 'androidx.test:rules:1.3.0'
     androidTestImplementation 'androidx.test:runner:1.3.0'

diff --git a/JetNews/build.gradle b/JetNews/build.gradle
@@ -15,8 +15,8 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.4.30'
-    ext.compose_version = '1.0.0-beta01'
+    ext.kotlin_version = '1.4.31'
+    ext.compose_version = '1.0.0-beta02'
     ext.coroutines_version = '1.4.2'
 
     repositories {
@@ -25,7 +25,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0-alpha08'
+        classpath 'com.android.tools.build:gradle:7.0.0-alpha09'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/Jetcaster/build.gradle b/Jetcaster/build.gradle
@@ -42,10 +42,7 @@ subprojects {
         // Jetpack Compose SNAPSHOTs
         if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
             maven { url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/repository/" }
-            maven { url "http://androidx.dev/storage/repository/androidx/constraintlayout" }
         }
-
-        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
     }
 
     apply plugin: 'com.diffplug.spotless'

diff --git a/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt b/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt
@@ -21,19 +21,19 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha08"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha09"
     const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
 
     const val material = "com.google.android.material:material:1.1.0"
 
     object Accompanist {
-        private const val version = "0.6.0"
+        private const val version = "0.6.2"
         const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
         const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
     }
 
     object Kotlin {
-        private const val version = "1.4.30"
+        private const val version = "1.4.31"
         const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
         const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
         const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -61,10 +61,10 @@ object Libs {
         const val appcompat = "androidx.appcompat:appcompat:1.2.0"
         const val palette = "androidx.palette:palette:1.0.0"
 
-        const val coreKtx = "androidx.core:core-ktx:1.5.0-beta01"
+        const val coreKtx = "androidx.core:core-ktx:1.5.0-beta03"
 
         object Activity {
-            const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha03"
+            const val activityCompose = "androidx.activity:activity-compose:1.3.0-alpha04"
         }
 
         object Constraint {
@@ -73,7 +73,7 @@ object Libs {
 
         object Compose {
             private const val snapshot = ""
-            private const val version = "1.0.0-beta01"
+            private const val version = "1.0.0-beta02"
 
             @get:JvmStatic
             val snapshotUrl: String
@@ -92,7 +92,7 @@ object Libs {
 
         object Lifecycle {
             private const val version = "2.3.0-beta01"
-            const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha02"
+            const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
             const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
         }
 

diff --git a/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/ConversationTest.kt b/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/ConversationTest.kt
@@ -31,6 +31,7 @@ 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.ConversationUiState
 import com.example.compose.jetchat.conversation.LocalBackPressedDispatcher
 import com.example.compose.jetchat.data.exampleUiState
 import com.example.compose.jetchat.theme.JetchatTheme
@@ -65,7 +66,7 @@ class ConversationTest {
             ) {
                 JetchatTheme(isDarkTheme = themeIsDark.collectAsState(false).value) {
                     ConversationContent(
-                        uiState = exampleUiState,
+                        uiState = conversationTestUiState,
                         navigateToProfile = { },
                         onNavIconPressed = { }
                     )
@@ -163,3 +164,12 @@ class ConversationTest {
             )
             .performClick()
 }
+
+/**
+ * Make the list of messages longer so the test makes sense on tablets.
+ */
+private val conversationTestUiState = ConversationUiState(
+    initialMessages = (exampleUiState.messages.plus(exampleUiState.messages)),
+    channelName = "#composers",
+    channelMembers = 42
+)