Skip to content

Commit 5f50ee3

Browse files
chore: Update Maps and Places samples from CocoaPods (#99)
1 parent ef37456 commit 5f50ee3

File tree

13 files changed

+153
-191
lines changed

13 files changed

+153
-191
lines changed

GoogleMaps-Swift/GoogleMapsSwiftDemos.xcodeproj/project.pbxproj

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
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 */; };
2625
1E769ACDBCCB6DB84D5E3E8E /* h1.png in Resources */ = {isa = PBXBuildFile; fileRef = 996FCE46D4BD31A4E02C2473 /* h1.png */; };
2726
1E9BE1CAAF51CB3B59F863E6 /* SampleMapStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = E18764F42392A93B39C775AB /* SampleMapStyle.swift */; };
2827
20F35834239A135EC77A752C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 221F6743F6F3DB331816D7D3 /* [email protected] */; };
@@ -77,6 +76,7 @@
7776
AC10E7A466233271826AB625 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 522113F4629950AB8239E18A /* [email protected] */; };
7877
AFD4A3F04EE2310FEB11C861 /* MarkerInfoWindowViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AD61BF07E9A5511F02937FE /* MarkerInfoWindowViewController.swift */; };
7978
B3F740B819DBAA1F4E651157 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4429DACE39F5B3E2E31B963D /* [email protected] */; };
79+
B43744DF938F12D6F2F40B51 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 32B1C089FA58A44BE10A703A /* libPods-GoogleMapsSwiftDemos.a */; };
8080
B6565F6882481535DAB5C86A /* voyager.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A5B8956E7E8B6AF430CC416 /* voyager.png */; };
8181
B69D158DC43E0889B5BF1561 /* glow-marker.png in Resources */ = {isa = PBXBuildFile; fileRef = F17F1884FB9429A59D92A98A /* glow-marker.png */; };
8282
B7345D33E5BF31A00280355C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = DF1488DDE60393FF03CF8A87 /* [email protected] */; };
@@ -123,6 +123,7 @@
123123
2C8E6590B2109C88BF5DF3BF /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
124124
2D48B3FFC6D573CF2673D451 /* popup_santa.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = popup_santa.png; sourceTree = "<group>"; };
125125
30CF698467FA9E7F200017B3 /* mapstyle-silver.json */ = {isa = PBXFileReference; lastKnownFileType = text; path = "mapstyle-silver.json"; sourceTree = "<group>"; };
126+
32B1C089FA58A44BE10A703A /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
126127
3B0F56EA0940A859776C9DD3 /* track.json */ = {isa = PBXFileReference; lastKnownFileType = text; path = track.json; sourceTree = "<group>"; };
127128
3B919F5AC728E794E349D4A3 /* SampleLevel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleLevel.swift; sourceTree = "<group>"; };
128129
3EA1DB5D699D162AC375E1C9 /* StyledMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StyledMapViewController.swift; sourceTree = "<group>"; };
@@ -133,7 +134,6 @@
133134
4A7916340031F78D38C594C4 /* MyLocationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyLocationViewController.swift; sourceTree = "<group>"; };
134135
4C9B924A31846136307374FE /* MapZoomViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapZoomViewController.swift; sourceTree = "<group>"; };
135136
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; };
137137
522113F4629950AB8239E18A /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
138138
582E8D45A41BDDC81EA48DD7 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
139139
5B08A9836FC58ADF5E6C36DC /* CustomIndoorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomIndoorViewController.swift; sourceTree = "<group>"; };
@@ -173,7 +173,6 @@
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; };
175175
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>"; };
177176
C5014E3BCF7EBF869B9F9BC7 /* step2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step2.png; sourceTree = "<group>"; };
178177
C54F70F6C6426F576247C16F /* PolygonsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PolygonsViewController.swift; sourceTree = "<group>"; };
179178
C6041A5D425D71CDF9418ABE /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
@@ -184,6 +183,7 @@
184183
CD93738C4D90134DB506ECFE /* MarkerEventsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkerEventsViewController.swift; sourceTree = "<group>"; };
185184
D10973A4336C45EE56319A9B /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
186185
D1A99C0C04795272C12DD9EF /* StructuredGeocoderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StructuredGeocoderViewController.swift; sourceTree = "<group>"; };
186+
D4BEFEE556A9D8381FBDF9C3 /* 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>"; };
187187
DE91B8EA42AFFCEDA758CE06 /* SDKConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SDKConstants.swift; sourceTree = "<group>"; };
188188
DF1488DDE60393FF03CF8A87 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
189189
E18764F42392A93B39C775AB /* SampleMapStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleMapStyle.swift; sourceTree = "<group>"; };
@@ -208,7 +208,7 @@
208208
buildActionMask = 2147483647;
209209
files = (
210210
4EA38ACBC98F34B1F0AF5BDD /* UIKit.framework in Frameworks */,
211-
1E1F763E0B00E5753BE87A40 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
211+
B43744DF938F12D6F2F40B51 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
212212
);
213213
runOnlyForDeploymentPostprocessing = 0;
214214
};
@@ -265,15 +265,6 @@
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-
};
277268
4918D759D471F1C23487E663 /* Samples */ = {
278269
isa = PBXGroup;
279270
children = (
@@ -359,11 +350,20 @@
359350
isa = PBXGroup;
360351
children = (
361352
922338CA529F228A03DE6422 /* UIKit.framework */,
362-
50A3566BBA7BDEB5711EB9A8 /* libPods-GoogleMapsSwiftDemos.a */,
353+
32B1C089FA58A44BE10A703A /* libPods-GoogleMapsSwiftDemos.a */,
363354
);
364355
name = Frameworks;
365356
sourceTree = "<group>";
366357
};
358+
C935048B811B999A1BFE4E12 /* Pods */ = {
359+
isa = PBXGroup;
360+
children = (
361+
D4BEFEE556A9D8381FBDF9C3 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
362+
);
363+
name = Pods;
364+
path = Pods;
365+
sourceTree = "<group>";
366+
};
367367
D0ED9A279E12177F7FDFA2FF /* Source */ = {
368368
isa = PBXGroup;
369369
children = (
@@ -378,7 +378,7 @@
378378
D0ED9A279E12177F7FDFA2FF /* Source */,
379379
AC723F443153D968479E59F3 /* Frameworks */,
380380
DD0B6FB690051F4443F4132B /* Products */,
381-
46044D5C40DDB0FAC8B0FFF3 /* Pods */,
381+
C935048B811B999A1BFE4E12 /* 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-
05C30AC2517B7E46324FCA00 /* [CP] Check Pods Manifest.lock */,
400+
21C7FF2405A6985E7CC319C4 /* [CP] Check Pods Manifest.lock */,
401401
2ADDADBB329E244AF7ED1FB2 /* Resources */,
402402
22EB17F407E92B9B4F3B601A /* Sources */,
403403
B4530C282FE2BDE3D1071779 /* Frameworks */,
404-
D4842BB8932301BA2C13B5E1 /* [CP] Copy Pods Resources */,
404+
CEC15B048851984195F31519 /* [CP] Copy Pods Resources */,
405405
);
406406
buildRules = (
407407
);
@@ -499,7 +499,7 @@
499499
/* End PBXResourcesBuildPhase section */
500500

501501
/* Begin PBXShellScriptBuildPhase section */
502-
05C30AC2517B7E46324FCA00 /* [CP] Check Pods Manifest.lock */ = {
502+
21C7FF2405A6985E7CC319C4 /* [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-
D4842BB8932301BA2C13B5E1 /* [CP] Copy Pods Resources */ = {
524+
CEC15B048851984195F31519 /* [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 = C4252376552C9466C4295026 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */;
611+
baseConfigurationReference = D4BEFEE556A9D8381FBDF9C3 /* 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.1.0'
5+
pod 'GoogleMaps', '= 4.2.0'
66
end

0 commit comments

Comments
 (0)