Merge commit 'f9fef92d9a87b686cb0bbfc2156bacc044d6f688' into eres

# Conflicts: # .gitignore # CHANGELOG.md # example/App.js # example/examples/WMSTiles.js # example/ios/Podfile.lock # gradle.properties # index.d.ts # lib/components/MapWMSTile.js # package.json
netmaxt3r · Aug 15, 2019 · e0cd12b · e0cd12b
2 parents 7dd560a + f9fef92
commit e0cd12b
Show file tree

Hide file tree

Showing 92 changed files with 15,621 additions and 2,915 deletions.
diff --git a/.bundle/config b/.bundle/config
diff --git a/.eslintrc b/.eslintrc
@@ -1,17 +1,7 @@
 {
   "parser": "babel-eslint",
-  "extends": "airbnb",
+  "extends": "@react-native-community",
   "plugins": [
     "prefer-object-spread"
-  ],
-  "rules": {
-    "prefer-object-spread/prefer-object-spread": 2,
-    "react/jsx-filename-extension": 0,
-    "react/prefer-stateless-function": 0,
-    "react/sort-comp": 0,
-    "no-use-before-define": 0,
-    "no-underscore-dangle": 0,
-    "import/no-extraneous-dependencies": 0,
-    "import/no-unresolved": [2, { "ignore": ["^react-native-maps"] }]
-  }
+  ]
 }
diff --git a/.gitignore b/.gitignore
@@ -40,4 +40,6 @@ yarn-error.log
 
 # Bundle artifact
 *.jsbundle
-example/ios/bundles
+
+# VSCode workspace settings
+.vscode
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,4 @@
+{
+	"trailingComma": "es5",
+    "singleQuote": true
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,27 +1,40 @@
 # Change Log
 
-## 0.24.2 (April 17, 2019 )
+## 0.25.0 (July 11, 2019)
+* Android: [#2941](https://github.com/react-native-community/react-native-maps/pull/2941) Fix build gradle to allow jettifier to run correctly
+* Android: [#2741](https://github.com/react-native-community/react-native-maps/pull/2741) Use a shared image icon for markers when they share the same image URI
+* Android: [#2557](https://github.com/react-native-community/react-native-maps/pull/2557) Fix bug when changing subview of Marker to icon
+* Android: [#2392](https://github.com/react-native-community/react-native-maps/pull/2392) Add support for loading base64 encoded image
+* iOS: [#2423](https://github.com/react-native-community/react-native-maps/pull/2423) Handle annotations without images on iOS map snapshot
+* iOS: [#2881](https://github.com/react-native-community/react-native-maps/pull/2881) Update podspec to use GoogleMaps 3.1.0
+* iOS: [#2253](https://github.com/react-native-community/react-native-maps/pull/2253) TestID's for e2e automation
+* iOS: [#2826](https://github.com/react-native-community/react-native-maps/pull/2826) Follow up for [#2253](https://github.com/react-native-community/react-native-maps/pull/2253)
+* iOS: [#2397](https://github.com/react-native-community/react-native-maps/pull/2397) Add compass location offsets for iOS maps
+* Common: [#2568](https://github.com/react-native-community/react-native-maps/pull/2568) Support for WMS Layer support 
+* Common: [#2017](https://github.com/react-native-community/react-native-maps/pull/2017) Update the Google Maps custom map style if changed after initialization
+* Common: [#2903](https://github.com/react-native-community/react-native-maps/pull/2903) Fix react snapshot undefined warning
+
+## 0.24.2 (April 17, 2019)
 * iOS: [#2818](https://github.com/react-native-community/react-native-maps/pull/2818) Google Maps - Weak refs to gesture targets to address memory leak
 
-## 0.24.1 (April 16, 2019 )
+## 0.24.1 (April 16, 2019)
 * iOS: [#2815](https://github.com/react-native-community/react-native-maps/pull/2815) Google Maps - Free instance variable in getActionForTarget to address memory leak
 
-# Change Log
-## 0.24.0 (April 11, 2019 )
+## 0.24.0 (April 11, 2019)
 * Common: [#2740](https://github.com/react-native-community/react-native-maps/pull/2740) Fix deprecated UIManager usage when accessing component names
 * Common: [#2393](https://github.com/react-native-community/react-native-maps/pull/2393) add typings for pointForCoordinate & coordinateForPoint
-* Common: [#2732](https://github.com/react-native-community/react-native-maps/pull/2393) Implement ability to flip y coordinate for Google Map tiles.
-* Android: [#2765](https://github.com/react-native-community/react-native-maps/pull/2764) Allow setting of play-services version through ext
+* Common: [#2732](https://github.com/react-native-community/react-native-maps/pull/2732) Implement ability to flip y coordinate for Google Map tiles.
+* Android: [#2765](https://github.com/react-native-community/react-native-maps/pull/2765) Allow setting of play-services version through ext
 * Android: [#2702](https://github.com/react-native-community/react-native-maps/pull/2702) Enable RN projects to define the Android AppCompat Library version
 * Android: [#2720](https://github.com/react-native-community/react-native-maps/pull/2720) Fix Android dependencies and build errors
 * Android: [#2682](https://github.com/react-native-community/react-native-maps/pull/2682) Implement 'tappable' prop on polyline for Android
 * Android: [#2417](https://github.com/react-native-community/react-native-maps/pull/2417) Support for lineCap and lineDash pattern
-* Android: [#2727](https://github.com/react-native-community/react-native-maps/pull/2417) fix build: only apply mvn push gradle plugin if POM_ARTIFACT_ID is set
+* Android: [#2727](https://github.com/react-native-community/react-native-maps/pull/2727) fix build: only apply mvn push gradle plugin if POM_ARTIFACT_ID is set
 * iOS: [#2446](https://github.com/react-native-community/react-native-maps/pull/2446) fix iOS GoogleMaps camera always animate
 * iOS: [#2746](https://github.com/react-native-community/react-native-maps/pull/2746) onPanDrag support for iOS
 * iOS: [#2581](https://github.com/react-native-community/react-native-maps/pull/2581) Custom callout improvements 🎉
 * iOS: [#2794](https://github.com/react-native-community/react-native-maps/pull/2794) Fix CalloutSubview on Apple maps
-* iOS: [#2716](https://github.com/react-native-community/react-native-maps/pull/2716) Fix Memory Leaks 
+* iOS: [#2716](https://github.com/react-native-community/react-native-maps/pull/2716) Fix Memory Leaks
 * Docs: [#2675](https://github.com/react-native-community/react-native-maps/pull/2675) [#2685](https://github.com/react-native-community/react-native-maps/pull/2685)  [#2707](https://github.com/react-native-community/react-native-maps/pull/2707) [#2704](https://github.com/react-native-community/react-native-maps/pull/2704)
 * Example: [#2792](https://github.com/react-native-community/react-native-maps/pull/2792) Upgrade Example to react-native to 0.59.3
 * TypeScript: [#2705](https://github.com/react-native-community/react-native-maps/pull/2705) Add Marker icon property introduced in [#2650](https://github.com/react-native-community/react-native-maps/pull/2650) to index.d.ts

diff --git a/docs/installation.md b/docs/installation.md
@@ -204,7 +204,7 @@ ext {
     targetSdkVersion    = 26
     buildToolsVersion   = "26.0.2"
     supportLibVersion   = "26.1.0"
-    googlePlayServicesVersion = "11.8.0"
+    googlePlayServicesVersion = "16.1.0" // or set latest version
     androidMapsUtilsVersion = "0.5+"
 }
 ```
@@ -272,7 +272,6 @@ import com.airbnb.android.react.maps.MapsPackage;
     from there you will see a button to update it (do not search within the
     Play Store).
 
-
 ## Troubleshooting
 
 ### The map background is blank (Google Maps)
@@ -295,7 +294,6 @@ For reference, you may read the relevant issue reports: ([#118](https://github.c
 Ensure the map component and its container have viewport dimensions. An
 example is below:
 
-
 ```jsx
 import MapView, { PROVIDER_GOOGLE } from 'react-native-maps'; // remove PROVIDER_GOOGLE import if not using Google Maps
 ...
@@ -434,3 +432,22 @@ import com.airbnb.android.react.maps.MapsPackage;
     
     
   ```
+
+### Trouble with Google Play services
+
+- Make sure that your emulator has Google Play (Go to Anroid studio -> Virtual Devices -> Check that you have icon in "Play Store" column)
+- Click to bottom dots icon in the emulator
+- Go to Google Play Tab and click Update
+
+
+### Android build error: "Program type already present"
+
+If you **don't** use project-wide properties as per instructions above (not making changes to global android/build.gradle) and encounter at build time "Program type already present" error - add those lines to your android/app/build.gradle in the dependencies section:
+
+    dependencies {
+    ...
+    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
+    implementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
+    implementation "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
+    }     
+