Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 05ab508

Browse files
author
Spike Brehm
authoredOct 14, 2016
Merge pull request react-native-maps#695 from airbnb/example-app-0.35
Update example app for RN 0.35, fix Gmaps bug for 0.35
2 parents a8b7ead + 8e347e2 commit 05ab508

File tree

4 files changed

+15
-16
lines changed

4 files changed

+15
-16
lines changed
 

‎example/ios/Podfile.lock

+11-13
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,25 @@ PODS:
44
- GoogleMaps/Base (2.1.0)
55
- GoogleMaps/Maps (2.1.0):
66
- GoogleMaps/Base (= 2.1.0)
7-
- React/Core (0.33.0):
8-
- React/CSSLayout
9-
- React/CSSLayout (0.33.0)
10-
- React/RCTActionSheet (0.33.0):
7+
- React/Core (0.35.0)
8+
- React/RCTActionSheet (0.35.0):
119
- React/Core
12-
- React/RCTGeolocation (0.33.0):
10+
- React/RCTGeolocation (0.35.0):
1311
- React/Core
14-
- React/RCTImage (0.33.0):
12+
- React/RCTImage (0.35.0):
1513
- React/Core
1614
- React/RCTNetwork
17-
- React/RCTLinkingIOS (0.33.0):
15+
- React/RCTLinkingIOS (0.35.0):
1816
- React/Core
19-
- React/RCTNetwork (0.33.0):
17+
- React/RCTNetwork (0.35.0):
2018
- React/Core
21-
- React/RCTSettings (0.33.0):
19+
- React/RCTSettings (0.35.0):
2220
- React/Core
23-
- React/RCTText (0.33.0):
21+
- React/RCTText (0.35.0):
2422
- React/Core
25-
- React/RCTVibration (0.33.0):
23+
- React/RCTVibration (0.35.0):
2624
- React/Core
27-
- React/RCTWebSocket (0.33.0):
25+
- React/RCTWebSocket (0.35.0):
2826
- React/Core
2927

3028
DEPENDENCIES:
@@ -46,6 +44,6 @@ EXTERNAL SOURCES:
4644

4745
SPEC CHECKSUMS:
4846
GoogleMaps: 06589b9a38097bce0cd6e90f0fd9b5e4b4a9344c
49-
React: 46edc166689ba71b0b6cf11e64dbdb258d177089
47+
React: d80af5410aa500d0cb1bce2cc4493a584cf2ec92
5048

5149
COCOAPODS: 0.39.0

‎example/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"dev": "concurrently 'npm run watch' 'npm run packager'"
1010
},
1111
"dependencies": {
12-
"react": "15.3.0",
13-
"react-native": "0.33.0",
12+
"react": "^15.3.1",
13+
"react-native": "^0.35.0",
1414
"react-native-maps": "../"
1515
},
1616
"devDependencies": {

‎ios/AirGoogleMaps/AIRGoogleMapMarker.m

+1
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ - (void)setImageSrc:(NSString *)imageSrc
188188
clipped:YES
189189
resizeMode:RCTResizeModeCenter
190190
progressBlock:nil
191+
partialLoadBlock:nil
191192
completionBlock:^(NSError *error, UIImage *image) {
192193
if (error) {
193194
// TODO(lmr): do something with the error?

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"mapkit"
2323
],
2424
"peerDependencies": {
25-
"react": ">=15.3.0",
25+
"react": ">=15.3.1",
2626
"react-native": ">=0.35"
2727
},
2828
"devDependencies": {

0 commit comments

Comments
 (0)
Please sign in to comment.