From d2ce4f28caefe301b89dc8538a8c7f2424f29cce Mon Sep 17 00:00:00 2001
From: Chris Arriola <carriola@google.com>
Date: Wed, 18 May 2022 15:11:22 -0700
Subject: [PATCH 1/2] feat: Update to Compose 1.2.0-beta02

Change-Id: I37b7a0e3388a0bbb10ae75149ebd81a07e2bde26
---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 233f16a1..09e5dd84 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.6.10'
-    ext.compose_version = '1.2.0-alpha03'
+    ext.kotlin_version = '1.6.21'
+    ext.compose_version = '1.2.0-beta02'
     ext.androidx_test_version = '1.4.0'
     repositories {
         google()
@@ -9,7 +9,7 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:7.0.4"
-        classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.0"
+        classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.5.0'
         classpath 'com.hiya:jacoco-android:0.2'

From ce8705f719950d6bd3c7ec1b65bffae087d96fc1 Mon Sep 17 00:00:00 2001
From: Chris Arriola <carriola@google.com>
Date: Fri, 20 May 2022 11:49:21 -0700
Subject: [PATCH 2/2] Fix tests.

Change-Id: I9c1a71e78f527a7c2041a5e4af327ecd1728cb47
---
 .../com/google/maps/android/compose/GoogleMapViewTests.kt     | 4 +++-
 app/src/main/AndroidManifest.xml                              | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewTests.kt b/app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewTests.kt
index b6ed2b69..40d30ffe 100644
--- a/app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewTests.kt
+++ b/app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewTests.kt
@@ -14,11 +14,13 @@
 
 package com.google.maps.android.compose
 
+import androidx.activity.ComponentActivity
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
@@ -36,7 +38,7 @@ import java.util.concurrent.TimeUnit
 
 class GoogleMapViewTests {
     @get:Rule
-    val composeTestRule = createAndroidComposeRule<MapSampleActivity>()
+    val composeTestRule = createComposeRule()
 
     private val startingZoom = 10f
     private val startingPosition = LatLng(1.23, 4.56)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b2d82c36..fa396824 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,6 +41,9 @@
       </intent-filter>
     </activity>
 
+    <!-- Used by createComponentActivity() for unit testing -->
+    <activity android:name="androidx.activity.ComponentActivity" />
+
   </application>
 
 </manifest>
\ No newline at end of file