expo-maps 0.0.2 → 0.2.0

package/CHANGELOG.md

@@ -10,6 +10,22 @@
 
 ### 💡 Others
 
+## 0.2.0 — 2023-09-04
+
+### 🎉 New features
+
+- Added support for React Native 0.73. ([#24018](https://github.com/expo/expo/pull/24018) by [@kudo](https://github.com/kudo))
+
+## 0.1.0 — 2023-06-21
+
+### 🐛 Bug fixes
+
+- Fixed Android build warnings for Gradle version 8. ([#22537](https://github.com/expo/expo/pull/22537), [#22609](https://github.com/expo/expo/pull/22609) by [@kudo](https://github.com/kudo))
+
+### 💡 Others
+
+- Moved the Google-Maps-iOS-Utils dependency to rely on git remote instead of a published package. ([#21249](https://github.com/expo/expo/pull/21249) by [@aleqsio](https://github.com/aleqsio))
+
 ## 0.0.2 — 2023-02-09
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.0.2'
+version = '0.2.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -35,19 +35,11 @@ buildscript {
   }
 }
 
-// Creating sources with comments
-task androidSourcesJar(type: Jar) {
-  classifier = 'sources'
-  from android.sourceSets.main.java.srcDirs
-}
-
 afterEvaluate {
   publishing {
     publications {
       release(MavenPublication) {
         from components.release
-        // Add additional sourcesJar to artifacts
-        artifact(androidSourcesJar)
       }
     }
     repositories {
@@ -61,24 +53,33 @@ afterEvaluate {
 android {
   compileSdkVersion safeExtGet("compileSdkVersion", 33)
 
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
-  }
+  def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+  if (agpVersion.tokenize('.')[0].toInteger() < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
 
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_11.majorVersion
+    kotlinOptions {
+      jvmTarget = JavaVersion.VERSION_11.majorVersion
+    }
   }
 
+  namespace "expo.modules.maps"
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 1
-    versionName '0.0.2'
+    versionName '0.2.0'
   }
   lintOptions {
     abortOnError false
   }
+  publishing {
+    singleVariant("release") {
+      withSourcesJar()
+    }
+  }
 }
 
 repositories {

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,2 @@
-<manifest package="expo.modules.maps"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

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

@@ -2,7 +2,6 @@ package expo.modules.maps
 
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.UIManagerModule
-import expo.modules.core.interfaces.services.UIManager
 import expo.modules.kotlin.Promise
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
@@ -31,7 +30,7 @@ class ExpoGoogleMapsModule : Module() {
       }
     }
 
-    ViewManager {
+    View(GoogleMapsView::class) {
       Events(
         "onMapPress",
         "onLongPress",
@@ -50,13 +49,6 @@ class ExpoGoogleMapsModule : Module() {
         "onLocationChange"
       )
 
-      View {
-        GoogleMapsView(it).also { googleMapsView ->
-          appContext.legacyModule<UIManager>()
-            ?.registerLifecycleEventListener(googleMapsView.lifecycleEventListener)
-        }
-      }
-
       OnViewDestroys<GoogleMapsView> {
         it.onViewDestroyed()
       }

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

@@ -7,6 +7,8 @@ import com.google.android.gms.maps.MapView
 import com.google.android.gms.maps.OnMapReadyCallback
 import com.google.android.gms.maps.model.MapStyleOptions
 import com.google.maps.android.collections.MarkerManager
+import expo.modules.core.interfaces.services.UIManager
+import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.Promise
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.maps.*
@@ -16,7 +18,7 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.collectLatest
 
-class GoogleMapsView(context: Context) : LinearLayout(context), OnMapReadyCallback, ExpoMapView {
+class GoogleMapsView(context: Context, appContext: AppContext) : LinearLayout(context), OnMapReadyCallback, ExpoMapView {
 
   private val mapView: MapView = MapView(context)
   private lateinit var googleMap: GoogleMap
@@ -63,6 +65,9 @@ class GoogleMapsView(context: Context) : LinearLayout(context), OnMapReadyCallba
     mapView.onStart()
     mapView.onResume()
     addView(mapView)
+
+    appContext.legacyModule<UIManager>()
+      ?.registerLifecycleEventListener(lifecycleEventListener)
   }
 
   override fun onMapReady(googleMap: GoogleMap) {

package/ios/ExpoMaps.podspec

@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
   s.requires_arc   = true
   
   s.dependency 'ExpoModulesCore'
-  s.dependency 'GoogleMaps', '7.1.0'
+  s.dependency 'GoogleMaps', '7.3.0'
 #  s.dependency 'Google-Maps-iOS-Utils', '4.1.0'
-  s.dependency 'GooglePlaces', '7.1.0'
+  s.dependency 'GooglePlaces', '7.3.0'
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-maps",
-  "version": "0.0.2",
+  "version": "0.2.0",
   "description": "ExpoMaps standalone module",
   "main": "build/Map.js",
   "types": "build/Map.d.ts",
@@ -41,5 +41,5 @@
   "jest": {
     "preset": "expo-module-scripts/ios"
   },
-  "gitHead": "1f8a6a09570fd451378565ca34933018ce48454e"
+  "gitHead": "79607a7325f47aa17c36d266100d09a4ff2cc544"
 }

package/tsconfig.json

@@ -5,5 +5,5 @@
     "outDir": "./build"
   },
   "include": ["./src"],
-  "exclude": ["**/__mocks__/*", "**/__tests__/*", "**/__stories__/*"]
+  "exclude": ["**/__mocks__/*", "**/__tests__/*"]
 }