Skip to content

Commit b4bf287

Browse files
chore: Update Maps and Places samples from CocoaPods (#164)
* chore: Update Maps and Places samples from CocoaPods * chore: update snippets build deps to v7.3.0 and remove obsolete region tags that will be maintained in documentation moving forward Co-authored-by: Angela Yu <[email protected]>
1 parent 23d415a commit b4bf287

File tree

50 files changed

+241
-226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+241
-226
lines changed

GoogleMaps-Swift/GoogleMapsSwiftDemos.xcodeproj/project.pbxproj

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
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 */; };
4241
4D932F94F684532C309EB4BF /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C96B86B64A6F458F79250076 /* [email protected] */; };
4342
4EA38ACBC98F34B1F0AF5BDD /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 922338CA529F228A03DE6422 /* UIKit.framework */; };
4443
4F01A0839D992FC9F724CD85 /* mapstyle-silver.json in Resources */ = {isa = PBXBuildFile; fileRef = 30CF698467FA9E7F200017B3 /* mapstyle-silver.json */; };
@@ -50,6 +49,7 @@
5049
5F65DDF4BB17B537F4C8E54A /* PaddingBehaviorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6181B3AED573910BA0F2D6B /* PaddingBehaviorViewController.swift */; };
5150
6305177FAABE60AC55BDC3E4 /* bulgaria.png in Resources */ = {isa = PBXBuildFile; fileRef = 713A9415F77D646F9547193B /* bulgaria.png */; };
5251
6AEAC3D559B1D8BFC6773E3D /* MarkerEventsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD93738C4D90134DB506ECFE /* MarkerEventsViewController.swift */; };
52+
6B10D929BF31288BBE5AE3FB /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D7008070647C5D4ADC14A596 /* libPods-GoogleMapsSwiftDemos.a */; };
5353
6E635564BF1D56286E3689D4 /* PanoramaServiceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D27175E880CA9EEC63374BD4 /* PanoramaServiceController.swift */; };
5454
6FEFF5E13C84596B02FC5CEC /* step5.png in Resources */ = {isa = PBXBuildFile; fileRef = 24E559AA1425536C6D0ACF0D /* step5.png */; };
5555
704C7F6D4A183ABECFC0D5D2 /* DoubleMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBFD03041A5EAA400168D31F /* DoubleMapViewController.swift */; };
@@ -151,7 +151,6 @@
151151
72C6A03E42A9983A4FB4A7E3 /* GradientPolylinesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GradientPolylinesViewController.swift; sourceTree = "<group>"; };
152152
73E9911385541153DF35EE99 /* australia-large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "australia-large.png"; sourceTree = "<group>"; };
153153
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; };
155154
822521FD132C2E44D03EE0E8 /* argentina.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = argentina.png; sourceTree = "<group>"; };
156155
83F342A6AF95FF580F924D74 /* SampleListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleListViewController.swift; sourceTree = "<group>"; };
157156
87E37B0AEBC49DF8A0F89492 /* spitfire.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spitfire.png; sourceTree = "<group>"; };
@@ -182,12 +181,13 @@
182181
CBE707A4130CDA88BBCC2DD4 /* FitBoundsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FitBoundsViewController.swift; sourceTree = "<group>"; };
183182
CBFD03041A5EAA400168D31F /* DoubleMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DoubleMapViewController.swift; sourceTree = "<group>"; };
184183
CD93738C4D90134DB506ECFE /* MarkerEventsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkerEventsViewController.swift; sourceTree = "<group>"; };
184+
D0A3F16E35CB153BCAD44348 /* 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>"; };
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+
D7008070647C5D4ADC14A596 /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
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>"; };
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-
4CCB99CE0C86A4B513FC5F87 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
213+
6B10D929BF31288BBE5AE3FB /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
214214
);
215215
runOnlyForDeploymentPostprocessing = 0;
216216
};
@@ -353,7 +353,7 @@
353353
isa = PBXGroup;
354354
children = (
355355
922338CA529F228A03DE6422 /* UIKit.framework */,
356-
789BFE914A0151D5CCC3821A /* libPods-GoogleMapsSwiftDemos.a */,
356+
D7008070647C5D4ADC14A596 /* libPods-GoogleMapsSwiftDemos.a */,
357357
);
358358
name = Frameworks;
359359
sourceTree = "<group>";
@@ -372,7 +372,7 @@
372372
D0ED9A279E12177F7FDFA2FF /* Source */,
373373
AC723F443153D968479E59F3 /* Frameworks */,
374374
DD0B6FB690051F4443F4132B /* Products */,
375-
F1DBFA6CC671B2284D319829 /* Pods */,
375+
E5BD34CB8C9DC54688AFC752 /* Pods */,
376376
);
377377
sourceTree = "<group>";
378378
};
@@ -384,10 +384,10 @@
384384
name = Products;
385385
sourceTree = "<group>";
386386
};
387-
F1DBFA6CC671B2284D319829 /* Pods */ = {
387+
E5BD34CB8C9DC54688AFC752 /* Pods */ = {
388388
isa = PBXGroup;
389389
children = (
390-
E01F214444C329C1FB20445D /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
390+
D0A3F16E35CB153BCAD44348 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
391391
);
392392
name = Pods;
393393
path = Pods;
@@ -400,11 +400,11 @@
400400
isa = PBXNativeTarget;
401401
buildConfigurationList = 65556A7591C40D0E8B77989F /* Build configuration list for PBXNativeTarget "GoogleMapsSwiftDemos" */;
402402
buildPhases = (
403-
4E1DC9F6677285BFA23A8FA6 /* [CP] Check Pods Manifest.lock */,
403+
E15C83033FE4866813FBBAFF /* [CP] Check Pods Manifest.lock */,
404404
2ADDADBB329E244AF7ED1FB2 /* Resources */,
405405
22EB17F407E92B9B4F3B601A /* Sources */,
406406
B4530C282FE2BDE3D1071779 /* Frameworks */,
407-
5476A60E3B26EAB0DE44E3F6 /* [CP] Copy Pods Resources */,
407+
3C986E38329B5EB5E95075F2 /* [CP] Copy Pods Resources */,
408408
);
409409
buildRules = (
410410
);
@@ -502,48 +502,49 @@
502502
/* End PBXResourcesBuildPhase section */
503503

504504
/* Begin PBXShellScriptBuildPhase section */
505-
4E1DC9F6677285BFA23A8FA6 /* [CP] Check Pods Manifest.lock */ = {
505+
3C986E38329B5EB5E95075F2 /* [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.xcframework/ios-arm64/GoogleMaps.framework/Resources/GoogleMaps.bundle",
515+
"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64_x86_64-simulator/GoogleMaps.framework/Resources/GoogleMaps.bundle",
515516
);
516-
name = "[CP] Check Pods Manifest.lock";
517+
name = "[CP] Copy Pods Resources";
517518
outputFileListPaths = (
518519
);
519520
outputPaths = (
520-
"$(DERIVED_FILE_DIR)/Pods-GoogleMapsSwiftDemos-checkManifestLockResult.txt",
521+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
521522
);
522523
runOnlyForDeploymentPostprocessing = 0;
523524
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";
525+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos-resources.sh\"\n";
525526
showEnvVarsInLog = 0;
526527
};
527-
5476A60E3B26EAB0DE44E3F6 /* [CP] Copy Pods Resources */ = {
528+
E15C83033FE4866813FBBAFF /* [CP] Check Pods Manifest.lock */ = {
528529
isa = PBXShellScriptBuildPhase;
529530
buildActionMask = 2147483647;
530531
files = (
531532
);
532533
inputFileListPaths = (
533534
);
534535
inputPaths = (
535-
"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos-resources.sh",
536-
"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle",
536+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
537+
"${PODS_ROOT}/Manifest.lock",
537538
);
538-
name = "[CP] Copy Pods Resources";
539+
name = "[CP] Check Pods Manifest.lock";
539540
outputFileListPaths = (
540541
);
541542
outputPaths = (
542-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
543+
"$(DERIVED_FILE_DIR)/Pods-GoogleMapsSwiftDemos-checkManifestLockResult.txt",
543544
);
544545
runOnlyForDeploymentPostprocessing = 0;
545546
shellPath = /bin/sh;
546-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos-resources.sh\"\n";
547+
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";
547548
showEnvVarsInLog = 0;
548549
};
549550
/* End PBXShellScriptBuildPhase section */
@@ -612,7 +613,7 @@
612613
};
613614
6798450D013ACAFF39CF0187 /* Default */ = {
614615
isa = XCBuildConfiguration;
615-
baseConfigurationReference = E01F214444C329C1FB20445D /* Pods-GoogleMapsSwiftDemos.default.xcconfig */;
616+
baseConfigurationReference = D0A3F16E35CB153BCAD44348 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */;
616617
buildSettings = {
617618
"ARCHS[sdk=iphonesimulator*]" = x86_64;
618619
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

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.2.0'
5+
pod 'GoogleMaps', '= 7.3.0'
66
end

0 commit comments

Comments
 (0)