Merge remote-tracking branch 'goog/main' into jun1merge

Change-Id: Idf95f5ca39c74acdae0adbe4a2946834726d0ac9

.github/workflows/Build.yaml

@@ -18,6 +18,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
+
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties        
 
@@ -111,4 +114,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: test-reports
-          path: app/build/reports/androidTests
+          path: '*/build/reports/androidTests'

.github/workflows/Release.yml

@@ -12,7 +12,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2    
+        uses: actions/checkout@v2   
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

gradle/libs.versions.toml

@@ -4,34 +4,33 @@ androidDesugarJdkLibs = "1.1.5"
 androidGradlePlugin = "7.2.1"
 androidxActivity = "1.4.0"
 androidxAppCompat = "1.3.0"
-androidxCompose = "1.2.0-beta02"
-androidxComposeMaterial3 = "1.0.0-alpha12"
+androidxCompose = "1.2.0-beta03"
+androidxComposeMaterial3 = "1.0.0-alpha13"
 androidxCore = "1.7.0"
 androidxCustomView = "1.0.0-beta02"
 androidxDataStore = "1.0.0"
-androidxEspresso = "3.3.0"
+androidxEspresso = "3.4.0"
 androidxHiltNavigationCompose = "1.0.0"
 androidxLifecycle = "2.5.0-rc01"
-androidxMacroBenchmark = "1.1.0-rc02"
+androidxMacroBenchmark = "1.1.0-rc03"
 androidxNavigation = "2.4.2"
-androidxProfileinstaller = "1.2.0-beta01"
+androidxProfileinstaller = "1.2.0-beta03"
 androidxSavedState = "1.1.0"
 androidxStartup = "1.1.1"
 androidxWindowManager = "1.0.0"
 androidxTest = "1.4.0"
-androidxTestExt = "1.1.2"
+androidxTestExt = "1.1.3"
 androidxUiAutomator = "2.2.0"
 androidxWork = "2.7.1"
-coil = "2.0.0-rc01"
-hilt = "2.41"
+coil = "2.1.0"
+hilt = "2.42"
 hiltExt = "1.0.0"
 jacoco = "0.8.7"
 junit4 = "4.13.2"
 kotlin = "1.6.21"
 kotlinxCoroutines = "1.6.0"
-kotlinxCoroutinesTest = "1.6.0"
 kotlinxDatetime = "0.3.3"
-kotlinxSerializationJson = "1.3.1"
+kotlinxSerializationJson = "1.3.3"
 ksp = "1.6.21-1.0.5"
 ktlint = "0.43.0"
 material3 = "1.5.0-alpha05"
@@ -42,8 +41,8 @@ retrofit = "2.9.0"
 retrofitKotlinxSerializationJson = "0.8.0"
 room = "2.4.2"
 secrets = "2.0.1"
-spotless = "6.3.0"
-turbine = "0.7.0"
+spotless = "6.7.0"
+turbine = "0.8.0"
 
 [libraries]
 accompanist-flowlayout = { group = "com.google.accompanist", name = "accompanist-flowlayout", version.ref = "accompanist" }
@@ -96,7 +95,7 @@ junit4 = { group = "junit", name = "junit", version.ref = "junit4" }
 kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-serializationPlugin = { group = "org.jetbrains.kotlin", name = "kotlin-serialization", version.ref = "kotlin" }
 kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }
-kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesTest" }
+kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
 kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinxDatetime" }
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
 material3 = { group = "com.google.android.material", name = "material", version.ref = "material3" }