Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update example app for RN 0.35, fix Gmaps bug for 0.35 #695

Merged
merged 2 commits into from
Oct 14, 2016
Merged

Update example app for RN 0.35, fix Gmaps bug for 0.35 #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cb998f
Update example app for 0.35.0
Oct 14, 2016
7dfdb77
Fix bug in AIRGoogleMapMarker from RN 0.33->0.35
Oct 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions example/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,25 @@ PODS:
- GoogleMaps/Base (2.1.0)
- GoogleMaps/Maps (2.1.0):
- GoogleMaps/Base (= 2.1.0)
- React/Core (0.33.0):
- React/CSSLayout
- React/CSSLayout (0.33.0)
- React/RCTActionSheet (0.33.0):
- React/Core (0.35.0)
- React/RCTActionSheet (0.35.0):
- React/Core
- React/RCTGeolocation (0.33.0):
- React/RCTGeolocation (0.35.0):
- React/Core
- React/RCTImage (0.33.0):
- React/RCTImage (0.35.0):
- React/Core
- React/RCTNetwork
- React/RCTLinkingIOS (0.33.0):
- React/RCTLinkingIOS (0.35.0):
- React/Core
- React/RCTNetwork (0.33.0):
- React/RCTNetwork (0.35.0):
- React/Core
- React/RCTSettings (0.33.0):
- React/RCTSettings (0.35.0):
- React/Core
- React/RCTText (0.33.0):
- React/RCTText (0.35.0):
- React/Core
- React/RCTVibration (0.33.0):
- React/RCTVibration (0.35.0):
- React/Core
- React/RCTWebSocket (0.33.0):
- React/RCTWebSocket (0.35.0):
- React/Core

DEPENDENCIES:
Expand All @@ -46,6 +44,6 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
GoogleMaps: 06589b9a38097bce0cd6e90f0fd9b5e4b4a9344c
React: 46edc166689ba71b0b6cf11e64dbdb258d177089
React: d80af5410aa500d0cb1bce2cc4493a584cf2ec92

COCOAPODS: 0.39.0
4 changes: 2 additions & 2 deletions example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"dev": "concurrently 'npm run watch' 'npm run packager'"
},
"dependencies": {
"react": "15.3.0",
"react-native": "0.33.0",
"react": "^15.3.1",
"react-native": "^0.35.0",
"react-native-maps": "../"
},
"devDependencies": {
Expand Down
1 change: 1 addition & 0 deletions ios/AirGoogleMaps/AIRGoogleMapMarker.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ - (void)setImageSrc:(NSString *)imageSrc
clipped:YES
resizeMode:RCTResizeModeCenter
progressBlock:nil
partialLoadBlock:nil
completionBlock:^(NSError *error, UIImage *image) {
if (error) {
// TODO(lmr): do something with the error?
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"mapkit"
],
"peerDependencies": {
"react": ">=15.3.0",
"react": ">=15.3.1",
"react-native": ">=0.35"
},
"devDependencies": {
Expand Down