feat: Update to Compose 1.2.0-beta02 (#124)

* feat: Update to Compose 1.2.0-beta02 Change-Id: I37b7a0e3388a0bbb10ae75149ebd81a07e2bde26 * Fix tests. Change-Id: I9c1a71e78f527a7c2041a5e4af327ecd1728cb47
googlemaps · May 23, 2022 · 09765d1 · 09765d1
1 parent de3ff74
commit 09765d1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
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
@@ -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
@@ -41,6 +41,9 @@
       </intent-filter>
     </activity>
 
+    <!-- Used by createComponentActivity() for unit testing -->
+    <activity android:name="androidx.activity.ComponentActivity" />
+
   </application>
 
 </manifest>
diff --git a/build.gradle b/build.gradle
@@ -1,15 +1,15 @@
 // 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()
         mavenCentral()
     }
     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'