Skip to content

Commit 09765d1

Browse files
authored
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
1 parent de3ff74 commit 09765d1

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewTests.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414

1515
package com.google.maps.android.compose
1616

17+
import androidx.activity.ComponentActivity
1718
import androidx.compose.foundation.layout.fillMaxSize
1819
import androidx.compose.runtime.Composable
1920
import androidx.compose.ui.Modifier
2021
import androidx.compose.ui.test.assertIsDisplayed
2122
import androidx.compose.ui.test.junit4.createAndroidComposeRule
23+
import androidx.compose.ui.test.junit4.createComposeRule
2224
import androidx.compose.ui.test.onNodeWithTag
2325
import androidx.compose.ui.test.onNodeWithText
2426
import androidx.compose.ui.test.performClick
@@ -36,7 +38,7 @@ import java.util.concurrent.TimeUnit
3638

3739
class GoogleMapViewTests {
3840
@get:Rule
39-
val composeTestRule = createAndroidComposeRule<MapSampleActivity>()
41+
val composeTestRule = createComposeRule()
4042

4143
private val startingZoom = 10f
4244
private val startingPosition = LatLng(1.23, 4.56)

app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@
4141
</intent-filter>
4242
</activity>
4343

44+
<!-- Used by createComponentActivity() for unit testing -->
45+
<activity android:name="androidx.activity.ComponentActivity" />
46+
4447
</application>
4548

4649
</manifest>

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = '1.6.10'
4-
ext.compose_version = '1.2.0-alpha03'
3+
ext.kotlin_version = '1.6.21'
4+
ext.compose_version = '1.2.0-beta02'
55
ext.androidx_test_version = '1.4.0'
66
repositories {
77
google()
88
mavenCentral()
99
}
1010
dependencies {
1111
classpath "com.android.tools.build:gradle:7.0.4"
12-
classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.0"
12+
classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.5.0'
1515
classpath 'com.hiya:jacoco-android:0.2'

0 commit comments

Comments
 (0)