Merge branch 'main' into benchmarking

# Conflicts:
#	ar/build.gradle.kts
#	benchmark/build.gradle.kts
#	buildSrc/src/main/java/Versions.kt
#	depconstraints/build.gradle.kts
#	gradle/wrapper/gradle-wrapper.properties
#	mobile/build.gradle.kts
#	shared/build.gradle.kts

Author: mlykotom

androidTest-shared/build.gradle.kts

@@ -30,7 +30,7 @@ android {
 
     lint {
         // Version changes are beyond our control, so don't warn. The IDE will still mark these.
-        disable("GradleDependency")
+        disable += "GradleDependency"
     }
 }
 

ar/build.gradle.kts

@@ -33,6 +33,7 @@ android {
         maybeCreate("staging")
         getByName("staging") {
             initWith(getByName("debug"))
+
             // Specifies a sorted list of fallback build types that the
             // plugin should try to use when a dependency does not include a
             // "staging" build type.
@@ -51,9 +52,9 @@ android {
     }
 
     lint {
-        disable("InvalidPackage")
+        disable += "InvalidPackage"
         // Version changes are beyond our control, so don't warn. The IDE will still mark these.
-        disable("GradleDependency")
+        disable += "GradleDependency"
     }
 
     // Required by ArWebView

benchmark/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * Copyright 2022 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

benchmark/src/androidTest/java/com/google/samples/apps/iosched/benchmark/LoadAgendaUseCaseBenchmark.kt

@@ -29,7 +29,7 @@ import com.google.samples.apps.iosched.shared.result.data
 import com.google.samples.apps.iosched.shared.result.succeeded
 import com.google.samples.apps.iosched.test.data.MainCoroutineRule
 import com.jakewharton.threetenabp.AndroidThreeTen
-import kotlinx.coroutines.test.runBlockingTest
+import kotlinx.coroutines.test.runTest
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.collection.IsCollectionWithSize.hasSize
 import org.hamcrest.core.Is.`is`
@@ -61,7 +61,7 @@ class LoadAgendaUseCaseBenchmark {
         )
 
         benchmarkRule.measureRepeated {
-            coroutineRule.testDispatcher.runBlockingTest {
+            runTest {
                 val result: Result<List<Block>> = useCase.invoke(parameters = true)
 
                 assertThat(result.succeeded, `is`(true))

buildSrc/src/main/java/Versions.kt

@@ -23,14 +23,14 @@ object Versions {
     const val TARGET_SDK = 30
     const val MIN_SDK = 21
 
-    const val ANDROID_GRADLE_PLUGIN = "7.0.3"
-    const val BENCHMARK = "1.2.0-beta05"
-    const val COMPOSE = "1.0.5"
+    const val ANDROID_GRADLE_PLUGIN = "7.1.2"
+    const val BENCHMARK = "1.1.0-beta05"
+    const val COMPOSE = "1.1.1"
     const val FIREBASE_CRASHLYTICS = "2.3.0"
     const val GOOGLE_SERVICES = "4.3.3"
-    const val KOTLIN = "1.5.31"
-    const val NAVIGATION = "2.3.5"
-    const val HILT_AGP = "2.40.2"
+    const val KOTLIN = "1.6.10"
+    const val NAVIGATION = "2.4.1"
+    const val HILT_AGP = "2.40.5"
 
     // TODO: Remove this once the version for
     //  "org.threeten:threetenbp:${Versions.threetenbp}:no-tzdb" using java-platform in the

depconstraints/build.gradle.kts

@@ -33,8 +33,8 @@ val compose = Versions.COMPOSE
 val composeMaterial = "1.1.0"
 val constraintLayout = "1.1.3"
 val core = "1.3.2"
-val coroutines = "1.4.2"
-val coroutinesTest = "1.3.4"
+val coroutines = "1.6.0"
+val coroutinesTest = "1.6.0"
 val crashlytics = "17.2.2"
 val dataStore = "1.0.0-beta01"
 val drawerLayout = "1.1.0-rc01"
@@ -65,7 +65,7 @@ val okhttp = "3.10.0"
 val okio = "1.14.0"
 val pageIndicator = "1.3.0"
 val playCore = "1.6.5"
-val room = "2.3.0"
+val room = "2.4.2"
 val rules = "1.1.1"
 val runner = "1.2.0"
 val slidingpanelayout = "1.2.0-alpha01"
@@ -97,7 +97,7 @@ dependencies {
         api("${Libs.CONSTRAINT_LAYOUT}:$constraintLayout")
         api("${Libs.CORE_KTX}:$core")
         api("${Libs.COROUTINES}:$coroutines")
-        api("${Libs.COROUTINES_TEST}:$coroutines")
+        api("${Libs.COROUTINES_TEST}:$coroutinesTest")
         api("${Libs.CRASHLYTICS}:$crashlytics")
         api("${Libs.DATA_STORE_PREFERENCES}:$dataStore")
         api("${Libs.DRAWER_LAYOUT}:$drawerLayout")

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Wed Feb 10 08:38:31 CET 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists