Skip to content

Commit 2238935

Browse files
googlemaps-botgooglemaps-bot
authored
chore: Update Maps and Places samples from CocoaPods (#153)
1 parent 9eab6ce commit 2238935

File tree

12 files changed

+124
-127
lines changed

12 files changed

+124
-127
lines changed

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
20F35834239A135EC77A752C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 221F6743F6F3DB331816D7D3 /* [email protected] */; };
2323
21AFA9E1157E41E761EDC099 /* newark_nj_1922.jpg in Resources */ = {isa = PBXBuildFile; fileRef = C37B898C1EEE5364AEE5EDAA /* newark_nj_1922.jpg */; };
2424
21B875B6EAB68337956FD34A /* FixedPanoramaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1730B1B4AD1EF5754F84355B /* FixedPanoramaViewController.swift */; };
25-
24EA4BBD9376B8CD163DC091 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ED3C4319ECC6917B6DF23FB5 /* libPods-GoogleMapsSwiftDemos.a */; };
2625
26B8792B58E56800CA3D60ED /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = AD1D1A994D7ECBF890F0034A /* [email protected] */; };
2726
293B8794611FD45B631FE20C /* step2.png in Resources */ = {isa = PBXBuildFile; fileRef = C5014E3BCF7EBF869B9F9BC7 /* step2.png */; };
2827
2D218EA1029C3FB7A528179F /* spitfire.png in Resources */ = {isa = PBXBuildFile; fileRef = 87E37B0AEBC49DF8A0F89492 /* spitfire.png */; };
@@ -64,6 +63,7 @@
6463
901043470A299C77DD977AD7 /* GeocoderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03D1BEF5B3B6C6A990EA98C5 /* GeocoderViewController.swift */; };
6564
91D8C803DEDB4A701699AF8D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 0A676DB2BE6F08848CCC5F44 /* [email protected] */; };
6665
93DF8E1D616607C73D24D731 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8DCC6728BCC97657B2285199 /* [email protected] */; };
66+
940EC54ABB85DC452211E8B1 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5AC932682FDF13726178F857 /* libPods-GoogleMapsSwiftDemos.a */; };
6767
960FB4FB5A416023B5C19485 /* Samples.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE8CA03ED74DC7887D70CCA6 /* Samples.swift */; };
6868
96C875435D27456CC476392F /* PolygonsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C54F70F6C6426F576247C16F /* PolygonsViewController.swift */; };
6969
9E993392AC110B9DC9DA3BF3 /* SnapshotReadyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DB76DC4B0DC1CB6692AE61E /* SnapshotReadyViewController.swift */; };
@@ -136,6 +136,7 @@
136136
4E35664DD7AE7235688F9964 /* IndoorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IndoorViewController.swift; sourceTree = "<group>"; };
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>"; };
139+
5AC932682FDF13726178F857 /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
139140
5B08A9836FC58ADF5E6C36DC /* CustomIndoorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomIndoorViewController.swift; sourceTree = "<group>"; };
140141
5B8C82F193D6253A379BF3FD /* CustomMarkersViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomMarkersViewController.swift; sourceTree = "<group>"; };
141142
5CFB2179FECC8DF98666E98A /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -176,7 +177,6 @@
176177
C5014E3BCF7EBF869B9F9BC7 /* step2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step2.png; sourceTree = "<group>"; };
177178
C54F70F6C6426F576247C16F /* PolygonsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PolygonsViewController.swift; sourceTree = "<group>"; };
178179
C6041A5D425D71CDF9418ABE /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
179-
C8814EA6216FE5BAE308F746 /* 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>"; };
180180
C96B86B64A6F458F79250076 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
181181
CB2B29C49F7B36D477192D04 /* MapTypesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTypesViewController.swift; sourceTree = "<group>"; };
182182
CBE707A4130CDA88BBCC2DD4 /* FitBoundsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FitBoundsViewController.swift; sourceTree = "<group>"; };
@@ -185,13 +185,13 @@
185185
D10973A4336C45EE56319A9B /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
186186
D1A99C0C04795272C12DD9EF /* StructuredGeocoderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StructuredGeocoderViewController.swift; sourceTree = "<group>"; };
187187
D27175E880CA9EEC63374BD4 /* PanoramaServiceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PanoramaServiceController.swift; sourceTree = "<group>"; };
188+
DCA6F6BE3A6C1ED62B8A984B /* 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>"; };
188189
DE91B8EA42AFFCEDA758CE06 /* SDKConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SDKConstants.swift; sourceTree = "<group>"; };
189190
DF1488DDE60393FF03CF8A87 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
190191
E18764F42392A93B39C775AB /* SampleMapStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleMapStyle.swift; sourceTree = "<group>"; };
191192
E5AB6411A9C7E6CEDB98041D /* BasicMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasicMapViewController.swift; sourceTree = "<group>"; };
192193
E8E67F17F84C0169D05D684B /* step3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step3.png; sourceTree = "<group>"; };
193194
EB1DB9C65356269FB0E9805F /* boat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = boat.png; sourceTree = "<group>"; };
194-
ED3C4319ECC6917B6DF23FB5 /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
195195
ED3D93ABBF24BFEF78629B0D /* step7.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step7.png; sourceTree = "<group>"; };
196196
EFD1B4A1869A5ED24977724F /* step8.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step8.png; sourceTree = "<group>"; };
197197
F17F1884FB9429A59D92A98A /* glow-marker.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "glow-marker.png"; sourceTree = "<group>"; };
@@ -210,7 +210,7 @@
210210
buildActionMask = 2147483647;
211211
files = (
212212
4EA38ACBC98F34B1F0AF5BDD /* UIKit.framework in Frameworks */,
213-
24EA4BBD9376B8CD163DC091 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
213+
940EC54ABB85DC452211E8B1 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
214214
);
215215
runOnlyForDeploymentPostprocessing = 0;
216216
};
@@ -349,22 +349,22 @@
349349
path = Swift;
350350
sourceTree = "<group>";
351351
};
352-
9AB6A173A944EC3B25B65B37 /* Pods */ = {
352+
AC723F443153D968479E59F3 /* Frameworks */ = {
353353
isa = PBXGroup;
354354
children = (
355-
C8814EA6216FE5BAE308F746 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
355+
922338CA529F228A03DE6422 /* UIKit.framework */,
356+
5AC932682FDF13726178F857 /* libPods-GoogleMapsSwiftDemos.a */,
356357
);
357-
name = Pods;
358-
path = Pods;
358+
name = Frameworks;
359359
sourceTree = "<group>";
360360
};
361-
AC723F443153D968479E59F3 /* Frameworks */ = {
361+
C7B46A7BE166DCF839A06842 /* Pods */ = {
362362
isa = PBXGroup;
363363
children = (
364-
922338CA529F228A03DE6422 /* UIKit.framework */,
365-
ED3C4319ECC6917B6DF23FB5 /* libPods-GoogleMapsSwiftDemos.a */,
364+
DCA6F6BE3A6C1ED62B8A984B /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
366365
);
367-
name = Frameworks;
366+
name = Pods;
367+
path = Pods;
368368
sourceTree = "<group>";
369369
};
370370
D0ED9A279E12177F7FDFA2FF /* Source */ = {
@@ -381,7 +381,7 @@
381381
D0ED9A279E12177F7FDFA2FF /* Source */,
382382
AC723F443153D968479E59F3 /* Frameworks */,
383383
DD0B6FB690051F4443F4132B /* Products */,
384-
9AB6A173A944EC3B25B65B37 /* Pods */,
384+
C7B46A7BE166DCF839A06842 /* Pods */,
385385
);
386386
sourceTree = "<group>";
387387
};
@@ -400,11 +400,11 @@
400400
isa = PBXNativeTarget;
401401
buildConfigurationList = 65556A7591C40D0E8B77989F /* Build configuration list for PBXNativeTarget "GoogleMapsSwiftDemos" */;
402402
buildPhases = (
403-
2CA0A0AA6D4F8821C0AA2D1C /* [CP] Check Pods Manifest.lock */,
403+
F07204C1B9979AFBBADE97D4 /* [CP] Check Pods Manifest.lock */,
404404
2ADDADBB329E244AF7ED1FB2 /* Resources */,
405405
22EB17F407E92B9B4F3B601A /* Sources */,
406406
B4530C282FE2BDE3D1071779 /* Frameworks */,
407-
59EFE0880DA65674627B6D73 /* [CP] Copy Pods Resources */,
407+
4CFF6811A09B5A0C2F731BF5 /* [CP] Copy Pods Resources */,
408408
);
409409
buildRules = (
410410
);
@@ -502,48 +502,48 @@
502502
/* End PBXResourcesBuildPhase section */
503503

504504
/* Begin PBXShellScriptBuildPhase section */
505-
2CA0A0AA6D4F8821C0AA2D1C /* [CP] Check Pods Manifest.lock */ = {
505+
4CFF6811A09B5A0C2F731BF5 /* [CP] Copy Pods Resources */ = {
506506
isa = PBXShellScriptBuildPhase;
507507
buildActionMask = 2147483647;
508508
files = (
509509
);
510510
inputFileListPaths = (
511511
);
512512
inputPaths = (
513-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
514-
"${PODS_ROOT}/Manifest.lock",
513+
"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos-resources.sh",
514+
"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle",
515515
);
516-
name = "[CP] Check Pods Manifest.lock";
516+
name = "[CP] Copy Pods Resources";
517517
outputFileListPaths = (
518518
);
519519
outputPaths = (
520-
"$(DERIVED_FILE_DIR)/Pods-GoogleMapsSwiftDemos-checkManifestLockResult.txt",
520+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
521521
);
522522
runOnlyForDeploymentPostprocessing = 0;
523523
shellPath = /bin/sh;
524-
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";
524+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos-resources.sh\"\n";
525525
showEnvVarsInLog = 0;
526526
};
527-
59EFE0880DA65674627B6D73 /* [CP] Copy Pods Resources */ = {
527+
F07204C1B9979AFBBADE97D4 /* [CP] Check Pods Manifest.lock */ = {
528528
isa = PBXShellScriptBuildPhase;
529529
buildActionMask = 2147483647;
530530
files = (
531531
);
532532
inputFileListPaths = (
533533
);
534534
inputPaths = (
535-
"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos-resources.sh",
536-
"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle",
535+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
536+
"${PODS_ROOT}/Manifest.lock",
537537
);
538-
name = "[CP] Copy Pods Resources";
538+
name = "[CP] Check Pods Manifest.lock";
539539
outputFileListPaths = (
540540
);
541541
outputPaths = (
542-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
542+
"$(DERIVED_FILE_DIR)/Pods-GoogleMapsSwiftDemos-checkManifestLockResult.txt",
543543
);
544544
runOnlyForDeploymentPostprocessing = 0;
545545
shellPath = /bin/sh;
546-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos-resources.sh\"\n";
546+
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";
547547
showEnvVarsInLog = 0;
548548
};
549549
/* End PBXShellScriptBuildPhase section */
@@ -612,7 +612,7 @@
612612
};
613613
6798450D013ACAFF39CF0187 /* Default */ = {
614614
isa = XCBuildConfiguration;
615-
baseConfigurationReference = C8814EA6216FE5BAE308F746 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */;
615+
baseConfigurationReference = DCA6F6BE3A6C1ED62B8A984B /* Pods-GoogleMapsSwiftDemos.default.xcconfig */;
616616
buildSettings = {
617617
"ARCHS[sdk=iphonesimulator*]" = x86_64;
618618
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
2525
) -> Bool {
2626

2727
GMSServices.provideAPIKey(SDKConstants.apiKey)
28+
// Metal is the preferred renderer.
29+
GMSServices.setMetalRendererEnabled(true)
2830

2931
// On iOS 15, continue to use opaque navigation bars like earlier iOS versions.
3032
if #available(iOS 15.0, *) {

‎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, 13.0
5-
pod 'GoogleMaps', '= 7.0.0'
4+
platform :ios, '13.0'
5+
pod 'GoogleMaps', '= 7.1.0'
66
end

0 commit comments

Comments
 (0)