Merge 2bec1d3 into 34bedde

googlemaps · Sep 16, 2021 · c4cec3e · c4cec3e
2 parents 34bedde + 2bec1d3
commit c4cec3e
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 41 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,7 +26,7 @@ android {
 
     defaultConfig {
         applicationId "com.google.maps.android.ktx.demo"
-        minSdkVersion versions.android.minSdk
+        minSdkVersion 24
         targetSdkVersion versions.android.targetSdk
         versionCode 1
         versionName "1.0"
@@ -41,6 +41,7 @@ android {
 
     kotlinOptions {
         freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn"]
+        jvmTarget = "1.8"
     }
 }
 

diff --git a/build.gradle b/build.gradle
@@ -31,8 +31,8 @@ buildscript {
             'junit'    : '1.1.1',
         ],
         'junit'            : '4.12',
-        'kotlin'           : '1.4.32',
-        'kotlinxCoroutines': '1.4.3',
+        'kotlin'           : '1.5.30',
+        'kotlinxCoroutines': '1.5.1',
         'mapsBeta'         : '3.1.0-beta',
         'mockito'          : '3.0.0',
         'mockitoKotlin'    : '2.2.0',
@@ -132,7 +132,7 @@ subprojects { project ->
 
     // Code coverage
     jacoco {
-        toolVersion = "0.8.4"
+        toolVersion = "0.8.7"
     }
 
     tasks.withType(Test) {

diff --git a/maps-ktx/build.gradle b/maps-ktx/build.gradle
@@ -32,6 +32,7 @@ android {
 
     kotlinOptions {
         freeCompilerArgs += '-Xexplicit-api=strict'
+        jvmTarget = "1.8"
     }
 }
 

diff --git a/maps-ktx/src/main/java/com/google/maps/android/ktx/GoogleMap.kt b/maps-ktx/src/main/java/com/google/maps/android/ktx/GoogleMap.kt
@@ -106,13 +106,6 @@ public object IndoorBuildingFocusedEvent : IndoorChangeEvent()
  */
 public data class IndoorLevelActivatedEvent(val building: IndoorBuilding) : IndoorChangeEvent()
 
-// Since offer() can throw when the channel is closed (channel can close before the
-// block within awaitClose), wrap `offer` calls inside `runCatching`.
-// See: https://github.com/Kotlin/kotlinx.coroutines/issues/974
-internal fun <E> SendChannel<E>.offerCatching(element: E): Boolean {
-    return runCatching { offer(element) }.getOrDefault(false)
-}
-
 /**
  * Returns a [Flow] of [CameraEvent] items so that camera movements can be observed. Using this to
  * observe camera events will set listeners and thus override existing listeners to
@@ -126,16 +119,16 @@ internal fun <E> SendChannel<E>.offerCatching(element: E): Boolean {
 public fun GoogleMap.cameraEvents(): Flow<CameraEvent> =
     callbackFlow {
         setOnCameraIdleListener {
-            offerCatching(CameraIdleEvent)
+            trySend(CameraIdleEvent)
         }
         setOnCameraMoveCanceledListener {
-            offerCatching(CameraMoveCanceledEvent)
+            trySend(CameraMoveCanceledEvent)
         }
         setOnCameraMoveListener {
-            offerCatching(CameraMoveEvent)
+            trySend(CameraMoveEvent)
         }
         setOnCameraMoveStartedListener {
-            offerCatching(CameraMoveStartedEvent(it))
+            trySend(CameraMoveStartedEvent(it))
         }
         awaitClose {
             setOnCameraIdleListener(null)
@@ -186,7 +179,7 @@ public suspend inline fun GoogleMap.awaitMapLoad(): Unit =
 public fun GoogleMap.cameraIdleEvents(): Flow<Unit> =
     callbackFlow {
         setOnCameraIdleListener {
-            offerCatching(Unit)
+            trySend(Unit)
         }
         awaitClose {
             setOnCameraIdleListener(null)
@@ -202,7 +195,7 @@ public fun GoogleMap.cameraIdleEvents(): Flow<Unit> =
 public fun GoogleMap.cameraMoveCanceledEvents(): Flow<Unit> =
     callbackFlow {
         setOnCameraMoveCanceledListener {
-            offerCatching(Unit)
+            trySend(Unit)
         }
         awaitClose {
             setOnCameraMoveCanceledListener(null)
@@ -217,7 +210,7 @@ public fun GoogleMap.cameraMoveCanceledEvents(): Flow<Unit> =
 public fun GoogleMap.cameraMoveEvents(): Flow<Unit> =
     callbackFlow {
         setOnCameraMoveListener {
-            offerCatching(Unit)
+            trySend(Unit)
         }
         awaitClose {
             setOnCameraMoveListener(null)
@@ -244,7 +237,7 @@ public suspend inline fun GoogleMap.awaitSnapshot(bitmap: Bitmap? = null): Bitma
 public fun GoogleMap.cameraMoveStartedEvents(): Flow<Unit> =
     callbackFlow {
         setOnCameraMoveStartedListener {
-            offerCatching(Unit)
+            trySend(Unit)
         }
         awaitClose {
             setOnCameraMoveStartedListener(null)
@@ -259,7 +252,7 @@ public fun GoogleMap.cameraMoveStartedEvents(): Flow<Unit> =
 public fun GoogleMap.circleClickEvents(): Flow<Circle> =
     callbackFlow {
         setOnCircleClickListener {
-            offerCatching(it)
+            trySend(it)
         }
         awaitClose {
             setOnCircleClickListener(null)
@@ -275,7 +268,7 @@ public fun GoogleMap.circleClickEvents(): Flow<Circle> =
 public fun GoogleMap.groundOverlayClicks(): Flow<GroundOverlay> =
     callbackFlow {
         setOnGroundOverlayClickListener {
-            offerCatching(it)
+            trySend(it)
         }
         awaitClose {
             setOnGroundOverlayClickListener(null)
@@ -292,11 +285,11 @@ public fun GoogleMap.indoorStateChangeEvents(): Flow<IndoorChangeEvent> =
     callbackFlow {
         setOnIndoorStateChangeListener(object : GoogleMap.OnIndoorStateChangeListener {
             override fun onIndoorBuildingFocused() {
-                offerCatching(IndoorBuildingFocusedEvent)
+                trySend(IndoorBuildingFocusedEvent)
             }
 
             override fun onIndoorLevelActivated(indoorBuilding: IndoorBuilding) {
-                offerCatching(IndoorLevelActivatedEvent(building = indoorBuilding))
+                trySend(IndoorLevelActivatedEvent(building = indoorBuilding))
             }
         })
         awaitClose {
@@ -313,7 +306,7 @@ public fun GoogleMap.indoorStateChangeEvents(): Flow<IndoorChangeEvent> =
 public fun GoogleMap.infoWindowClickEvents(): Flow<Marker> =
     callbackFlow {
         setOnInfoWindowClickListener {
-            offerCatching(it)
+            trySend(it)
         }
         awaitClose {
             setOnInfoWindowClickListener(null)
@@ -329,7 +322,7 @@ public fun GoogleMap.infoWindowClickEvents(): Flow<Marker> =
 public fun GoogleMap.infoWindowCloseEvents(): Flow<Marker> =
     callbackFlow {
         setOnInfoWindowCloseListener {
-            offerCatching(it)
+            trySend(it)
         }
         awaitClose {
             setOnInfoWindowCloseListener(null)
@@ -345,7 +338,7 @@ public fun GoogleMap.infoWindowCloseEvents(): Flow<Marker> =
 public fun GoogleMap.infoWindowLongClickEvents(): Flow<Marker> =
     callbackFlow {
         setOnInfoWindowLongClickListener {
-            offerCatching(it)
+            trySend(it)
         }
         awaitClose {
             setOnInfoWindowLongClickListener(null)
@@ -360,7 +353,7 @@ public fun GoogleMap.infoWindowLongClickEvents(): Flow<Marker> =
 public fun GoogleMap.mapClickEvents(): Flow<LatLng> =
     callbackFlow {
         setOnMapClickListener {
-            offerCatching(it)
+            trySend(it)
         }
         awaitClose {
             setOnMapClickListener(null)
@@ -375,7 +368,7 @@ public fun GoogleMap.mapClickEvents(): Flow<LatLng> =
 public fun GoogleMap.mapLongClickEvents(): Flow<LatLng> =
     callbackFlow {
         setOnMapLongClickListener {
-            offerCatching(it)
+            trySend(it)
         }
         awaitClose {
             setOnMapLongClickListener(null)
@@ -390,7 +383,7 @@ public fun GoogleMap.mapLongClickEvents(): Flow<LatLng> =
 public fun GoogleMap.markerClickEvents(): Flow<Marker> =
     callbackFlow {
         setOnMarkerClickListener {
-            offerCatching(it)
+            trySend(it).isSuccess
         }
         awaitClose {
             setOnMarkerClickListener(null)
@@ -406,15 +399,15 @@ public fun GoogleMap.markerDragEvents(): Flow<OnMarkerDragEvent> =
     callbackFlow {
         setOnMarkerDragListener(object : GoogleMap.OnMarkerDragListener {
             override fun onMarkerDragStart(marker: Marker) {
-                offerCatching(MarkerDragStartEvent(marker = marker))
+                trySend(MarkerDragStartEvent(marker = marker))
             }
 
             override fun onMarkerDrag(marker: Marker) {
-                offerCatching(MarkerDragEvent(marker = marker))
+                trySend(MarkerDragEvent(marker = marker))
             }
 
             override fun onMarkerDragEnd(marker: Marker) {
-                offerCatching(MarkerDragEndEvent(marker = marker))
+                trySend(MarkerDragEndEvent(marker = marker))
             }
 
         })
@@ -432,7 +425,7 @@ public fun GoogleMap.markerDragEvents(): Flow<OnMarkerDragEvent> =
 public fun GoogleMap.myLocationButtonClickEvents(): Flow<Unit> =
     callbackFlow {
         setOnMyLocationButtonClickListener {
-            offerCatching(Unit)
+            trySend(Unit).isSuccess
         }
         awaitClose {
             setOnMyLocationButtonClickListener(null)
@@ -448,7 +441,7 @@ public fun GoogleMap.myLocationButtonClickEvents(): Flow<Unit> =
 public fun GoogleMap.myLocationClickEvents(): Flow<Location> =
     callbackFlow {
         setOnMyLocationClickListener {
-            offerCatching(it)
+            trySend(it)
         }
         awaitClose {
             setOnMyLocationClickListener(null)
@@ -464,7 +457,7 @@ public fun GoogleMap.myLocationClickEvents(): Flow<Location> =
 public fun GoogleMap.poiClickEvents(): Flow<PointOfInterest> =
     callbackFlow {
          setOnPoiClickListener {
-            offerCatching(it)
+            trySend(it)
         }
         awaitClose {
             setOnPoiClickListener(null)
@@ -479,7 +472,7 @@ public fun GoogleMap.poiClickEvents(): Flow<PointOfInterest> =
 public fun GoogleMap.polygonClickEvents(): Flow<Polygon> =
     callbackFlow {
         setOnPolygonClickListener {
-            offerCatching(it)
+            trySend(it)
         }
         awaitClose {
             setOnPolygonClickListener(null)
@@ -494,7 +487,7 @@ public fun GoogleMap.polygonClickEvents(): Flow<Polygon> =
 public fun GoogleMap.polylineClickEvents(): Flow<Polyline> =
     callbackFlow {
         setOnPolylineClickListener {
-            offerCatching(it)
+            trySend(it)
         }
         awaitClose {
             setOnPolylineClickListener(null)

diff --git a/maps-ktx/src/main/java/com/google/maps/android/ktx/StreetViewPanoramaView.kt b/maps-ktx/src/main/java/com/google/maps/android/ktx/StreetViewPanoramaView.kt
@@ -36,7 +36,7 @@ public suspend inline fun StreetViewPanoramaView.awaitStreetViewPanorama(): Stre
 public fun StreetViewPanorama.cameraChangeEvents(): Flow<StreetViewPanoramaCamera> =
     callbackFlow {
         setOnStreetViewPanoramaCameraChangeListener {
-            offerCatching(it)
+            trySend(it)
         }
         awaitClose {
             setOnStreetViewPanoramaCameraChangeListener(null)
@@ -52,7 +52,7 @@ public fun StreetViewPanorama.cameraChangeEvents(): Flow<StreetViewPanoramaCamer
 public fun StreetViewPanorama.changeEvents(): Flow<StreetViewPanoramaLocation> =
     callbackFlow {
         setOnStreetViewPanoramaChangeListener {
-            offerCatching(it)
+            trySend(it)
         }
         awaitClose {
             setOnStreetViewPanoramaChangeListener(null)
@@ -68,7 +68,7 @@ public fun StreetViewPanorama.changeEvents(): Flow<StreetViewPanoramaLocation> =
 public fun StreetViewPanorama.clickEvents(): Flow<StreetViewPanoramaOrientation> =
     callbackFlow {
         setOnStreetViewPanoramaClickListener {
-            offerCatching(it)
+            trySend(it)
         }
         awaitClose {
             setOnStreetViewPanoramaClickListener(null)
@@ -84,7 +84,7 @@ public fun StreetViewPanorama.clickEvents(): Flow<StreetViewPanoramaOrientation>
 public fun StreetViewPanorama.longClickEvents(): Flow<StreetViewPanoramaOrientation> =
     callbackFlow {
         setOnStreetViewPanoramaLongClickListener {
-            offerCatching(it)
+            trySend(it)
         }
         awaitClose {
             setOnStreetViewPanoramaLongClickListener(null)

diff --git a/maps-utils-ktx/build.gradle b/maps-utils-ktx/build.gradle
@@ -35,6 +35,7 @@ android {
 
     kotlinOptions {
         freeCompilerArgs += '-Xexplicit-api=strict'
+        jvmTarget = "1.8"
     }
 }
 

diff --git a/maps-utils-v3-ktx/build.gradle b/maps-utils-v3-ktx/build.gradle
@@ -35,6 +35,7 @@ android {
 
     kotlinOptions {
         freeCompilerArgs += '-Xexplicit-api=strict'
+        jvmTarget = "1.8"
     }
 }
 

diff --git a/maps-v3-ktx/build.gradle b/maps-v3-ktx/build.gradle
@@ -32,6 +32,7 @@ android {
 
     kotlinOptions {
         freeCompilerArgs += '-Xexplicit-api=strict'
+        jvmTarget = "1.8"
     }
 }