react-native-maps 0.31.0-beta.4 → 0.31.0

package/android/build.gradle

@@ -1,9 +1,24 @@
-apply plugin: 'com.android.library'
-
 def safeExtGet(prop, fallback) {
   rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
+buildscript {
+  // The Android Gradle plugin is only required when opening the android folder stand-alone.
+  // This avoids unnecessary downloads and potential conflicts when the library is included as a
+  // module dependency in an application project.
+  if (project == rootProject) {
+    repositories {
+      google()
+      mavenCentral()
+    }
+    dependencies {
+      classpath("com.android.tools.build:gradle:4.2.2")
+    }
+  }
+}
+
+apply plugin: 'com.android.library'
+
 android {
   compileSdkVersion safeExtGet('compileSdkVersion', 30)
 
@@ -13,6 +28,20 @@ android {
   }
 }
 
+repositories {
+  mavenLocal()
+  mavenCentral()
+  maven {
+    // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+    url "$rootDir/../node_modules/react-native/android"
+  }
+  maven {
+    // Android JSC is installed from npm
+    url "$rootDir/../node_modules/jsc-android/dist"
+  }
+  google()
+}
+
 dependencies {
   def work_version = safeExtGet('targetSdkVersion', 27) < 31 ? "2.5.0" : "2.7.1"
   implementation 'com.facebook.react:react-native:+'

package/android/src/main/java/com/airbnb/android/react/maps/AirMapCalloutManager.java

@@ -1,5 +1,7 @@
 package com.airbnb.android.react.maps;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.ThemedReactContext;
@@ -8,8 +10,6 @@ import com.facebook.react.uimanager.annotations.ReactProp;
 
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 public class AirMapCalloutManager extends ViewGroupManager<AirMapCallout> {
 
   @Override

package/android/src/main/java/com/airbnb/android/react/maps/AirMapManager.java

@@ -2,6 +2,8 @@ package com.airbnb.android.react.maps;
 
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
@@ -24,8 +26,6 @@ import com.google.android.gms.maps.model.MapStyleOptions;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 public class AirMapManager extends ViewGroupManager<AirMapView> {
 
   private static final String REACT_CLASS = "AIRMap";

package/android/src/main/java/com/airbnb/android/react/maps/AirMapMarker.java

@@ -14,6 +14,8 @@ import android.animation.ObjectAnimator;
 import android.util.Property;
 import android.animation.TypeEvaluator;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.common.references.CloseableReference;
 import com.facebook.datasource.DataSource;
 import com.facebook.drawee.backends.pipeline.Fresco;
@@ -38,8 +40,6 @@ import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
 
-import javax.annotation.Nullable;
-
 public class AirMapMarker extends AirMapFeature {
 
   private MarkerOptions markerOptions;

package/android/src/main/java/com/airbnb/android/react/maps/AirMapMarkerManager.java

@@ -4,6 +4,8 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.MapBuilder;
@@ -20,8 +22,6 @@ import java.util.Map;
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.annotation.Nullable;
-
 public class AirMapMarkerManager extends ViewGroupManager<AirMapMarker> {
 
   private static final int SHOW_INFO_WINDOW = 1;

package/android/src/main/java/com/airbnb/android/react/maps/AirMapModule.java

@@ -10,6 +10,9 @@ import android.util.Base64;
 import android.util.DisplayMetrics;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -23,6 +26,7 @@ import com.facebook.react.uimanager.UIBlock;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.MapsInitializer;
+import com.google.android.gms.maps.OnMapsSdkInitializedCallback;
 import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.LatLng;
 
@@ -36,8 +40,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
-import javax.annotation.Nullable;
-
 @ReactModule(name = AirMapModule.NAME)
 public class AirMapModule extends ReactContextBaseJavaModule {
 
@@ -365,9 +367,12 @@ public class AirMapModule extends ReactContextBaseJavaModule {
       @Override
       public void execute(NativeViewHierarchyManager nvhm)
       {
-        MapsInitializer.initialize(context, MapsInitializer.Renderer.LATEST, (MapsInitializer.Renderer renderer) -> {
-          Log.d("AirMapRenderer", renderer.toString());
-          promise.resolve(renderer.toString());
+        MapsInitializer.initialize(context, MapsInitializer.Renderer.LATEST, new OnMapsSdkInitializedCallback() {
+          @Override
+          public void onMapsSdkInitialized(@NonNull MapsInitializer.Renderer renderer) {
+            Log.d("AirMapRenderer", renderer.toString());
+            promise.resolve(renderer.toString());
+          }
         });
       }
     });

package/android/src/main/java/com/airbnb/android/react/maps/AirMapOverlayManager.java

@@ -5,6 +5,8 @@ import android.os.Build;
 import android.util.DisplayMetrics;
 import android.view.WindowManager;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.common.MapBuilder;
@@ -14,8 +16,6 @@ import com.facebook.react.uimanager.annotations.ReactProp;
 
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 public class AirMapOverlayManager extends ViewGroupManager<AirMapOverlay> {
   private final DisplayMetrics metrics;
 

package/android/src/main/java/com/airbnb/android/react/maps/AirMapPolygonManager.java

@@ -6,6 +6,8 @@ import android.os.Build;
 import android.util.DisplayMetrics;
 import android.view.WindowManager;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.common.MapBuilder;
@@ -15,8 +17,6 @@ import com.facebook.react.uimanager.annotations.ReactProp;
 
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 public class AirMapPolygonManager extends ViewGroupManager<AirMapPolygon> {
   private final DisplayMetrics metrics;
 

package/android/src/main/java/com/airbnb/android/react/maps/AirMapPolylineManager.java

@@ -6,6 +6,8 @@ import android.os.Build;
 import android.util.DisplayMetrics;
 import android.view.WindowManager;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.common.MapBuilder;
@@ -19,8 +21,6 @@ import com.google.android.gms.maps.model.SquareCap;
 
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 public class AirMapPolylineManager extends ViewGroupManager<AirMapPolyline> {
   private final DisplayMetrics metrics;
 

package/android/src/main/java/com/airbnb/android/react/maps/ImageReader.java

@@ -7,6 +7,8 @@ import android.graphics.BitmapFactory;
 import android.graphics.drawable.Animatable;
 import android.net.Uri;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.common.references.CloseableReference;
 import com.facebook.datasource.DataSource;
 import com.facebook.drawee.backends.pipeline.Fresco;
@@ -26,8 +28,6 @@ import com.facebook.imagepipeline.request.ImageRequestBuilder;
 import com.google.android.gms.maps.model.BitmapDescriptor;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 
-import javax.annotation.Nullable;
-
 public class ImageReader {
 
   private final ImageReadable imp;

package/package.json

@@ -4,7 +4,7 @@
   "main": "src/index.js",
   "types": "index.d.ts",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
-  "version": "0.31.0-beta.4",
+  "version": "0.31.0",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",

package/react-native-google-maps.podspec

@@ -17,6 +17,6 @@ Pod::Spec.new do |s|
   s.compiler_flags = '-DHAVE_GOOGLE_MAPS=1', '-DHAVE_GOOGLE_MAPS_UTILS=1', '-fno-modules'
 
   s.dependency 'React-Core'
-  s.dependency 'GoogleMaps', '6.0.1'
-  s.dependency 'Google-Maps-iOS-Utils', '4.0.0'
+  s.dependency 'GoogleMaps', '6.1.1'
+  s.dependency 'Google-Maps-iOS-Utils', '4.1.0'
 end