react-native-maps 0.31.0-beta.3 → 0.31.0-beta.6

package/{lib/android → android}/build.gradle

@@ -1,30 +1,21 @@
 apply plugin: 'com.android.library'
-if (project.hasProperty('POM_ARTIFACT_ID')) {
-  apply from: 'gradle-maven-push.gradle'
-}
 
 def safeExtGet(prop, fallback) {
   rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
 android {
-  compileSdkVersion safeExtGet('compileSdkVersion', 28)
+  compileSdkVersion safeExtGet('compileSdkVersion', 30)
 
   defaultConfig {
     minSdkVersion safeExtGet('minSdkVersion', 21)
-    targetSdkVersion safeExtGet('targetSdkVersion', 27)
+    targetSdkVersion safeExtGet('targetSdkVersion', 30)
   }
 }
 
 dependencies {
   def work_version = safeExtGet('targetSdkVersion', 27) < 31 ? "2.5.0" : "2.7.1"
-  def supportLibVersion = safeExtGet('supportLibVersion', '28.0.0')
-  def supportLibMajorVersion = supportLibVersion.split('\\.')[0] as int
-  def appCompatLibName =  (supportLibMajorVersion < 20) ? "androidx.appcompat:appcompat" : "com.android.support:appcompat-v7"
-  implementation "$appCompatLibName:$supportLibVersion"
-  implementation('com.facebook.react:react-native:+') {
-    exclude group: 'com.android.support'
-  }
+  implementation 'com.facebook.react:react-native:+'
   implementation "com.google.android.gms:play-services-base:${safeExtGet('playServicesVersion', '18.0.1')}"
   implementation "com.google.android.gms:play-services-maps:${safeExtGet('playServicesVersion', '18.0.2')}"
   implementation "com.google.android.gms:play-services-location:19.0.1"

package/{lib/android → android}/src/main/java/com/airbnb/android/react/maps/AirMapModule.java

@@ -10,6 +10,8 @@ import android.util.Base64;
 import android.util.DisplayMetrics;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -23,6 +25,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;
 
@@ -365,9 +368,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/package.json

@@ -1,9 +1,10 @@
 {
   "name": "react-native-maps",
   "description": "React Native Mapview component for iOS + Android",
-  "main": "index.js",
+  "main": "src/index.js",
+  "types": "index.d.ts",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
-  "version": "0.31.0-beta.3",
+  "version": "0.31.0-beta.6",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",
@@ -13,12 +14,13 @@
   },
   "files": [
     "index.d.ts",
-    "lib",
+    "android",
+    "ios",
+    "src",
     "react-native-google-maps.podspec",
     "react-native-maps.podspec",
-    "react-native.config.js",
-    "!lib/android/build",
-    "!lib/ios/build",
+    "!android/build",
+    "!ios/build",
     "!**/__tests__",
     "!**/__fixtures__",
     "!**/__mocks__"
@@ -37,7 +39,7 @@
     "mapkit"
   ],
   "peerDependencies": {
-    "react": ">= 16.0 || < 18.0",
+    "react": ">= 16.0",
     "react-native": ">= 0.51",
     "react-native-web": ">= 0.11"
   },

package/react-native-google-maps.podspec

@@ -13,10 +13,10 @@ Pod::Spec.new do |s|
   s.platform     = :ios, "12.0"
 
   s.source       = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
-  s.source_files  = "lib/ios/AirGoogleMaps/**/*.{h,m}"
+  s.source_files  = "ios/AirGoogleMaps/**/*.{h,m}"
   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

package/react-native-maps.podspec

@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
   s.platform     = :ios, "12.0"
 
   s.source       = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
-  s.source_files  = "lib/ios/AirMaps/**/*.{h,m}"
+  s.source_files  = "ios/AirMaps/**/*.{h,m}"
 
   s.dependency 'React-Core'
 end

package/src/index.js

@@ -0,0 +1,31 @@
+import MapView, {
+  Animated,
+  MAP_TYPES,
+  ProviderPropType,
+  enableLatestRenderer,
+} from './MapView';
+import Marker from './MapMarker';
+import Overlay from './MapOverlay';
+
+export { default as Polyline } from './MapPolyline';
+export { default as Heatmap } from './MapHeatmap';
+export { default as Polygon } from './MapPolygon';
+export { default as Circle } from './MapCircle';
+export { default as UrlTile } from './MapUrlTile';
+export { default as WMSTile } from './MapWMSTile';
+export { default as LocalTile } from './MapLocalTile';
+export { default as Callout } from './MapCallout';
+export { default as CalloutSubview } from './MapCalloutSubview';
+export { default as AnimatedRegion } from './AnimatedRegion';
+export { default as Geojson } from './Geojson';
+
+export { Marker, Overlay };
+export { Animated, MAP_TYPES, ProviderPropType, enableLatestRenderer };
+
+export const PROVIDER_GOOGLE = MapView.PROVIDER_GOOGLE;
+export const PROVIDER_DEFAULT = MapView.PROVIDER_DEFAULT;
+
+export const MarkerAnimated = Marker.Animated;
+export const OverlayAnimated = Overlay.Animated;
+
+export default MapView;

package/index.js

@@ -1,31 +0,0 @@
-import MapView, {
-  Animated,
-  MAP_TYPES,
-  ProviderPropType,
-  enableLatestRenderer,
-} from './lib/components/MapView';
-import Marker from './lib/components/MapMarker.js';
-import Overlay from './lib/components/MapOverlay.js';
-
-export { default as Polyline } from './lib/components/MapPolyline.js';
-export { default as Heatmap } from './lib/components/MapHeatmap.js';
-export { default as Polygon } from './lib/components/MapPolygon.js';
-export { default as Circle } from './lib/components/MapCircle.js';
-export { default as UrlTile } from './lib/components/MapUrlTile.js';
-export { default as WMSTile } from './lib/components/MapWMSTile.js';
-export { default as LocalTile } from './lib/components/MapLocalTile.js';
-export { default as Callout } from './lib/components/MapCallout.js';
-export { default as CalloutSubview } from './lib/components/MapCalloutSubview.js';
-export { default as AnimatedRegion } from './lib/components/AnimatedRegion.js';
-export { default as Geojson } from './lib/components/Geojson.js';
-
-export { Marker, Overlay };
-export { Animated, MAP_TYPES, ProviderPropType, enableLatestRenderer };
-
-export const PROVIDER_GOOGLE = MapView.PROVIDER_GOOGLE;
-export const PROVIDER_DEFAULT = MapView.PROVIDER_DEFAULT;
-
-export const MarkerAnimated = Marker.Animated;
-export const OverlayAnimated = Overlay.Animated;
-
-export default MapView;

package/lib/android/gradle-maven-push.gradle

@@ -1,114 +0,0 @@
-/*
- * Copyright 2013 Chris Banes
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-apply plugin: 'maven'
-apply plugin: 'signing'
-
-def isReleaseBuild() {
-  return VERSION_NAME.contains("SNAPSHOT") == false
-}
-
-def getReleaseRepositoryUrl() {
-  return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
-      : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-}
-
-def getSnapshotRepositoryUrl() {
-  return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL
-      : "https://oss.sonatype.org/content/repositories/snapshots/"
-}
-
-def getRepositoryUsername() {
-  return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : ""
-}
-
-def getRepositoryPassword() {
-  return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
-}
-
-afterEvaluate { project ->
-  uploadArchives {
-    repositories {
-      mavenDeployer {
-        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-        pom.groupId = GROUP
-        pom.artifactId = POM_ARTIFACT_ID
-        pom.version = VERSION_NAME
-
-        repository(url: getReleaseRepositoryUrl()) {
-          authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-        }
-        snapshotRepository(url: getSnapshotRepositoryUrl()) {
-          authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-        }
-
-        pom.project {
-          name POM_NAME
-          packaging POM_PACKAGING
-          description POM_DESCRIPTION
-          url POM_URL
-
-          scm {
-            url POM_SCM_URL
-            connection POM_SCM_CONNECTION
-            developerConnection POM_SCM_DEV_CONNECTION
-          }
-
-          licenses {
-            license {
-              name POM_LICENSE_NAME
-              url POM_LICENSE_URL
-              distribution POM_LICENSE_DIST
-            }
-          }
-
-          developers {
-            developer {
-              id POM_DEVELOPER_ID
-              name POM_DEVELOPER_NAME
-            }
-          }
-        }
-      }
-    }
-  }
-
-  signing {
-    required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
-    sign configurations.archives
-  }
-
-  task androidJavadocs(type: Javadoc) {
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-  }
-
-  task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-    classifier = 'javadoc'
-    from androidJavadocs.destinationDir
-  }
-
-  task androidSourcesJar(type: Jar) {
-    classifier = 'sources'
-    from android.sourceSets.main.java.sourceFiles
-  }
-
-  artifacts {
-    archives androidSourcesJar
-    archives androidJavadocsJar
-  }
-}

package/react-native.config.js

@@ -1,9 +0,0 @@
-module.exports = {
-  dependency: {
-    platforms: {
-      android: {
-        sourceDir: './lib/android',
-      },
-    },
-  },
-};