Merge branch 'dev_alpha06' into mv/crane_alpha06

Author: manuelvicnt

Rally/app/src/androidTest/java/com/example/compose/rally/AnimatingCircleTests.kt

@@ -37,12 +37,14 @@ import org.junit.Test
  * For assertions, a simple screenshot testing framework is used. It requires SDK 26+ and to
  * be run on a device with 420dpi, as that the density used to generate the golden images
  * present in androidTest/assets. It runs bitmap comparisons on device.
+ *
+ * Note that different systems can produce slightly different screenshots making the test fail.
  */
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
 class AnimatingCircleTests {
 
     @get:Rule
-    val composeTestRule = createComposeRule(disableTransitions = false)
+    val composeTestRule = createComposeRule()
 
     @Test
     fun circleAnimation_idle_screenshot() {

Rally/app/src/main/java/com/example/compose/rally/ui/components/CommonUi.kt

@@ -16,7 +16,6 @@
 
 package com.example.compose.rally.ui.components
 
-import androidx.compose.foundation.Icon
 import androidx.compose.foundation.Text
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -29,6 +28,7 @@ import androidx.compose.foundation.layout.preferredSize
 import androidx.compose.foundation.layout.preferredWidth
 import androidx.compose.material.AmbientEmphasisLevels
 import androidx.compose.material.Divider
+import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.ProvideEmphasis
 import androidx.compose.material.icons.Icons

Rally/app/src/main/java/com/example/compose/rally/ui/components/TopAppBar.kt

@@ -20,7 +20,6 @@ import androidx.compose.animation.animate
 import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.tween
-import androidx.compose.foundation.Icon
 import androidx.compose.foundation.Text
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -29,6 +28,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.preferredHeight
 import androidx.compose.foundation.layout.preferredWidth
 import androidx.compose.foundation.selection.selectable
+import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.material.ripple.RippleIndication

Rally/app/src/main/java/com/example/compose/rally/ui/overview/OverviewScreen.kt

@@ -16,7 +16,6 @@
 
 package com.example.compose.rally.ui.overview
 
-import androidx.compose.foundation.Icon
 import androidx.compose.foundation.ScrollableColumn
 import androidx.compose.foundation.Text
 import androidx.compose.foundation.background
@@ -30,6 +29,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.preferredHeight
 import androidx.compose.material.AmbientEmphasisLevels
 import androidx.compose.material.Card
+import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.ProvideEmphasis

Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt

@@ -47,8 +47,8 @@ object Libs {
         const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha02"
 
         object Compose {
-            const val snapshot = ""
-            const val version = "1.0.0-alpha05"
+            const val snapshot = "6922857"
+            const val version = "1.0.0-SNAPSHOT"
 
             const val core = "androidx.compose.ui:ui:$version"
             const val foundation = "androidx.compose.foundation:foundation:$version"
@@ -92,5 +92,5 @@ object Libs {
 
 object Urls {
     const val composeSnapshotRepo = "https://androidx-dev-prod.appspot.com/snapshots/builds/" +
-        "${Libs.AndroidX.Compose.snapshot}/artifacts/ui/repository/"
+        "${Libs.AndroidX.Compose.snapshot}/artifacts/repository/"
 }

Rally/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.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip