Skip to content

Commit 767b1f6

Browse files
chore: Update Maps, Places and Navigation samples from CocoaPods (#213)
1 parent 8dd877a commit 767b1f6

File tree

123 files changed

+1339
-643
lines changed

Some content is hidden

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

123 files changed

+1339
-643
lines changed

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos.xcodeproj/project.pbxproj

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
1A48B68AA2A51B8420D10283 /* step4.png in Resources */ = {isa = PBXBuildFile; fileRef = BD395D788FF527EA97FD2957 /* step4.png */; };
2222
1CD7AB8171D046AABFECE269 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 71BD7C12F48BAF53583A910C /* [email protected] */; };
2323
2015AA61583C94D81472FDE9 /* MarkerInfoWindowViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B2ABAF90E4D16D80FB637B0 /* MarkerInfoWindowViewController.swift */; };
24-
210D9459D38537822BB4AA6D /* libPods-GoogleMapsSwiftXCFrameworkDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8958099EFF1E216167AC7B71 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a */; };
2524
224A60161BCB8B23919F3372 /* voyager.png in Resources */ = {isa = PBXBuildFile; fileRef = 2E152725ABC167064FB9B792 /* voyager.png */; };
2625
248AD839C8AF6700D60F04AE /* CustomMarkersViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78DE8670A1B9D301D6182F16 /* CustomMarkersViewController.swift */; };
26+
273F7B460A071EF4EB92931B /* libPods-GoogleMapsSwiftXCFrameworkDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4624CE8A683C0C64F4302D71 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a */; };
2727
2810BB28A2ACCFFD0BE6544B /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 207123C407D9F42BB6D3C9D6 /* [email protected] */; };
2828
2BF464AD6730D4C5005D2EC9 /* UIViewController+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44D716D9114DCC920923A1B0 /* UIViewController+Extensions.swift */; };
2929
2CDC67FEB6CB48BBF4B08275 /* GeocoderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB2EE1D7695E0D90DBEAF4CC /* GeocoderViewController.swift */; };
@@ -59,7 +59,6 @@
5959
74E88C427B498F911D32A44B /* australia.png in Resources */ = {isa = PBXBuildFile; fileRef = 5FFD3A6BE4BD4C012EF50AFD /* australia.png */; };
6060
776382BEFFA4C43C5F9F38B6 /* h1.png in Resources */ = {isa = PBXBuildFile; fileRef = 1EE67692C7A590BCF85C3ED9 /* h1.png */; };
6161
781F9CEB35235538D6F5634E /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 825447853189D2D4563BB028 /* [email protected] */; };
62-
78D1E74704B5966731F0EAFD /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 813AA650D6B913CB76AAAB53 /* UIKit.framework */; };
6362
791E7FEACC10DFDA9E5512BD /* argentina.png in Resources */ = {isa = PBXBuildFile; fileRef = BEB38D778B61FCFDCD0BAF3E /* argentina.png */; };
6463
82043308F53102E889C6B28F /* DataDrivenStylingEventsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EF2332C983F2B61EE8D591A /* DataDrivenStylingEventsViewController.swift */; };
6564
8672736AB1BB98F58F6C5ED9 /* botswana.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CB004432BC22DC920797C87 /* botswana.png */; };
@@ -68,6 +67,7 @@
6867
96AC98FFADF710277E6F4309 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 6C6FC465538CF0231E3E32EF /* [email protected] */; };
6968
9A11BCC3B4489D9E4B60BEA7 /* AnimatedUIViewMarkerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90FD42CF0008B034BF8B30F5 /* AnimatedUIViewMarkerViewController.swift */; };
7069
9AA1A005AF4CC2512BD677CE /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7050C885E55BC73ABC66C1BA /* LaunchScreen.storyboard */; };
70+
9EC74440F1F7C7C6B7456F14 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 813AA650D6B913CB76AAAB53 /* UIKit.framework */; };
7171
9EFFD4F29F6DBCB69FFF955F /* spitfire.png in Resources */ = {isa = PBXBuildFile; fileRef = 1D0078DD977DCD440A9B1847 /* spitfire.png */; };
7272
9FEC78EBC378E57B626A0949 /* PolylinesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA082F9AB6DF56657D760529 /* PolylinesViewController.swift */; };
7373
A1C22569608372D07A4EA5FC /* CameraViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B974B58EDD2B70A1FA0C107F /* CameraViewController.swift */; };
@@ -139,6 +139,7 @@
139139
4162E354E88F4EFE2CF145C0 /* GoogleMapsSwiftXCFrameworkDemos.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GoogleMapsSwiftXCFrameworkDemos.app; sourceTree = BUILT_PRODUCTS_DIR; };
140140
4494DA7385C95B5268429894 /* popup_santa.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = popup_santa.png; sourceTree = "<group>"; };
141141
44D716D9114DCC920923A1B0 /* UIViewController+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Extensions.swift"; sourceTree = "<group>"; };
142+
4624CE8A683C0C64F4302D71 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftXCFrameworkDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
142143
4E80A76C0EFBE73CEBFE4A88 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
143144
56F86F40F30C6687633BD6AF /* x29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = x29.png; sourceTree = "<group>"; };
144145
5B5C253D2138464651723AF4 /* bulgaria.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bulgaria.png; sourceTree = "<group>"; };
@@ -162,10 +163,8 @@
162163
80E098AF4C56B795EBA7E881 /* PolygonsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PolygonsViewController.swift; sourceTree = "<group>"; };
163164
813AA650D6B913CB76AAAB53 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
164165
825447853189D2D4563BB028 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
165-
82E86267E9757933A4CCBEA4 /* Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleMapsSwiftXCFrameworkDemos/Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig"; sourceTree = "<group>"; };
166166
8401BB4562DADADAC4885D68 /* DataDrivenStylingBasicViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataDrivenStylingBasicViewController.swift; sourceTree = "<group>"; };
167167
85B2170D89EEB8206C3C8C59 /* museum-exhibits.json */ = {isa = PBXFileReference; lastKnownFileType = text; path = "museum-exhibits.json"; sourceTree = "<group>"; };
168-
8958099EFF1E216167AC7B71 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftXCFrameworkDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
169168
8A8CD751D4D3EF8B5A930C62 /* AnimatedCurrentLocationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimatedCurrentLocationViewController.swift; sourceTree = "<group>"; };
170169
8B2ABAF90E4D16D80FB637B0 /* MarkerInfoWindowViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkerInfoWindowViewController.swift; sourceTree = "<group>"; };
171170
8B3409E9F50034C8B197B83C /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
@@ -203,6 +202,7 @@
203202
D20F48E81C4AB68DA9666435 /* boat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = boat.png; sourceTree = "<group>"; };
204203
D773980AEA07C06EEBD6CAE2 /* aeroplane.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = aeroplane.png; sourceTree = "<group>"; };
205204
DC4F9FD5FA2BDB4F54C62664 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
205+
DDB557D895F5956CA43E9D29 /* Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleMapsSwiftXCFrameworkDemos/Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig"; sourceTree = "<group>"; };
206206
DDE3AA2A24258BFC4FB2E985 /* GestureControlViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GestureControlViewController.swift; sourceTree = "<group>"; };
207207
E30250B9C564E339DB5564CF /* MapLayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapLayerViewController.swift; sourceTree = "<group>"; };
208208
E42C1CA863AAC166B9252B90 /* PanoramaServiceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PanoramaServiceController.swift; sourceTree = "<group>"; };
@@ -223,19 +223,19 @@
223223
isa = PBXFrameworksBuildPhase;
224224
buildActionMask = 2147483647;
225225
files = (
226-
78D1E74704B5966731F0EAFD /* UIKit.framework in Frameworks */,
227-
210D9459D38537822BB4AA6D /* libPods-GoogleMapsSwiftXCFrameworkDemos.a in Frameworks */,
226+
9EC74440F1F7C7C6B7456F14 /* UIKit.framework in Frameworks */,
227+
273F7B460A071EF4EB92931B /* libPods-GoogleMapsSwiftXCFrameworkDemos.a in Frameworks */,
228228
);
229229
runOnlyForDeploymentPostprocessing = 0;
230230
};
231231
/* End PBXFrameworksBuildPhase section */
232232

233233
/* Begin PBXGroup section */
234-
1770C8310E66B2F5721EFB53 /* Frameworks */ = {
234+
49D5CD2CC2E5C5341C1AA1A8 /* Frameworks */ = {
235235
isa = PBXGroup;
236236
children = (
237237
813AA650D6B913CB76AAAB53 /* UIKit.framework */,
238-
8958099EFF1E216167AC7B71 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a */,
238+
4624CE8A683C0C64F4302D71 /* libPods-GoogleMapsSwiftXCFrameworkDemos.a */,
239239
);
240240
name = Frameworks;
241241
sourceTree = "<group>";
@@ -353,6 +353,15 @@
353353
path = Samples;
354354
sourceTree = "<group>";
355355
};
356+
A39D4F0C1DEB44785ED809F3 /* Pods */ = {
357+
isa = PBXGroup;
358+
children = (
359+
DDB557D895F5956CA43E9D29 /* Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig */,
360+
);
361+
name = Pods;
362+
path = Pods;
363+
sourceTree = "<group>";
364+
};
356365
BE46EA4B5CB54B89AF4894A6 /* Museum-Icons */ = {
357366
isa = PBXGroup;
358367
children = (
@@ -380,9 +389,9 @@
380389
isa = PBXGroup;
381390
children = (
382391
66BBCDCC5A47AE0211100656 /* Source */,
383-
1770C8310E66B2F5721EFB53 /* Frameworks */,
392+
49D5CD2CC2E5C5341C1AA1A8 /* Frameworks */,
384393
C28851C9B618723E4F44AB23 /* Products */,
385-
DFC5FAB3928456731B3951EA /* Pods */,
394+
A39D4F0C1DEB44785ED809F3 /* Pods */,
386395
);
387396
sourceTree = "<group>";
388397
};
@@ -398,27 +407,18 @@
398407
path = Swift;
399408
sourceTree = "<group>";
400409
};
401-
DFC5FAB3928456731B3951EA /* Pods */ = {
402-
isa = PBXGroup;
403-
children = (
404-
82E86267E9757933A4CCBEA4 /* Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig */,
405-
);
406-
name = Pods;
407-
path = Pods;
408-
sourceTree = "<group>";
409-
};
410410
/* End PBXGroup section */
411411

412412
/* Begin PBXNativeTarget section */
413413
B9438E618FB390D6355C2B57 /* GoogleMapsSwiftXCFrameworkDemos */ = {
414414
isa = PBXNativeTarget;
415415
buildConfigurationList = 5AC1A4250158D74DFA863CCE /* Build configuration list for PBXNativeTarget "GoogleMapsSwiftXCFrameworkDemos" */;
416416
buildPhases = (
417-
62A5842B4106D070E86884B8 /* [CP] Check Pods Manifest.lock */,
417+
9E17DB1B61BB43E652FF469C /* [CP] Check Pods Manifest.lock */,
418418
3F21832F0D03F8AC6CEF22A0 /* Resources */,
419419
BA0F106D7033E3A8544A3F80 /* Sources */,
420420
D163048ECCA404350BF50B51 /* Frameworks */,
421-
0165694DFDB6F815113431FE /* [CP] Copy Pods Resources */,
421+
D1BEC2238D955EF0A8EF07AE /* [CP] Copy Pods Resources */,
422422
);
423423
buildRules = (
424424
);
@@ -518,48 +518,48 @@
518518
/* End PBXResourcesBuildPhase section */
519519

520520
/* Begin PBXShellScriptBuildPhase section */
521-
0165694DFDB6F815113431FE /* [CP] Copy Pods Resources */ = {
521+
9E17DB1B61BB43E652FF469C /* [CP] Check Pods Manifest.lock */ = {
522522
isa = PBXShellScriptBuildPhase;
523523
buildActionMask = 2147483647;
524524
files = (
525525
);
526526
inputFileListPaths = (
527527
);
528528
inputPaths = (
529-
"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftXCFrameworkDemos/Pods-GoogleMapsSwiftXCFrameworkDemos-resources.sh",
530-
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleMaps/GoogleMapsResources.bundle",
529+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
530+
"${PODS_ROOT}/Manifest.lock",
531531
);
532-
name = "[CP] Copy Pods Resources";
532+
name = "[CP] Check Pods Manifest.lock";
533533
outputFileListPaths = (
534534
);
535535
outputPaths = (
536-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMapsResources.bundle",
536+
"$(DERIVED_FILE_DIR)/Pods-GoogleMapsSwiftXCFrameworkDemos-checkManifestLockResult.txt",
537537
);
538538
runOnlyForDeploymentPostprocessing = 0;
539539
shellPath = /bin/sh;
540-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftXCFrameworkDemos/Pods-GoogleMapsSwiftXCFrameworkDemos-resources.sh\"\n";
540+
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";
541541
showEnvVarsInLog = 0;
542542
};
543-
62A5842B4106D070E86884B8 /* [CP] Check Pods Manifest.lock */ = {
543+
D1BEC2238D955EF0A8EF07AE /* [CP] Copy Pods Resources */ = {
544544
isa = PBXShellScriptBuildPhase;
545545
buildActionMask = 2147483647;
546546
files = (
547547
);
548548
inputFileListPaths = (
549549
);
550550
inputPaths = (
551-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
552-
"${PODS_ROOT}/Manifest.lock",
551+
"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftXCFrameworkDemos/Pods-GoogleMapsSwiftXCFrameworkDemos-resources.sh",
552+
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleMaps/GoogleMapsResources.bundle",
553553
);
554-
name = "[CP] Check Pods Manifest.lock";
554+
name = "[CP] Copy Pods Resources";
555555
outputFileListPaths = (
556556
);
557557
outputPaths = (
558-
"$(DERIVED_FILE_DIR)/Pods-GoogleMapsSwiftXCFrameworkDemos-checkManifestLockResult.txt",
558+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMapsResources.bundle",
559559
);
560560
runOnlyForDeploymentPostprocessing = 0;
561561
shellPath = /bin/sh;
562-
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";
562+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftXCFrameworkDemos/Pods-GoogleMapsSwiftXCFrameworkDemos-resources.sh\"\n";
563563
showEnvVarsInLog = 0;
564564
};
565565
/* End PBXShellScriptBuildPhase section */
@@ -624,7 +624,7 @@
624624
/* Begin XCBuildConfiguration section */
625625
060E158855CB2E3846F43DB2 /* Default */ = {
626626
isa = XCBuildConfiguration;
627-
baseConfigurationReference = 82E86267E9757933A4CCBEA4 /* Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig */;
627+
baseConfigurationReference = DDB557D895F5956CA43E9D29 /* Pods-GoogleMapsSwiftXCFrameworkDemos.default.xcconfig */;
628628
buildSettings = {
629629
"ARCHS[sdk=iphonesimulator*]" = x86_64;
630630
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import GoogleMaps
1515
import UIKit
1616

17-
@UIApplicationMain
17+
@main
1818
class AppDelegate: UIResponder, UIApplicationDelegate, UIWindowSceneDelegate {
1919

2020
private var services: Any?

GoogleMaps-Swift/Podfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
source 'https://cdn.cocoapods.org/'
1+
source 'https://github.com/CocoaPods/Specs.git'
22

33
platform :ios, '15.0'
44

55
target 'GoogleMapsSwiftXCFrameworkDemos' do
66
project 'GoogleMapsSwiftXCFrameworkDemos'
7-
pod 'GoogleMaps', '= 9.1.0'
8-
end
7+
pod 'GoogleMaps', '= 9.2.0'
8+
end

0 commit comments

Comments
 (0)