expo-maps 0.3.0 → 0.4.1

package/CHANGELOG.md

@@ -10,6 +10,19 @@
 
 ### 💡 Others
 
+## 0.4.1 — 2024-01-24
+
+### 💡 Others
+
+- Replace deprecated `com.facebook.react:react-native:+` Android dependency with `com.facebook.react:react-android`. ([#26237](https://github.com/expo/expo/pull/26237) by [@kudo](https://github.com/kudo))
+
+## 0.4.0 — 2023-11-14
+
+### 🛠 Breaking changes
+
+- Bumped iOS deployment target to 13.4. ([#25063](https://github.com/expo/expo/pull/25063) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+- On `Android` bump `compileSdkVersion` and `targetSdkVersion` to `34`. ([#24708](https://github.com/expo/expo/pull/24708) by [@alanjhughes](https://github.com/alanjhughes))
+
 ## 0.3.0 — 2023-10-17
 
 ### 🛠 Breaking changes

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.3.0'
+version = '0.4.1'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 if (expoModulesCorePlugin.exists()) {
@@ -53,11 +53,11 @@ afterEvaluate {
 android {
   // Remove this if and it's contents, when support for SDK49 is dropped
   if (!safeExtGet("expoProvidesDefaultConfig", false)) {
-    compileSdkVersion safeExtGet("compileSdkVersion", 33)
-    
+    compileSdkVersion safeExtGet("compileSdkVersion", 34)
+
     defaultConfig {
       minSdkVersion safeExtGet("minSdkVersion", 23)
-      targetSdkVersion safeExtGet("targetSdkVersion", 33)
+      targetSdkVersion safeExtGet("targetSdkVersion", 34)
     }
 
     lintOptions {
@@ -80,7 +80,7 @@ android {
   namespace "expo.modules.maps"
   defaultConfig {
     versionCode 1
-    versionName '0.3.0'
+    versionName '0.4.1'
   }
   publishing {
     singleVariant("release") {
@@ -102,6 +102,5 @@ dependencies {
   implementation "com.google.android.libraries.places:places:2.6.0"
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3"
-  //noinspection GradleDynamicVersion
-  implementation 'com.facebook.react:react-native:+'
+  implementation 'com.facebook.react:react-android'
 }

package/android/src/main/java/expo/modules/maps/PropsData.kt

@@ -9,7 +9,7 @@ enum class MapType(val value: String) {
   Normal("normal"),
   Hybrid("hybrid"),
   Satellite("satellite"),
-  Terrain("terrain"),
+  Terrain("terrain")
 }
 
 data class MarkerObject(
@@ -23,7 +23,7 @@ data class MarkerObject(
   @Field val draggable: Boolean = false,
   @Field val anchorU: Double? = null,
   @Field val anchorV: Double? = null,
-  @Field val opacity: Double = 1.0,
+  @Field val opacity: Double = 1.0
 ) : Record, ClusterItem {
 
   override fun getPosition(): LatLng {
@@ -56,14 +56,14 @@ data class PolygonObject(
   @Field val strokeColor: String?,
   @Field val strokeWidth: Float?,
   @Field val strokePattern: List<PatternItem>?,
-  @Field val jointType: Int?,
+  @Field val jointType: Int?
 ) : Record
 
 data class CameraPosition(
   @Field val latitude: Double = 0.0,
   @Field val longitude: Double = 0.0,
   @Field val zoom: Double = 0.0,
-  @Field val animate: Boolean = false,
+  @Field val animate: Boolean = false
 ) : Record
 
 data class PolylineObject(
@@ -72,29 +72,29 @@ data class PolylineObject(
   @Field val width: Float?,
   @Field val pattern: List<PatternItem>?,
   @Field val jointType: Joint?,
-  @Field val capType: Cap?,
+  @Field val capType: Cap?
 ) : Record
 
 data class PatternItem(
   @Field val type: PatternItemType,
-  @Field val length: Float,
+  @Field val length: Float
 ) : Record
 
 enum class PatternItemType(val value: String) {
   Stroke("stroke"),
-  Gap("gap"),
+  Gap("gap")
 }
 
 enum class Joint(val value: String) {
   Bevel("bevel"),
   Miter("miter"),
-  Round("round"),
+  Round("round")
 }
 
 enum class Cap(val value: String) {
   Butt("butt"),
   Round("round"),
-  Square("square"),
+  Square("square")
 }
 
 data class CircleObject(
@@ -102,7 +102,7 @@ data class CircleObject(
   @Field val radius: Double,
   @Field val strokeColor: String?,
   @Field val strokeWidth: Float?,
-  @Field val fillColor: String?,
+  @Field val fillColor: String?
 ) : Record
 
 data class ClusterObject(
@@ -114,7 +114,7 @@ data class ClusterObject(
   @Field val icon: String? = null,
   @Field val color: String? = null,
   @Field val opacity: Double = 1.0,
-  @Field val markers: List<MarkerObject> = emptyList(),
+  @Field val markers: List<MarkerObject> = emptyList()
 ) : Record
 
 data class KMLObject(@Field val filePath: String) : Record
@@ -161,12 +161,12 @@ data class Bounds(
 
 data class Gradient(
   @Field val colors: List<String> = emptyList(),
-  @Field val locations: FloatArray = floatArrayOf(),
+  @Field val locations: FloatArray = floatArrayOf()
 ) : Record
 
 data class HeatmapObject(
   @Field val points: List<PointWithData> = emptyList(),
   @Field val radius: Int?,
   @Field val gradient: Gradient? = null,
-  @Field val opacity: Double?,
+  @Field val opacity: Double?
 ) : Record

package/android/src/main/java/expo/modules/maps/googleMaps/GoogleMapsCallbacks.kt

@@ -87,9 +87,9 @@ class GoogleMapsCallbacks(private val map: GoogleMap, private val context: Conte
         context,
         Manifest.permission.ACCESS_FINE_LOCATION
       ) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(
-          context,
-          Manifest.permission.ACCESS_COARSE_LOCATION
-        ) != PackageManager.PERMISSION_GRANTED
+        context,
+        Manifest.permission.ACCESS_COARSE_LOCATION
+      ) != PackageManager.PERMISSION_GRANTED
     ) {
       return
     }
@@ -99,7 +99,7 @@ class GoogleMapsCallbacks(private val map: GoogleMap, private val context: Conte
       Looper.getMainLooper()
     )
     /*On location button click listener is set here in order to get permission updates more often.
-    * In the future it should be called only when the permissions change */
+     * In the future it should be called only when the permissions change */
     map.setOnMyLocationButtonClickListener {
       locationProvider.lastLocation.addOnSuccessListener { location ->
         onLocationButtonPress?.let { it(UserLocationRecord(location)) }

package/android/src/main/java/expo/modules/maps/googleMaps/GoogleMapsCameraAnimations.kt

@@ -20,7 +20,6 @@ class GoogleMapsCameraAnimations(private val googleMap: GoogleMap) {
     )
 
     if (cameraMove.latLngDelta != null) {
-
       val x1 = target.latitude - cameraMove.latLngDelta!!.latitudeDelta / 2
       val y1 = target.longitude - cameraMove.latLngDelta!!.longitudeDelta / 2
       val bottomLeft = LatLng(x1, y1)

package/android/src/main/java/expo/modules/maps/googleMaps/GoogleMapsCircles.kt

@@ -39,25 +39,25 @@ class GoogleMapsCircles(map: GoogleMap) : Circles {
         0xFF,
         Integer.decode("0x" + colorString[1] + colorString[1]),
         Integer.decode("0x" + colorString[2] + colorString[2]),
-        Integer.decode("0x" + colorString[3] + colorString[3]),
+        Integer.decode("0x" + colorString[3] + colorString[3])
       )
       5 -> Color.argb(
         Integer.decode("0x" + colorString[4] + colorString[4]),
         Integer.decode("0x" + colorString[1] + colorString[1]),
         Integer.decode("0x" + colorString[2] + colorString[2]),
-        Integer.decode("0x" + colorString[3] + colorString[3]),
+        Integer.decode("0x" + colorString[3] + colorString[3])
       )
       7 -> Color.argb(
         0xFF,
         Integer.decode("0x" + colorString.substring(1..2)),
         Integer.decode("0x" + colorString.substring(3..4)),
-        Integer.decode("0x" + colorString.substring(5..6)),
+        Integer.decode("0x" + colorString.substring(5..6))
       )
       9 -> Color.argb(
         Integer.decode("0x" + colorString.substring(7..8)),
         Integer.decode("0x" + colorString.substring(1..2)),
         Integer.decode("0x" + colorString.substring(3..4)),
-        Integer.decode("0x" + colorString.substring(5..6)),
+        Integer.decode("0x" + colorString.substring(5..6))
       )
       else -> throw IllegalArgumentException("String $colorString is not a valid color representation")
     }

package/android/src/main/java/expo/modules/maps/googleMaps/GoogleMapsUtils.kt

@@ -27,25 +27,25 @@ fun colorHexStringToInt(hexColorString: String): Int {
       0xFF,
       Integer.decode("0x" + hexColorString[1] + hexColorString[1]),
       Integer.decode("0x" + hexColorString[2] + hexColorString[2]),
-      Integer.decode("0x" + hexColorString[3] + hexColorString[3]),
+      Integer.decode("0x" + hexColorString[3] + hexColorString[3])
     )
     5 -> Color.argb(
       Integer.decode("0x" + hexColorString[4] + hexColorString[4]),
       Integer.decode("0x" + hexColorString[1] + hexColorString[1]),
       Integer.decode("0x" + hexColorString[2] + hexColorString[2]),
-      Integer.decode("0x" + hexColorString[3] + hexColorString[3]),
+      Integer.decode("0x" + hexColorString[3] + hexColorString[3])
     )
     7 -> Color.argb(
       0xFF,
       Integer.decode("0x" + hexColorString.substring(1..2)),
       Integer.decode("0x" + hexColorString.substring(3..4)),
-      Integer.decode("0x" + hexColorString.substring(5..6)),
+      Integer.decode("0x" + hexColorString.substring(5..6))
     )
     9 -> Color.argb(
       Integer.decode("0x" + hexColorString.substring(7..8)),
       Integer.decode("0x" + hexColorString.substring(1..2)),
       Integer.decode("0x" + hexColorString.substring(3..4)),
-      Integer.decode("0x" + hexColorString.substring(5..6)),
+      Integer.decode("0x" + hexColorString.substring(5..6))
     )
     else -> throw IllegalArgumentException("String $hexColorString is not a valid hex color representation")
   }

package/android/src/main/java/expo/modules/maps/googleMaps/GoogleMapsView.kt

@@ -305,7 +305,7 @@ class GoogleMapsView(context: Context, appContext: AppContext) : LinearLayout(co
       After calling lambda the subscription is canceled.
       StateFlow holds the latest value so even if updateMap is called after
       OnMapReadyCallback, StateFlow emits the latest value letting provided lambda to be executed.
-  */
+   */
   private fun updateMap(update: () -> Unit) {
     CoroutineScope(Dispatchers.IO).launch {
       mapReady.collectLatest {

package/ios/ExpoMaps.podspec

@@ -10,13 +10,13 @@ Pod::Spec.new do |s|
   s.license        = package['license']
   s.author         = package['author']
   s.homepage       = package['homepage']
-  s.platform       = :ios, '13.0'
+  s.platform       = :ios, '13.4'
   s.source         = { git: 'https://github.com/expo/expo.git' }
   s.static_framework = true
   s.source_files   = 'ExpoMaps/**/*.{h,m,swift}'
   s.preserve_paths = 'ExpoMaps/**/*.{h,m,swift}'
   s.requires_arc   = true
-  
+
   s.dependency 'ExpoModulesCore'
   s.dependency 'GoogleMaps', '7.3.0'
 #  s.dependency 'Google-Maps-iOS-Utils', '4.1.0'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-maps",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "ExpoMaps standalone module",
   "main": "build/Map.js",
   "types": "build/Map.d.ts",
@@ -30,7 +30,7 @@
   "license": "MIT",
   "homepage": "https://docs.expo.dev/versions/latest/sdk/module-template",
   "dependencies": {
-    "expo-asset": "^8.6.1"
+    "expo-asset": "^9.0.0"
   },
   "devDependencies": {
     "expo-module-scripts": "^3.0.0"
@@ -41,5 +41,5 @@
   "jest": {
     "preset": "expo-module-scripts/ios"
   },
-  "gitHead": "da25937e2a99661cbe5eb60ca1d8d6245fc96a50"
+  "gitHead": "dd467f9665171a9729dad8837ea595cd046936f4"
 }