Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Vizzuality/react-native-maps
Browse files Browse the repository at this point in the history
* 'master' of github.com:Vizzuality/react-native-maps:
  fix: error syntax on AirMaps max and min zoom level not nil check
  Add minZoom and maxZoom properties for android and ios (react-native-maps#1360)
  Reference install solution in issue react-native-maps#718 in install docs (react-native-maps#1448)
  updates npm cache clean command (react-native-maps#1450)
  v0.15.3
  Added BatchedBridge
  Upgraded ios deps
  Use prop-types and add supprort for RN 0.45
  Allow react 16.0.0-alpha
  [Android] Code cleanup step I - reformatting (react-native-maps#1415)
  Fixes google map null pointer exception (react-native-maps#1403)
  [iOS - Google Maps] Fix animateToCoordinate and animateToRegion (react-native-maps#1115)
  Update from View.propTypes to ViewPropTypes to match RN v0.44.0 (react-native-maps#1323)
  Fix import header for React Native 0.44.2 (react-native-maps#1362)
  Fix a couple typos (react-native-maps#1375)
  • Loading branch information
j8seangel committed Jul 12, 2017
2 parents 016d8a7 + cdd2c3b commit 03c46c4
Show file tree
Hide file tree
Showing 55 changed files with 3,102 additions and 2,461 deletions.
265 changes: 265 additions & 0 deletions .idea/codeStyleSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .jscodeshiftignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# To run a codeshift on the react-native-maps library, cd to the root dir and run:
# jscodeshift -t PATH_TO_TRANSFORM . --ignore-config .jscodeshiftignore
.idea
android
docs
example
gradle
node_modules
scripts
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Change Log

## 0.15.3 (June 27, 2017)

* iOS: [#1362](https://github.com/airbnb/react-native-maps/pull/1362) Updates for React 0.43-0.45 and React 16.
* JS: [#1323](https://github.com/airbnb/react-native-maps/pull/1323) Updates for React 0.43-0.45 and React 16.
* Android/iOS/JS: [#1440](https://github.com/airbnb/react-native-maps/pull/1440) Updates for React 0.43-0.45 and React 16.
* iOS: [#1115](https://github.com/airbnb/react-native-maps/pull/1115) Fix animateToCoordinate and animateToRegion
* Android: [#1403](https://github.com/airbnb/react-native-maps/pull/1403) Fix an NPE

## 0.15.2 (May 20, 2017)

* iOS: [#1351](https://github.com/airbnb/react-native-maps/pull/1351) Fix file references
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Then add the AirGoogleMaps directory:

https://github.com/airbnb/react-native-maps/blob/1e71a21f39e7b88554852951f773c731c94680c9/docs/installation.md#ios

An unoffical step-by-step guide is also available at https://gist.github.com/heron2014/e60fa003e9b117ce80d56bb1d5bfe9e0
An unofficial step-by-step guide is also available at https://gist.github.com/heron2014/e60fa003e9b117ce80d56bb1d5bfe9e0

## Examples

Expand Down
4 changes: 3 additions & 1 deletion docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ Source: https://developers.google.com/maps/documentation/android-api/signup

## Troubleshooting

If you get the error `duplicate symbols for architecture x86_64` when building for iOS, you may need to reconfigure your linking and Podfile as [described in detail in this comment on issue #718](https://github.com/airbnb/react-native-maps/issues/718#issuecomment-295585410)

If you have a blank map issue, ([#118](https://github.com/airbnb/react-native-maps/issues/118), [#176](https://github.com/airbnb/react-native-maps/issues/176), [#684](https://github.com/airbnb/react-native-maps/issues/684)), try the following lines :

### On iOS:
Expand Down Expand Up @@ -203,7 +205,7 @@ Enter the name of the API key and create it.
1. Clean the cache :
```
watchman watch-del-all
npm clean cache
npm cache clean
```

1. When starting emulator, make sure you have enabled `Wipe user data`.
Expand Down
8 changes: 4 additions & 4 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def enableProguardInReleaseBuilds = false

android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
buildToolsVersion "25.0.3"

defaultConfig {
applicationId "com.airbnb.android.react.maps.example"
Expand Down Expand Up @@ -127,8 +127,8 @@ android {
}

dependencies {
compile 'com.facebook.react:react-native:0.42.+'
compile 'com.android.support:appcompat-v7:25.1.1'
compile 'com.android.support:support-annotations:25.1.1'
compile 'com.facebook.react:react-native:0.45.+'
compile 'com.android.support:appcompat-v7:25.3.0'
compile 'com.android.support:support-annotations:25.3.0'
compile project(':react-native-maps-lib')
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@


public class MainActivity extends ReactActivity {

/**
* Returns the name of the main component registered from JavaScript.
* This is used to schedule rendering of the component.
*/
@Override
protected String getMainComponentName() {
return "AirMapsExplorer";
}

/**
* Returns the name of the main component registered from JavaScript.
* This is used to schedule rendering of the component.
*/
@Override
protected String getMainComponentName() {
return "AirMapsExplorer";
}
}
Loading

0 comments on commit 03c46c4

Please sign in to comment.