From df8167e0d0db939aa729125658b76694355db9c1 Mon Sep 17 00:00:00 2001
From: Chris Arriola <carriola@google.com>
Date: Fri, 8 Jul 2022 09:58:49 -0700
Subject: [PATCH] chore: Update Compose libraries and Compiler.

Change-Id: I449263cbbea517218521ca002d2bb1ec23bd08c7
---
 app/build.gradle                                          | 6 +++---
 build.gradle                                              | 5 +++--
 maps-compose-widgets/build.gradle                         | 8 ++++----
 maps-compose/build.gradle                                 | 8 ++++----
 .../main/java/com/google/maps/android/compose/Polygon.kt  | 6 +++---
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c979f201..2e2ab5e8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
 }
 
 android {
-    compileSdk 31
+    compileSdk 32
 
     defaultConfig {
         applicationId "com.google.maps.android.compose"
         minSdk 21
-        targetSdk 31
+        targetSdk 32
         versionCode 1
         versionName "1.0"
 
@@ -23,7 +23,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "$compose_version"
+        kotlinCompilerExtensionVersion "$compose_compiler_version"
     }
 
     buildFeatures {
diff --git a/build.gradle b/build.gradle
index fe7caf4f..48aef2d2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.6.21'
-    ext.compose_version = '1.2.0-beta02'
+    ext.kotlin_version = '1.7.0'
+    ext.compose_compiler_version = '1.2.0'
+    ext.compose_version = '1.2.0-rc03'
     ext.androidx_test_version = '1.4.0'
     repositories {
         google()
diff --git a/maps-compose-widgets/build.gradle b/maps-compose-widgets/build.gradle
index a3dc1b8f..1121fb45 100644
--- a/maps-compose-widgets/build.gradle
+++ b/maps-compose-widgets/build.gradle
@@ -4,11 +4,11 @@ plugins {
 }
 
 android {
-    compileSdk 31
+    compileSdk 32
 
     defaultConfig {
         minSdk 21
-        targetSdk 31
+        targetSdk 32
         versionCode 1
         versionName "1.0"
     }
@@ -19,7 +19,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "$compose_version"
+        kotlinCompilerExtensionVersion "$compose_compiler_version"
     }
 
     buildFeatures {
@@ -48,4 +48,4 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation "androidx.core:core-ktx:1.7.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
\ No newline at end of file
+}
diff --git a/maps-compose/build.gradle b/maps-compose/build.gradle
index c1d45183..a7d82bda 100644
--- a/maps-compose/build.gradle
+++ b/maps-compose/build.gradle
@@ -4,11 +4,11 @@ plugins {
 }
 
 android {
-    compileSdk 31
+    compileSdk 32
 
     defaultConfig {
         minSdk 21
-        targetSdk 31
+        targetSdk 32
         versionCode 1
         versionName "1.0"
     }
@@ -19,7 +19,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "$compose_version"
+        kotlinCompilerExtensionVersion "$compose_compiler_version"
     }
 
     buildFeatures {
@@ -45,4 +45,4 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation "androidx.core:core-ktx:1.7.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
\ No newline at end of file
+}
diff --git a/maps-compose/src/main/java/com/google/maps/android/compose/Polygon.kt b/maps-compose/src/main/java/com/google/maps/android/compose/Polygon.kt
index 368cd5e0..cb12dd4e 100644
--- a/maps-compose/src/main/java/com/google/maps/android/compose/Polygon.kt
+++ b/maps-compose/src/main/java/com/google/maps/android/compose/Polygon.kt
@@ -76,8 +76,8 @@ public fun Polygon(
                 clickable(clickable)
                 fillColor(fillColor.toArgb())
                 geodesic(geodesic)
-                holes.forEach {
-                    addHole(it)
+                holes.forEach { hole ->
+                    addHole(hole)
                 }
                 strokeColor(strokeColor.toArgb())
                 strokeJointType(strokeJointType)
@@ -106,4 +106,4 @@ public fun Polygon(
             set(zIndex) { this.polygon.zIndex = it }
         }
     )
-}
\ No newline at end of file
+}