Skip to content

Commit 9c88e84

Browse files
ideide
committed
[Podfile] Update the example Podfile for RN 0.40
Tested it with Google Maps support.
1 parent d274eb4 commit 9c88e84

File tree

3 files changed

+39
-55
lines changed

3 files changed

+39
-55
lines changed

‎example/ios/AirMapsExplorer.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
21E6570C1D77591A00B75EE5 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21E6570B1D77591A00B75EE5 /* MobileCoreServices.framework */; };
3333
21E6570E1D77591F00B75EE5 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21E6570D1D77591F00B75EE5 /* MapKit.framework */; };
3434
21E657101D77594C00B75EE5 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21E6570F1D77594C00B75EE5 /* AudioToolbox.framework */; };
35-
3E4E0B5921E01BC4043FD8CD /* Pods_AirMapsExplorer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3591658C00398534590C8751 /* Pods_AirMapsExplorer.framework */; };
3635
8620CC871DBD814A00B79BFE /* AIRGMSMarker.m in Sources */ = {isa = PBXBuildFile; fileRef = 8620CC6E1DBD814A00B79BFE /* AIRGMSMarker.m */; };
3736
8620CC881DBD814A00B79BFE /* AIRGoogleMap.m in Sources */ = {isa = PBXBuildFile; fileRef = 8620CC701DBD814A00B79BFE /* AIRGoogleMap.m */; };
3837
8620CC891DBD814A00B79BFE /* AIRGoogleMapCallout.m in Sources */ = {isa = PBXBuildFile; fileRef = 8620CC721DBD814A00B79BFE /* AIRGoogleMapCallout.m */; };
@@ -50,7 +49,7 @@
5049
8697D6251DBEE22B00DB7D0F /* AIRGoogleMapCircleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8697D6241DBEE22B00DB7D0F /* AIRGoogleMapCircleManager.m */; };
5150
86DE6F881DCE7D21002A5053 /* AIRGoogleMapUrlTile.m in Sources */ = {isa = PBXBuildFile; fileRef = 86DE6F871DCE7D21002A5053 /* AIRGoogleMapUrlTile.m */; };
5251
86DE6F8B1DCE8543002A5053 /* AIRGoogleMapURLTileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 86DE6F8A1DCE8543002A5053 /* AIRGoogleMapURLTileManager.m */; };
53-
C9315A21AD5A149EB5B40F29 /* Pods_AirMapsExplorer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 24EB66BA0860A4DCD4CA3D77 /* Pods_AirMapsExplorer.framework */; };
52+
A622B8115793E41C70169A8B /* libPods-AirMapsExplorer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E5044A406006E7C2A53E05C /* libPods-AirMapsExplorer.a */; };
5453
/* End PBXBuildFile section */
5554

5655
/* Begin PBXContainerItemProxy section */
@@ -66,6 +65,7 @@
6665
/* Begin PBXFileReference section */
6766
008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
6867
00E356EE1AD99517003FC87E /* AirMapsExplorerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AirMapsExplorerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
68+
0E5044A406006E7C2A53E05C /* libPods-AirMapsExplorer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-AirMapsExplorer.a"; sourceTree = BUILT_PRODUCTS_DIR; };
6969
13B07F961A680F5B00A75B9A /* AirMapsExplorer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AirMapsExplorer.app; sourceTree = BUILT_PRODUCTS_DIR; };
7070
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = AirMapsExplorer/AppDelegate.h; sourceTree = "<group>"; };
7171
13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = AirMapsExplorer/AppDelegate.m; sourceTree = "<group>"; };
@@ -116,7 +116,6 @@
116116
21E6570B1D77591A00B75EE5 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
117117
21E6570D1D77591F00B75EE5 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; };
118118
21E6570F1D77594C00B75EE5 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
119-
3591658C00398534590C8751 /* Pods_AirMapsExplorer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AirMapsExplorer.framework; sourceTree = BUILT_PRODUCTS_DIR; };
120119
8620CC6D1DBD814A00B79BFE /* AIRGMSMarker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIRGMSMarker.h; sourceTree = "<group>"; };
121120
8620CC6E1DBD814A00B79BFE /* AIRGMSMarker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIRGMSMarker.m; sourceTree = "<group>"; };
122121
8620CC6F1DBD814A00B79BFE /* AIRGoogleMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIRGoogleMap.h; sourceTree = "<group>"; };
@@ -147,12 +146,12 @@
147146
8697D6211DBEDE6100DB7D0F /* AIRGoogleMapCircle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIRGoogleMapCircle.m; sourceTree = "<group>"; };
148147
8697D6231DBEE22B00DB7D0F /* AIRGoogleMapCircleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIRGoogleMapCircleManager.h; sourceTree = "<group>"; };
149148
8697D6241DBEE22B00DB7D0F /* AIRGoogleMapCircleManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIRGoogleMapCircleManager.m; sourceTree = "<group>"; };
150-
BE5DE1E9AE25978F88CD940A /* Pods-AirMapsExplorer.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AirMapsExplorer.debug.xcconfig"; path = "Pods/Target Support Files/Pods-AirMapsExplorer/Pods-AirMapsExplorer.debug.xcconfig"; sourceTree = "<group>"; };
151-
E138AD0CDB08FE57B09B18F8 /* Pods-AirMapsExplorer.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AirMapsExplorer.release.xcconfig"; path = "Pods/Target Support Files/Pods-AirMapsExplorer/Pods-AirMapsExplorer.release.xcconfig"; sourceTree = "<group>"; };
152149
86DE6F861DCE7D21002A5053 /* AIRGoogleMapUrlTile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIRGoogleMapUrlTile.h; sourceTree = "<group>"; };
153150
86DE6F871DCE7D21002A5053 /* AIRGoogleMapUrlTile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIRGoogleMapUrlTile.m; sourceTree = "<group>"; };
154151
86DE6F891DCE8543002A5053 /* AIRGoogleMapUrlTileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIRGoogleMapUrlTileManager.h; sourceTree = "<group>"; };
155152
86DE6F8A1DCE8543002A5053 /* AIRGoogleMapURLTileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIRGoogleMapURLTileManager.m; sourceTree = "<group>"; };
153+
BE5DE1E9AE25978F88CD940A /* Pods-AirMapsExplorer.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AirMapsExplorer.debug.xcconfig"; path = "Pods/Target Support Files/Pods-AirMapsExplorer/Pods-AirMapsExplorer.debug.xcconfig"; sourceTree = "<group>"; };
154+
E138AD0CDB08FE57B09B18F8 /* Pods-AirMapsExplorer.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AirMapsExplorer.release.xcconfig"; path = "Pods/Target Support Files/Pods-AirMapsExplorer/Pods-AirMapsExplorer.release.xcconfig"; sourceTree = "<group>"; };
156155
/* End PBXFileReference section */
157156

158157
/* Begin PBXFrameworksBuildPhase section */
@@ -171,7 +170,7 @@
171170
21E6570E1D77591F00B75EE5 /* MapKit.framework in Frameworks */,
172171
21E6570C1D77591A00B75EE5 /* MobileCoreServices.framework in Frameworks */,
173172
21E6570A1D77591400B75EE5 /* SystemConfiguration.framework in Frameworks */,
174-
3E4E0B5921E01BC4043FD8CD /* Pods_AirMapsExplorer.framework in Frameworks */,
173+
A622B8115793E41C70169A8B /* libPods-AirMapsExplorer.a in Frameworks */,
175174
);
176175
runOnlyForDeploymentPostprocessing = 0;
177176
};
@@ -190,7 +189,7 @@
190189
21E6570D1D77591F00B75EE5 /* MapKit.framework */,
191190
21E6570B1D77591A00B75EE5 /* MobileCoreServices.framework */,
192191
21E657091D77591400B75EE5 /* SystemConfiguration.framework */,
193-
3591658C00398534590C8751 /* Pods_AirMapsExplorer.framework */,
192+
0E5044A406006E7C2A53E05C /* libPods-AirMapsExplorer.a */,
194193
);
195194
name = Frameworks;
196195
sourceTree = "<group>";

‎example/ios/Podfile‎

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
1-
# You Podfile should look similar to this file. Whether you use_frameworks! or not, the following configuration should work.
2-
#
3-
# However if you DO NOT use_frameworks! and you prefer to install pods instead of
4-
# dragging the AirMaps directory into your project, refer to the comments below (steps 1~4)
5-
1+
# You Podfile should look similar to this file. React Native currently does not support use_frameworks!
62
source 'https://github.com/CocoaPods/Specs.git'
73

84
platform :ios, '8.0'
9-
use_frameworks!
105

116
# Change 'AirMapsExplorer' to match the target in your Xcode project.
127
target 'AirMapsExplorer' do
138
pod 'React', path: '../node_modules/react-native', :subspecs => [
149
'Core',
1510
'RCTActionSheet',
11+
'RCTAnimation',
1612
'RCTGeolocation',
1713
'RCTImage',
1814
'RCTLinkingIOS',
@@ -23,29 +19,9 @@ target 'AirMapsExplorer' do
2319
'RCTWebSocket'
2420
]
2521

26-
# when not using frameworks we can do this instead of including the source files in our project (1/4):
27-
# pod 'react-native-maps', path: '../../'
28-
# pod 'react-native-google-maps', path: '../../' # <~~ if you need GoogleMaps support on iOS
29-
30-
# when not using frameworks we can remove this line (2/4):
3122
pod 'GoogleMaps' # <~~ remove this line if you do not want to support GoogleMaps on iOS
32-
end
3323

34-
# when not using frameworks this might be necessary, but try without it first and see if `pod install` works (3/4):
35-
# THIS IS ONLY NECESSARY IF YOU NEED GoogleMaps SUPPORT
36-
# pre_install do |installer|
37-
# # copied from https://github.com/CocoaPods/CocoaPods/issues/2926
38-
# # workaround for https://github.com/CocoaPods/CocoaPods/issues/3289
39-
# def installer.verify_no_static_framework_transitive_dependencies; end
40-
# end
41-
42-
# when not using frameworks (4/4):
43-
# THIS IS ONLY NECESSARY IF YOU NEED GoogleMaps SUPPORT
44-
# #Crud, this shouldn't be necessary, but https://github.com/CocoaPods/CocoaPods/issues/5429
45-
# post_install do |installer|
46-
# installer.pods_project.targets.each do |target|
47-
# target.build_configurations.each do |config|
48-
# config.build_settings['CLANG_ENABLE_MODULES'] = 'NO'
49-
# end
50-
# end
51-
# end
24+
# when not using frameworks we can do this instead of including the source files in our project (1/4):
25+
# pod 'react-native-maps', path: '../../'
26+
# pod 'react-native-google-maps', path: '../../' # <~~ if you need GoogleMaps support on iOS
27+
end

‎example/ios/Podfile.lock‎

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,43 @@
11
PODS:
2-
- GoogleMaps (2.1.0):
3-
- GoogleMaps/Maps (= 2.1.0)
4-
- GoogleMaps/Base (2.1.0)
5-
- GoogleMaps/Maps (2.1.0):
6-
- GoogleMaps/Base (= 2.1.0)
7-
- React/Core (0.35.0)
8-
- React/RCTActionSheet (0.35.0):
2+
- GoogleMaps (2.1.1):
3+
- GoogleMaps/Maps (= 2.1.1)
4+
- GoogleMaps/Base (2.1.1)
5+
- GoogleMaps/Maps (2.1.1):
6+
- GoogleMaps/Base
7+
- React/Core (0.40.0):
8+
- React/cxxreact
9+
- React/yoga
10+
- React/cxxreact (0.40.0):
11+
- React/jschelpers
12+
- React/jschelpers (0.40.0)
13+
- React/RCTActionSheet (0.40.0):
914
- React/Core
10-
- React/RCTGeolocation (0.35.0):
15+
- React/RCTAnimation (0.40.0):
1116
- React/Core
12-
- React/RCTImage (0.35.0):
17+
- React/RCTGeolocation (0.40.0):
18+
- React/Core
19+
- React/RCTImage (0.40.0):
1320
- React/Core
1421
- React/RCTNetwork
15-
- React/RCTLinkingIOS (0.35.0):
22+
- React/RCTLinkingIOS (0.40.0):
1623
- React/Core
17-
- React/RCTNetwork (0.35.0):
24+
- React/RCTNetwork (0.40.0):
1825
- React/Core
19-
- React/RCTSettings (0.35.0):
26+
- React/RCTSettings (0.40.0):
2027
- React/Core
21-
- React/RCTText (0.35.0):
28+
- React/RCTText (0.40.0):
2229
- React/Core
23-
- React/RCTVibration (0.35.0):
30+
- React/RCTVibration (0.40.0):
2431
- React/Core
25-
- React/RCTWebSocket (0.35.0):
32+
- React/RCTWebSocket (0.40.0):
2633
- React/Core
34+
- React/yoga (0.40.0)
2735

2836
DEPENDENCIES:
2937
- GoogleMaps
3038
- React/Core (from `../node_modules/react-native`)
3139
- React/RCTActionSheet (from `../node_modules/react-native`)
40+
- React/RCTAnimation (from `../node_modules/react-native`)
3241
- React/RCTGeolocation (from `../node_modules/react-native`)
3342
- React/RCTImage (from `../node_modules/react-native`)
3443
- React/RCTLinkingIOS (from `../node_modules/react-native`)
@@ -43,9 +52,9 @@ EXTERNAL SOURCES:
4352
:path: "../node_modules/react-native"
4453

4554
SPEC CHECKSUMS:
46-
GoogleMaps: 06589b9a38097bce0cd6e90f0fd9b5e4b4a9344c
47-
React: d80af5410aa500d0cb1bce2cc4493a584cf2ec92
55+
GoogleMaps: a5b5bbe47734e2443bde781a6aa64e69fdb6d785
56+
React: 6dfb2f72edb1d74a800127ae157af038646673ce
4857

49-
PODFILE CHECKSUM: be65689c848eff5d4099a483239b72acab62f6a4
58+
PODFILE CHECKSUM: ffbc20bd08f662256d501d07a70e77862684f702
5059

5160
COCOAPODS: 1.1.1

0 commit comments

Comments
 (0)