Skip to content

Commit 99308d4

Browse files
chore: Update Maps and Places samples from CocoaPods (#97)
1 parent 94d5694 commit 99308d4

File tree

16 files changed

+239
-135
lines changed

16 files changed

+239
-135
lines changed

GoogleMaps-Swift/GoogleMapsSwiftDemos.xcodeproj/project.pbxproj

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
19A020B8B2E13315FB1FBB7C /* SDKConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE91B8EA42AFFCEDA758CE06 /* SDKConstants.swift */; };
2323
1A8337A7BA9AC8592D18D53E /* DoubleMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBFD03041A5EAA400168D31F /* DoubleMapViewController.swift */; };
2424
1DBCCE34928139735723F32B /* TileLayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 962C5BE26208B06737B4653C /* TileLayerViewController.swift */; };
25+
1E1F763E0B00E5753BE87A40 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 50A3566BBA7BDEB5711EB9A8 /* libPods-GoogleMapsSwiftDemos.a */; };
2526
1E769ACDBCCB6DB84D5E3E8E /* h1.png in Resources */ = {isa = PBXBuildFile; fileRef = 996FCE46D4BD31A4E02C2473 /* h1.png */; };
2627
1E9BE1CAAF51CB3B59F863E6 /* SampleMapStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = E18764F42392A93B39C775AB /* SampleMapStyle.swift */; };
2728
20F35834239A135EC77A752C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 221F6743F6F3DB331816D7D3 /* [email protected] */; };
@@ -30,7 +31,6 @@
3031
24B16FDC0833853A493A0CAF /* MyLocationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A7916340031F78D38C594C4 /* MyLocationViewController.swift */; };
3132
26B8792B58E56800CA3D60ED /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = AD1D1A994D7ECBF890F0034A /* [email protected] */; };
3233
293B8794611FD45B631FE20C /* step2.png in Resources */ = {isa = PBXBuildFile; fileRef = C5014E3BCF7EBF869B9F9BC7 /* step2.png */; };
33-
29497B1CC830E45D121D5303 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BF836285C425ADB3DBE3B9D1 /* libPods-GoogleMapsSwiftDemos.a */; };
3434
29803C45F8CF8BCBC14DFB11 /* FitBoundsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBE707A4130CDA88BBCC2DD4 /* FitBoundsViewController.swift */; };
3535
2BAFFBE5609D779839846AB8 /* VisibleRegionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69B644212DDBA2509AD4CF5A /* VisibleRegionViewController.swift */; };
3636
2CB7EAB2A0672726481071D1 /* GestureControlViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE84B21AF0FE670AF73B8015 /* GestureControlViewController.swift */; };
@@ -133,6 +133,7 @@
133133
4A7916340031F78D38C594C4 /* MyLocationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyLocationViewController.swift; sourceTree = "<group>"; };
134134
4C9B924A31846136307374FE /* MapZoomViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapZoomViewController.swift; sourceTree = "<group>"; };
135135
4E35664DD7AE7235688F9964 /* IndoorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IndoorViewController.swift; sourceTree = "<group>"; };
136+
50A3566BBA7BDEB5711EB9A8 /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
136137
522113F4629950AB8239E18A /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
137138
582E8D45A41BDDC81EA48DD7 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
138139
5B08A9836FC58ADF5E6C36DC /* CustomIndoorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomIndoorViewController.swift; sourceTree = "<group>"; };
@@ -155,7 +156,6 @@
155156
87E37B0AEBC49DF8A0F89492 /* spitfire.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spitfire.png; sourceTree = "<group>"; };
156157
8AD61BF07E9A5511F02937FE /* MarkerInfoWindowViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkerInfoWindowViewController.swift; sourceTree = "<group>"; };
157158
8BE2B2F064E5D2B955799B90 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
158-
8C366F24AA1FDD1D1F0C51E3 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsSwiftDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos.default.xcconfig"; sourceTree = "<group>"; };
159159
8DCC6728BCC97657B2285199 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
160160
8E0F7227CD83A68A40D74050 /* mapstyle-retro.json */ = {isa = PBXFileReference; lastKnownFileType = text; path = "mapstyle-retro.json"; sourceTree = "<group>"; };
161161
8E604082110AE5DB05E1B7C5 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
@@ -172,8 +172,8 @@
172172
B055CD3729E64D455BC5B034 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
173173
B26D6D4D0FD65566CA60C29A /* aeroplane.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = aeroplane.png; sourceTree = "<group>"; };
174174
BB018BB688C4953D45CED8CB /* GoogleMapsSwiftDemos.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GoogleMapsSwiftDemos.app; sourceTree = BUILT_PRODUCTS_DIR; };
175-
BF836285C425ADB3DBE3B9D1 /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
176175
C37B898C1EEE5364AEE5EDAA /* newark_nj_1922.jpg */ = {isa = PBXFileReference; lastKnownFileType = text; path = newark_nj_1922.jpg; sourceTree = "<group>"; };
176+
C4252376552C9466C4295026 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsSwiftDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos.default.xcconfig"; sourceTree = "<group>"; };
177177
C5014E3BCF7EBF869B9F9BC7 /* step2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step2.png; sourceTree = "<group>"; };
178178
C54F70F6C6426F576247C16F /* PolygonsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PolygonsViewController.swift; sourceTree = "<group>"; };
179179
C6041A5D425D71CDF9418ABE /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
@@ -208,7 +208,7 @@
208208
buildActionMask = 2147483647;
209209
files = (
210210
4EA38ACBC98F34B1F0AF5BDD /* UIKit.framework in Frameworks */,
211-
29497B1CC830E45D121D5303 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
211+
1E1F763E0B00E5753BE87A40 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
212212
);
213213
runOnlyForDeploymentPostprocessing = 0;
214214
};
@@ -265,6 +265,15 @@
265265
path = Resources;
266266
sourceTree = "<group>";
267267
};
268+
46044D5C40DDB0FAC8B0FFF3 /* Pods */ = {
269+
isa = PBXGroup;
270+
children = (
271+
C4252376552C9466C4295026 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
272+
);
273+
name = Pods;
274+
path = Pods;
275+
sourceTree = "<group>";
276+
};
268277
4918D759D471F1C23487E663 /* Samples */ = {
269278
isa = PBXGroup;
270279
children = (
@@ -310,15 +319,6 @@
310319
path = Samples;
311320
sourceTree = "<group>";
312321
};
313-
5EDC954D016311DF4AB161EE /* Pods */ = {
314-
isa = PBXGroup;
315-
children = (
316-
8C366F24AA1FDD1D1F0C51E3 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
317-
);
318-
name = Pods;
319-
path = Pods;
320-
sourceTree = "<group>";
321-
};
322322
77BA0496CE92FC06E4C6A5D5 /* GoogleMapsSwiftDemos */ = {
323323
isa = PBXGroup;
324324
children = (
@@ -359,7 +359,7 @@
359359
isa = PBXGroup;
360360
children = (
361361
922338CA529F228A03DE6422 /* UIKit.framework */,
362-
BF836285C425ADB3DBE3B9D1 /* libPods-GoogleMapsSwiftDemos.a */,
362+
50A3566BBA7BDEB5711EB9A8 /* libPods-GoogleMapsSwiftDemos.a */,
363363
);
364364
name = Frameworks;
365365
sourceTree = "<group>";
@@ -378,7 +378,7 @@
378378
D0ED9A279E12177F7FDFA2FF /* Source */,
379379
AC723F443153D968479E59F3 /* Frameworks */,
380380
DD0B6FB690051F4443F4132B /* Products */,
381-
5EDC954D016311DF4AB161EE /* Pods */,
381+
46044D5C40DDB0FAC8B0FFF3 /* Pods */,
382382
);
383383
sourceTree = "<group>";
384384
};
@@ -397,11 +397,11 @@
397397
isa = PBXNativeTarget;
398398
buildConfigurationList = 65556A7591C40D0E8B77989F /* Build configuration list for PBXNativeTarget "GoogleMapsSwiftDemos" */;
399399
buildPhases = (
400-
5F217DE9A3B52A86E0BB17DE /* [CP] Check Pods Manifest.lock */,
400+
05C30AC2517B7E46324FCA00 /* [CP] Check Pods Manifest.lock */,
401401
2ADDADBB329E244AF7ED1FB2 /* Resources */,
402402
22EB17F407E92B9B4F3B601A /* Sources */,
403403
B4530C282FE2BDE3D1071779 /* Frameworks */,
404-
A35214E187BE4A05D676609B /* [CP] Copy Pods Resources */,
404+
D4842BB8932301BA2C13B5E1 /* [CP] Copy Pods Resources */,
405405
);
406406
buildRules = (
407407
);
@@ -499,7 +499,7 @@
499499
/* End PBXResourcesBuildPhase section */
500500

501501
/* Begin PBXShellScriptBuildPhase section */
502-
5F217DE9A3B52A86E0BB17DE /* [CP] Check Pods Manifest.lock */ = {
502+
05C30AC2517B7E46324FCA00 /* [CP] Check Pods Manifest.lock */ = {
503503
isa = PBXShellScriptBuildPhase;
504504
buildActionMask = 2147483647;
505505
files = (
@@ -521,7 +521,7 @@
521521
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
522522
showEnvVarsInLog = 0;
523523
};
524-
A35214E187BE4A05D676609B /* [CP] Copy Pods Resources */ = {
524+
D4842BB8932301BA2C13B5E1 /* [CP] Copy Pods Resources */ = {
525525
isa = PBXShellScriptBuildPhase;
526526
buildActionMask = 2147483647;
527527
files = (
@@ -608,7 +608,7 @@
608608
};
609609
6798450D013ACAFF39CF0187 /* Default */ = {
610610
isa = XCBuildConfiguration;
611-
baseConfigurationReference = 8C366F24AA1FDD1D1F0C51E3 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */;
611+
baseConfigurationReference = C4252376552C9466C4295026 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */;
612612
buildSettings = {
613613
"ARCHS[sdk=iphonesimulator*]" = (
614614
i386,

GoogleMaps-Swift/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ source 'https://github.com/CocoaPods/Specs.git'
22

33
target 'GoogleMapsSwiftDemos' do
44
platform :ios, '10.0'
5-
pod 'GoogleMaps', '= 4.0.0'
5+
pod 'GoogleMaps', '= 4.1.0'
66
end

0 commit comments

Comments
 (0)