Merge remote-tracking branch 'upstream/main' into managed-devices

DSteve595 · DSteve595 · commit 18b98c5765fc · 2022-11-21T18:31:42.000-05:00
diff --git a/README.md b/README.md
@@ -244,16 +244,16 @@ To run it, you'll have to:
 
 ```groovy
 dependencies {
-    implementation 'com.google.maps.android:maps-compose:2.7.2'
+    implementation 'com.google.maps.android:maps-compose:2.7.3'
     
     // Make sure to also include the latest version of the Maps SDK for Android 
     implementation 'com.google.android.gms:play-services-maps:18.0.2'
     
     // Also include Compose version `1.2.0-alpha03` or higher - for example:
-    implementation 'androidx.compose.foundation:foundation:2.7.2-alpha03'
+    implementation 'androidx.compose.foundation:foundation:2.7.3-alpha03'
     
     // Optionally, you can include the widgets library if you want to use ScaleBar, etc.
-    implementation 'com.google.maps.android:maps-compose-widgets:2.7.2'
+    implementation 'com.google.maps.android:maps-compose-widgets:2.7.3'
 }
 ```
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    namespace "com.google.maps.android.compose"
+    compileSdk 33
 
     defaultConfig {
-        applicationId "com.google.maps.android.compose"
         minSdk 21
-        targetSdk 32
+        targetSdk 33
         versionCode 1
         versionName "1.0"
 
@@ -50,6 +50,7 @@ android {
 }
 
 dependencies {
+    implementation platform(libs.androidx.compose.bom)
     implementation libs.androidx.compose.activity
     implementation libs.androidx.compose.foundation
     implementation libs.androidx.compose.material
@@ -60,6 +61,7 @@ dependencies {
     implementation libs.androidx.compose.ui.preview.tooling
     debugImplementation libs.androidx.compose.ui.tooling
 
+    androidTestImplementation platform(libs.androidx.compose.bom)
     androidTestImplementation libs.androidx.test.core
     androidTestImplementation libs.androidx.test.rules
     androidTestImplementation libs.androidx.test.runner
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
  limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.maps.android.compose">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,6 @@
 buildscript {
     ext.kotlin_version = libs.versions.kotlin.get()
     ext.compose_compiler_version = libs.versions.composecompiler.get()
-    ext.compose_version = libs.versions.compose.get()
     ext.androidx_test_version = libs.versions.androidxtest.get()
     repositories {
         google()
@@ -31,7 +30,7 @@ ext.projectArtifactId = { project ->
 
 allprojects {
     group = 'com.google.maps.android'
-    version = '2.7.2'
+    version = '2.7.3'
     project.ext.artifactId = rootProject.ext.projectArtifactId(project)
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,30 +1,31 @@
 [versions]
-activitycompose = "1.4.0"
-agp = "7.2.0"
+activitycompose = "1.6.1"
+agp = "7.3.1"
 androidxtest = "1.4.0"
-compose = "1.2.1"
-composecompiler = "1.3.0"
+compose-bom = "2022.11.00"
+composecompiler = "1.3.2"
 coroutines = "1.6.0"
 dokka = "1.5.0"
 espresso = "3.4.0"
 jacoco-plugin = "0.2"
 jacoco-tool-plugin = "0.8.7"
 junitktx = "1.1.3"
 junit = "4.13.2"
-kotlin = "1.7.10"
+kotlin = "1.7.20"
 material = "1.5.0"
 maps = "3.3.0"
 mapsecrets = "2.0.1"
 
 [libraries]
 android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }
 androidx-compose-activity = { module = "androidx.activity:activity-compose", version.ref = "activitycompose" }
-androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
-androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
-androidx-compose-ui-preview-tooling = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
-androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
+androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }
+androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" }
+androidx-compose-material = { module = "androidx.compose.material:material" }
+androidx-compose-ui-preview-tooling = { module = "androidx.compose.ui:ui-tooling-preview" }
+androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx-core = { module = "androidx.core:core-ktx", version.require = "1.7.0" }
-androidx-test-compose-ui = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
+androidx-test-compose-ui = { module = "androidx.compose.ui:ui-test-junit4" }
 androidx-test-core = { module = "androidx.test:core", version.ref = "androidxtest" }
 androidx-test-espresso = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
 androidx-test-junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "junitktx" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Dec 03 15:01:34 PST 2021
+#Thu Nov 17 17:56:49 EST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/maps-compose-widgets/build.gradle b/maps-compose-widgets/build.gradle
@@ -4,11 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    namespace "com.google.maps.android.compose.widgets"
+    compileSdk 33
 
     defaultConfig {
         minSdk 21
-        targetSdk 32
+        targetSdk 33
         versionCode 1
         versionName "1.0"
     }
@@ -37,6 +38,7 @@ android {
 dependencies {
     implementation project(':maps-compose')
 
+    implementation platform(libs.androidx.compose.bom)
     implementation libs.androidx.compose.foundation
     implementation libs.androidx.compose.material
     implementation libs.androidx.core
@@ -46,7 +48,7 @@ dependencies {
     implementation libs.maps.ktx.utils
 
     testImplementation libs.test.junit
-
+    androidTestImplementation platform(libs.androidx.compose.bom)
     androidTestImplementation libs.androidx.test.espresso
     androidTestImplementation libs.androidx.test.junit.ktx
 }
diff --git a/maps-compose-widgets/src/main/AndroidManifest.xml b/maps-compose-widgets/src/main/AndroidManifest.xml
@@ -15,6 +15,4 @@
  limitations under the License.
 -->
 
-<manifest package="com.google.maps.android.compose.widgets">
-
-</manifest>
+<manifest />
diff --git a/maps-compose/build.gradle b/maps-compose/build.gradle
@@ -4,11 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    namespace "com.google.maps.android.compose"
+    compileSdk 33
 
     defaultConfig {
         minSdk 21
-        targetSdk 32
+        targetSdk 33
         versionCode 1
         versionName "1.0"
     }
@@ -35,6 +36,7 @@ android {
 }
 
 dependencies {
+    implementation platform(libs.androidx.compose.bom)
     implementation libs.androidx.core
     implementation libs.androidx.compose.foundation
     implementation libs.kotlin
@@ -43,6 +45,7 @@ dependencies {
 
     testImplementation libs.test.junit
 
+    androidTestImplementation platform(libs.androidx.compose.bom)
     androidTestImplementation libs.androidx.test.espresso
     androidTestImplementation libs.androidx.test.junit.ktx
 }
diff --git a/maps-compose/src/main/AndroidManifest.xml b/maps-compose/src/main/AndroidManifest.xml
@@ -15,7 +15,4 @@
  limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.maps.android.compose">
-
-</manifest>
+<manifest />

Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,12 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`android {`
`7`		`- compileSdk 32`
	`7`	`+ namespace "com.google.maps.android.compose"`
	`8`	`+ compileSdk 33`
`8`	`9`
`9`	`10`	`defaultConfig {`
`10`	`11`	`minSdk 21`
`11`		`- targetSdk 32`
	`12`	`+ targetSdk 33`
`12`	`13`	`versionCode 1`
`13`	`14`	`versionName "1.0"`
`14`	`15`	`}`
`@@ -35,6 +36,7 @@ android {`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`dependencies {`
	`39`	`+ implementation platform(libs.androidx.compose.bom)`
`38`	`40`	`implementation libs.androidx.core`
`39`	`41`	`implementation libs.androidx.compose.foundation`
`40`	`42`	`implementation libs.kotlin`
`@@ -43,6 +45,7 @@ dependencies {`
`43`	`45`
`44`	`46`	`testImplementation libs.test.junit`
`45`	`47`
	`48`	`+ androidTestImplementation platform(libs.androidx.compose.bom)`
`46`	`49`	`androidTestImplementation libs.androidx.test.espresso`
`47`	`50`	`androidTestImplementation libs.androidx.test.junit.ktx`
`48`	`51`	`}`