Skip to content

Commit 3321de8

Browse files
googlemaps-botgooglemaps-bot
authored
chore: Update Maps and Places samples from CocoaPods (#119)
1 parent 67a71b1 commit 3321de8

File tree

16 files changed

+157
-115
lines changed

16 files changed

+157
-115
lines changed

‎GoogleMaps-Swift/GoogleMapsSwiftDemos.xcodeproj/project.pbxproj‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
3D3F2A8EA739004B1489A792 /* step8.png in Resources */ = {isa = PBXBuildFile; fileRef = EFD1B4A1869A5ED24977724F /* step8.png */; };
4141
41B7BD6313F16FFB24A404B2 /* step7.png in Resources */ = {isa = PBXBuildFile; fileRef = ED3D93ABBF24BFEF78629B0D /* step7.png */; };
4242
4206C1EEB8BE8EDAFE843D2B /* FixedPanoramaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1730B1B4AD1EF5754F84355B /* FixedPanoramaViewController.swift */; };
43-
45367BE851D69AB992B7C0DB /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 622F4CA3A164F2B224780251 /* libPods-GoogleMapsSwiftDemos.a */; };
4443
4773BB1B2EBD65AEC32F9E7C /* step3.png in Resources */ = {isa = PBXBuildFile; fileRef = E8E67F17F84C0169D05D684B /* step3.png */; };
4544
485D079B6D198FAB726B0505 /* CameraViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 612E451B3A594633E32B3131 /* CameraViewController.swift */; };
4645
4902D3615AFEEE5B646A4262 /* PanoramaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDABCFB71E0D9B75FA2091CF /* PanoramaViewController.swift */; };
@@ -91,6 +90,7 @@
9190
D3E1235A287B63F1C8326B39 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = B055CD3729E64D455BC5B034 /* [email protected] */; };
9291
D581AE7D87DF1D47CFB93CFA /* botswana.png in Resources */ = {isa = PBXBuildFile; fileRef = F838C1A5E413CE8D5CC1CA85 /* botswana.png */; };
9392
DEA4846A15B8330203AB1573 /* step6.png in Resources */ = {isa = PBXBuildFile; fileRef = 4864D7EE574742D69D0917F3 /* step6.png */; };
93+
E069B7782DCD2AB140BE9F2E /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C90AE9EFF64668A7795F070A /* libPods-GoogleMapsSwiftDemos.a */; };
9494
E07C174AB3E3A37AC2D6EB0A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24E0C7EAB68D8720DCB2CAC0 /* AppDelegate.swift */; };
9595
E34707431934D1D73B37D5B4 /* AnimatedUIViewMarkerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49E9C05F3A051F688CF7F4BF /* AnimatedUIViewMarkerViewController.swift */; };
9696
E806B389DD5D2C6BB2572453 /* StyledMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA1DB5D699D162AC375E1C9 /* StyledMapViewController.swift */; };
@@ -142,9 +142,9 @@
142142
5DE971B436125DBE256A5FA5 /* mapstyle-night.json */ = {isa = PBXFileReference; lastKnownFileType = text; path = "mapstyle-night.json"; sourceTree = "<group>"; };
143143
5ED4F2473A7C9EB8BA05986B /* MarkersViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkersViewController.swift; sourceTree = "<group>"; };
144144
612E451B3A594633E32B3131 /* CameraViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraViewController.swift; sourceTree = "<group>"; };
145-
622F4CA3A164F2B224780251 /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
146145
63E4201AB786148B34D7190E /* IndoorMuseumNavigationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IndoorMuseumNavigationViewController.swift; sourceTree = "<group>"; };
147146
69B644212DDBA2509AD4CF5A /* VisibleRegionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VisibleRegionViewController.swift; sourceTree = "<group>"; };
147+
6C717692FB68DF8E17C4E037 /* 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>"; };
148148
6E8E2784C6B7A0900490D68D /* x29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = x29.png; sourceTree = "<group>"; };
149149
713A9415F77D646F9547193B /* bulgaria.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bulgaria.png; sourceTree = "<group>"; };
150150
71F546CBD85FE306F988C2F0 /* australia.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = australia.png; sourceTree = "<group>"; };
@@ -176,10 +176,10 @@
176176
C5014E3BCF7EBF869B9F9BC7 /* step2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step2.png; sourceTree = "<group>"; };
177177
C54F70F6C6426F576247C16F /* PolygonsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PolygonsViewController.swift; sourceTree = "<group>"; };
178178
C6041A5D425D71CDF9418ABE /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
179+
C90AE9EFF64668A7795F070A /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
179180
C96B86B64A6F458F79250076 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
180181
CB2B29C49F7B36D477192D04 /* MapTypesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTypesViewController.swift; sourceTree = "<group>"; };
181182
CBE707A4130CDA88BBCC2DD4 /* FitBoundsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FitBoundsViewController.swift; sourceTree = "<group>"; };
182-
CBF5804C13F10F88F88BA169 /* 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>"; };
183183
CBFD03041A5EAA400168D31F /* DoubleMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DoubleMapViewController.swift; sourceTree = "<group>"; };
184184
CD93738C4D90134DB506ECFE /* MarkerEventsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkerEventsViewController.swift; sourceTree = "<group>"; };
185185
D10973A4336C45EE56319A9B /* [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-
45367BE851D69AB992B7C0DB /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
211+
E069B7782DCD2AB140BE9F2E /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
212212
);
213213
runOnlyForDeploymentPostprocessing = 0;
214214
};
@@ -310,6 +310,15 @@
310310
path = Samples;
311311
sourceTree = "<group>";
312312
};
313+
641C70D8ED6119E5DDA23DCA /* Pods */ = {
314+
isa = PBXGroup;
315+
children = (
316+
6C717692FB68DF8E17C4E037 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
317+
);
318+
name = Pods;
319+
path = Pods;
320+
sourceTree = "<group>";
321+
};
313322
77BA0496CE92FC06E4C6A5D5 /* GoogleMapsSwiftDemos */ = {
314323
isa = PBXGroup;
315324
children = (
@@ -346,20 +355,11 @@
346355
path = Swift;
347356
sourceTree = "<group>";
348357
};
349-
98EBBCD9B48EDDD91E579E50 /* Pods */ = {
350-
isa = PBXGroup;
351-
children = (
352-
CBF5804C13F10F88F88BA169 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
353-
);
354-
name = Pods;
355-
path = Pods;
356-
sourceTree = "<group>";
357-
};
358358
AC723F443153D968479E59F3 /* Frameworks */ = {
359359
isa = PBXGroup;
360360
children = (
361361
922338CA529F228A03DE6422 /* UIKit.framework */,
362-
622F4CA3A164F2B224780251 /* libPods-GoogleMapsSwiftDemos.a */,
362+
C90AE9EFF64668A7795F070A /* libPods-GoogleMapsSwiftDemos.a */,
363363
);
364364
name = Frameworks;
365365
sourceTree = "<group>";
@@ -378,7 +378,7 @@
378378
D0ED9A279E12177F7FDFA2FF /* Source */,
379379
AC723F443153D968479E59F3 /* Frameworks */,
380380
DD0B6FB690051F4443F4132B /* Products */,
381-
98EBBCD9B48EDDD91E579E50 /* Pods */,
381+
641C70D8ED6119E5DDA23DCA /* 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-
79055AD9C2E471679A59F1DF /* [CP] Check Pods Manifest.lock */,
400+
7EE97A9E815225CA4F4A6052 /* [CP] Check Pods Manifest.lock */,
401401
2ADDADBB329E244AF7ED1FB2 /* Resources */,
402402
22EB17F407E92B9B4F3B601A /* Sources */,
403403
B4530C282FE2BDE3D1071779 /* Frameworks */,
404-
FF8D61581DFB5BCB7F8F3229 /* [CP] Copy Pods Resources */,
404+
A12E8AA7CC7EBE7F95BE4B6C /* [CP] Copy Pods Resources */,
405405
);
406406
buildRules = (
407407
);
@@ -499,7 +499,7 @@
499499
/* End PBXResourcesBuildPhase section */
500500

501501
/* Begin PBXShellScriptBuildPhase section */
502-
79055AD9C2E471679A59F1DF /* [CP] Check Pods Manifest.lock */ = {
502+
7EE97A9E815225CA4F4A6052 /* [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-
FF8D61581DFB5BCB7F8F3229 /* [CP] Copy Pods Resources */ = {
524+
A12E8AA7CC7EBE7F95BE4B6C /* [CP] Copy Pods Resources */ = {
525525
isa = PBXShellScriptBuildPhase;
526526
buildActionMask = 2147483647;
527527
files = (
@@ -608,14 +608,14 @@
608608
};
609609
6798450D013ACAFF39CF0187 /* Default */ = {
610610
isa = XCBuildConfiguration;
611-
baseConfigurationReference = CBF5804C13F10F88F88BA169 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */;
611+
baseConfigurationReference = 6C717692FB68DF8E17C4E037 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */;
612612
buildSettings = {
613613
"ARCHS[sdk=iphonesimulator*]" = x86_64;
614614
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
615615
CLANG_ENABLE_OBJC_ARC = YES;
616616
CODE_SIGN_IDENTITY = "iPhone Developer";
617617
INFOPLIST_FILE = ./GoogleMapsSwiftDemos/Info.plist;
618-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
618+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
619619
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
620620
LIBRARY_SEARCH_PATHS = (
621621
.,

‎GoogleMaps-Swift/GoogleMapsSwiftDemos/Swift/SampleListViewController.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ extension SampleListViewController: UITableViewDataSource {
4242
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
4343
return sampleSections[section].samples.count
4444
}
45-
4645
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
4746
let cell = tableView.dequeueReusableCell(
4847
withIdentifier: SampleListViewController.sampleCellIdentifier, for: indexPath)

‎GoogleMaps-Swift/Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://github.com/CocoaPods/Specs.git'
22

33
target 'GoogleMapsSwiftDemos' do
4-
platform :ios, '11.0'
5-
pod 'GoogleMaps', '= 5.2.0'
4+
platform :ios, '12.0'
5+
pod 'GoogleMaps', '= 6.0.0'
66
end

0 commit comments

Comments
 (0)