Skip to content

Commit c3fb245

Browse files
googlemaps-botgooglemaps-bot
authored
chore: Update Maps and Places samples from CocoaPods (#161)
1 parent 645a191 commit c3fb245

File tree

12 files changed

+143
-128
lines changed

12 files changed

+143
-128
lines changed

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

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
4412D5711BE701B4DF734178 /* MarkerLayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABD5CD72476857CF2A348366 /* MarkerLayerViewController.swift */; };
3939
4773BB1B2EBD65AEC32F9E7C /* step3.png in Resources */ = {isa = PBXBuildFile; fileRef = E8E67F17F84C0169D05D684B /* step3.png */; };
4040
4A9E3BF5489DCA1C7A200A64 /* mapstyle-retro.json in Resources */ = {isa = PBXBuildFile; fileRef = 8E0F7227CD83A68A40D74050 /* mapstyle-retro.json */; };
41+
4CCB99CE0C86A4B513FC5F87 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 789BFE914A0151D5CCC3821A /* libPods-GoogleMapsSwiftDemos.a */; };
4142
4D932F94F684532C309EB4BF /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C96B86B64A6F458F79250076 /* [email protected] */; };
4243
4EA38ACBC98F34B1F0AF5BDD /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 922338CA529F228A03DE6422 /* UIKit.framework */; };
4344
4F01A0839D992FC9F724CD85 /* mapstyle-silver.json in Resources */ = {isa = PBXBuildFile; fileRef = 30CF698467FA9E7F200017B3 /* mapstyle-silver.json */; };
@@ -63,7 +64,6 @@
6364
901043470A299C77DD977AD7 /* GeocoderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03D1BEF5B3B6C6A990EA98C5 /* GeocoderViewController.swift */; };
6465
91D8C803DEDB4A701699AF8D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 0A676DB2BE6F08848CCC5F44 /* [email protected] */; };
6566
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,7 +136,6 @@
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; };
140139
5B08A9836FC58ADF5E6C36DC /* CustomIndoorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomIndoorViewController.swift; sourceTree = "<group>"; };
141140
5B8C82F193D6253A379BF3FD /* CustomMarkersViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomMarkersViewController.swift; sourceTree = "<group>"; };
142141
5CFB2179FECC8DF98666E98A /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -152,6 +151,7 @@
152151
72C6A03E42A9983A4FB4A7E3 /* GradientPolylinesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GradientPolylinesViewController.swift; sourceTree = "<group>"; };
153152
73E9911385541153DF35EE99 /* australia-large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "australia-large.png"; sourceTree = "<group>"; };
154153
784B90031ED0D2E68FA9EF93 /* PolylinesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PolylinesViewController.swift; sourceTree = "<group>"; };
154+
789BFE914A0151D5CCC3821A /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
155155
822521FD132C2E44D03EE0E8 /* argentina.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = argentina.png; sourceTree = "<group>"; };
156156
83F342A6AF95FF580F924D74 /* SampleListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleListViewController.swift; sourceTree = "<group>"; };
157157
87E37B0AEBC49DF8A0F89492 /* spitfire.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spitfire.png; sourceTree = "<group>"; };
@@ -185,9 +185,9 @@
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>"; };
189188
DE91B8EA42AFFCEDA758CE06 /* SDKConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SDKConstants.swift; sourceTree = "<group>"; };
190189
DF1488DDE60393FF03CF8A87 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
190+
E01F214444C329C1FB20445D /* 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>"; };
191191
E18764F42392A93B39C775AB /* SampleMapStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleMapStyle.swift; sourceTree = "<group>"; };
192192
E5AB6411A9C7E6CEDB98041D /* BasicMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasicMapViewController.swift; sourceTree = "<group>"; };
193193
E8E67F17F84C0169D05D684B /* step3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step3.png; sourceTree = "<group>"; };
@@ -210,7 +210,7 @@
210210
buildActionMask = 2147483647;
211211
files = (
212212
4EA38ACBC98F34B1F0AF5BDD /* UIKit.framework in Frameworks */,
213-
940EC54ABB85DC452211E8B1 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
213+
4CCB99CE0C86A4B513FC5F87 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
214214
);
215215
runOnlyForDeploymentPostprocessing = 0;
216216
};
@@ -353,20 +353,11 @@
353353
isa = PBXGroup;
354354
children = (
355355
922338CA529F228A03DE6422 /* UIKit.framework */,
356-
5AC932682FDF13726178F857 /* libPods-GoogleMapsSwiftDemos.a */,
356+
789BFE914A0151D5CCC3821A /* libPods-GoogleMapsSwiftDemos.a */,
357357
);
358358
name = Frameworks;
359359
sourceTree = "<group>";
360360
};
361-
C7B46A7BE166DCF839A06842 /* Pods */ = {
362-
isa = PBXGroup;
363-
children = (
364-
DCA6F6BE3A6C1ED62B8A984B /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
365-
);
366-
name = Pods;
367-
path = Pods;
368-
sourceTree = "<group>";
369-
};
370361
D0ED9A279E12177F7FDFA2FF /* Source */ = {
371362
isa = PBXGroup;
372363
children = (
@@ -381,7 +372,7 @@
381372
D0ED9A279E12177F7FDFA2FF /* Source */,
382373
AC723F443153D968479E59F3 /* Frameworks */,
383374
DD0B6FB690051F4443F4132B /* Products */,
384-
C7B46A7BE166DCF839A06842 /* Pods */,
375+
F1DBFA6CC671B2284D319829 /* Pods */,
385376
);
386377
sourceTree = "<group>";
387378
};
@@ -393,18 +384,27 @@
393384
name = Products;
394385
sourceTree = "<group>";
395386
};
387+
F1DBFA6CC671B2284D319829 /* Pods */ = {
388+
isa = PBXGroup;
389+
children = (
390+
E01F214444C329C1FB20445D /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
391+
);
392+
name = Pods;
393+
path = Pods;
394+
sourceTree = "<group>";
395+
};
396396
/* End PBXGroup section */
397397

398398
/* Begin PBXNativeTarget section */
399399
56AB213E97CDD413D8EDA2B0 /* GoogleMapsSwiftDemos */ = {
400400
isa = PBXNativeTarget;
401401
buildConfigurationList = 65556A7591C40D0E8B77989F /* Build configuration list for PBXNativeTarget "GoogleMapsSwiftDemos" */;
402402
buildPhases = (
403-
F07204C1B9979AFBBADE97D4 /* [CP] Check Pods Manifest.lock */,
403+
4E1DC9F6677285BFA23A8FA6 /* [CP] Check Pods Manifest.lock */,
404404
2ADDADBB329E244AF7ED1FB2 /* Resources */,
405405
22EB17F407E92B9B4F3B601A /* Sources */,
406406
B4530C282FE2BDE3D1071779 /* Frameworks */,
407-
4CFF6811A09B5A0C2F731BF5 /* [CP] Copy Pods Resources */,
407+
5476A60E3B26EAB0DE44E3F6 /* [CP] Copy Pods Resources */,
408408
);
409409
buildRules = (
410410
);
@@ -502,48 +502,48 @@
502502
/* End PBXResourcesBuildPhase section */
503503

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

‎GoogleMaps-Swift/GoogleMapsSwiftDemos/Swift/Samples/StructuredGeocoderViewController.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ extension StructuredGeocoderViewController: GMSMapViewDelegate {
5050
marker.appearAnimation = .pop
5151
marker.map = mapView
5252
marker.title = address.thoroughfare
53+
mapView.selectedMarker = marker
5354

5455
var snippet = ""
5556
if let subLocality = address.subLocality {

‎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, '13.0'
5-
pod 'GoogleMaps', '= 7.1.0'
5+
pod 'GoogleMaps', '= 7.2.0'
66
end

0 commit comments

Comments
 (0)