Skip to content

Commit 2df9241

Browse files
wangelawangela
authored
Merge pull request #136 from googlemaps/googlemaps-bot/update_samples
chore: Update Maps and Places samples from CocoaPods
2 parents d29989e + 93881aa commit 2df9241

File tree

12 files changed

+219
-198
lines changed

12 files changed

+219
-198
lines changed

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

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
B69D158DC43E0889B5BF1561 /* glow-marker.png in Resources */ = {isa = PBXBuildFile; fileRef = F17F1884FB9429A59D92A98A /* glow-marker.png */; };
8181
B7345D33E5BF31A00280355C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = DF1488DDE60393FF03CF8A87 /* [email protected] */; };
8282
B9465AA9D8B047C4FF6EFF98 /* step1.png in Resources */ = {isa = PBXBuildFile; fileRef = 02A9E40F7B9F8AFC4EF0BB41 /* step1.png */; };
83-
B9725641369861FDBC8046D3 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63AF37A8F0E2EE865E70CC54 /* libPods-GoogleMapsSwiftDemos.a */; };
8483
C29CA0E15834811100992B2E /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C6041A5D425D71CDF9418ABE /* [email protected] */; };
8584
C7EBC2EA4F8DE36B09BCB5C9 /* argentina-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 0EDDB89D7FC679C6141D5F7F /* argentina-large.png */; };
8685
CA20AF965D945AFC7DA5FB88 /* australia.png in Resources */ = {isa = PBXBuildFile; fileRef = 71F546CBD85FE306F988C2F0 /* australia.png */; };
@@ -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+
DFCEC8449629BFEEA457F999 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DEADFDF2B463E89F7CAAB154 /* 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 */; };
@@ -127,6 +127,7 @@
127127
3B919F5AC728E794E349D4A3 /* SampleLevel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleLevel.swift; sourceTree = "<group>"; };
128128
3EA1DB5D699D162AC375E1C9 /* StyledMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StyledMapViewController.swift; sourceTree = "<group>"; };
129129
4091BA2074B3B691B1AAD79F /* TrafficMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrafficMapViewController.swift; sourceTree = "<group>"; };
130+
43BD9EA9C966A424C6636738 /* 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>"; };
130131
4429DACE39F5B3E2E31B963D /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
131132
4864D7EE574742D69D0917F3 /* step6.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step6.png; sourceTree = "<group>"; };
132133
49E9C05F3A051F688CF7F4BF /* AnimatedUIViewMarkerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimatedUIViewMarkerViewController.swift; sourceTree = "<group>"; };
@@ -142,7 +143,6 @@
142143
5DE971B436125DBE256A5FA5 /* mapstyle-night.json */ = {isa = PBXFileReference; lastKnownFileType = text; path = "mapstyle-night.json"; sourceTree = "<group>"; };
143144
5ED4F2473A7C9EB8BA05986B /* MarkersViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkersViewController.swift; sourceTree = "<group>"; };
144145
612E451B3A594633E32B3131 /* CameraViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraViewController.swift; sourceTree = "<group>"; };
145-
63AF37A8F0E2EE865E70CC54 /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
146146
63E4201AB786148B34D7190E /* IndoorMuseumNavigationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IndoorMuseumNavigationViewController.swift; sourceTree = "<group>"; };
147147
69B644212DDBA2509AD4CF5A /* VisibleRegionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VisibleRegionViewController.swift; sourceTree = "<group>"; };
148148
6E8E2784C6B7A0900490D68D /* x29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = x29.png; sourceTree = "<group>"; };
@@ -176,7 +176,6 @@
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-
C7209C93B04D2F92A3381078 /* 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>"; };
180179
C96B86B64A6F458F79250076 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
181180
CB2B29C49F7B36D477192D04 /* MapTypesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTypesViewController.swift; sourceTree = "<group>"; };
182181
CBE707A4130CDA88BBCC2DD4 /* FitBoundsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FitBoundsViewController.swift; sourceTree = "<group>"; };
@@ -185,6 +184,7 @@
185184
D10973A4336C45EE56319A9B /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
186185
D1A99C0C04795272C12DD9EF /* StructuredGeocoderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StructuredGeocoderViewController.swift; sourceTree = "<group>"; };
187186
DE91B8EA42AFFCEDA758CE06 /* SDKConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SDKConstants.swift; sourceTree = "<group>"; };
187+
DEADFDF2B463E89F7CAAB154 /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
188188
DF1488DDE60393FF03CF8A87 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
189189
E18764F42392A93B39C775AB /* SampleMapStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleMapStyle.swift; sourceTree = "<group>"; };
190190
E5AB6411A9C7E6CEDB98041D /* BasicMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasicMapViewController.swift; sourceTree = "<group>"; };
@@ -208,7 +208,7 @@
208208
buildActionMask = 2147483647;
209209
files = (
210210
4EA38ACBC98F34B1F0AF5BDD /* UIKit.framework in Frameworks */,
211-
B9725641369861FDBC8046D3 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
211+
DFCEC8449629BFEEA457F999 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
212212
);
213213
runOnlyForDeploymentPostprocessing = 0;
214214
};
@@ -265,6 +265,15 @@
265265
path = Resources;
266266
sourceTree = "<group>";
267267
};
268+
420C3665B5B4BB86F6C531DD /* Pods */ = {
269+
isa = PBXGroup;
270+
children = (
271+
43BD9EA9C966A424C6636738 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
272+
);
273+
name = Pods;
274+
path = Pods;
275+
sourceTree = "<group>";
276+
};
268277
4918D759D471F1C23487E663 /* Samples */ = {
269278
isa = PBXGroup;
270279
children = (
@@ -350,20 +359,11 @@
350359
isa = PBXGroup;
351360
children = (
352361
922338CA529F228A03DE6422 /* UIKit.framework */,
353-
63AF37A8F0E2EE865E70CC54 /* libPods-GoogleMapsSwiftDemos.a */,
362+
DEADFDF2B463E89F7CAAB154 /* libPods-GoogleMapsSwiftDemos.a */,
354363
);
355364
name = Frameworks;
356365
sourceTree = "<group>";
357366
};
358-
BA709FC6763EFA0010CE7AEA /* Pods */ = {
359-
isa = PBXGroup;
360-
children = (
361-
C7209C93B04D2F92A3381078 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
362-
);
363-
name = Pods;
364-
path = Pods;
365-
sourceTree = "<group>";
366-
};
367367
D0ED9A279E12177F7FDFA2FF /* Source */ = {
368368
isa = PBXGroup;
369369
children = (
@@ -378,7 +378,7 @@
378378
D0ED9A279E12177F7FDFA2FF /* Source */,
379379
AC723F443153D968479E59F3 /* Frameworks */,
380380
DD0B6FB690051F4443F4132B /* Products */,
381-
BA709FC6763EFA0010CE7AEA /* Pods */,
381+
420C3665B5B4BB86F6C531DD /* 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-
23EC878B429D03E253EF274B /* [CP] Check Pods Manifest.lock */,
400+
C484CCCFA13ECD6588C563EE /* [CP] Check Pods Manifest.lock */,
401401
2ADDADBB329E244AF7ED1FB2 /* Resources */,
402402
22EB17F407E92B9B4F3B601A /* Sources */,
403403
B4530C282FE2BDE3D1071779 /* Frameworks */,
404-
E6A7725D5C4F4CAB91B7EFF8 /* [CP] Copy Pods Resources */,
404+
779FA56A23F388F75F5DAEB7 /* [CP] Copy Pods Resources */,
405405
);
406406
buildRules = (
407407
);
@@ -499,48 +499,48 @@
499499
/* End PBXResourcesBuildPhase section */
500500

501501
/* Begin PBXShellScriptBuildPhase section */
502-
23EC878B429D03E253EF274B /* [CP] Check Pods Manifest.lock */ = {
502+
779FA56A23F388F75F5DAEB7 /* [CP] Copy Pods Resources */ = {
503503
isa = PBXShellScriptBuildPhase;
504504
buildActionMask = 2147483647;
505505
files = (
506506
);
507507
inputFileListPaths = (
508508
);
509509
inputPaths = (
510-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
511-
"${PODS_ROOT}/Manifest.lock",
510+
"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos-resources.sh",
511+
"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle",
512512
);
513-
name = "[CP] Check Pods Manifest.lock";
513+
name = "[CP] Copy Pods Resources";
514514
outputFileListPaths = (
515515
);
516516
outputPaths = (
517-
"$(DERIVED_FILE_DIR)/Pods-GoogleMapsSwiftDemos-checkManifestLockResult.txt",
517+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
518518
);
519519
runOnlyForDeploymentPostprocessing = 0;
520520
shellPath = /bin/sh;
521-
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";
521+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos-resources.sh\"\n";
522522
showEnvVarsInLog = 0;
523523
};
524-
E6A7725D5C4F4CAB91B7EFF8 /* [CP] Copy Pods Resources */ = {
524+
C484CCCFA13ECD6588C563EE /* [CP] Check Pods Manifest.lock */ = {
525525
isa = PBXShellScriptBuildPhase;
526526
buildActionMask = 2147483647;
527527
files = (
528528
);
529529
inputFileListPaths = (
530530
);
531531
inputPaths = (
532-
"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos-resources.sh",
533-
"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle",
532+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
533+
"${PODS_ROOT}/Manifest.lock",
534534
);
535-
name = "[CP] Copy Pods Resources";
535+
name = "[CP] Check Pods Manifest.lock";
536536
outputFileListPaths = (
537537
);
538538
outputPaths = (
539-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
539+
"$(DERIVED_FILE_DIR)/Pods-GoogleMapsSwiftDemos-checkManifestLockResult.txt",
540540
);
541541
runOnlyForDeploymentPostprocessing = 0;
542542
shellPath = /bin/sh;
543-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos-resources.sh\"\n";
543+
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";
544544
showEnvVarsInLog = 0;
545545
};
546546
/* End PBXShellScriptBuildPhase section */
@@ -608,7 +608,7 @@
608608
};
609609
6798450D013ACAFF39CF0187 /* Default */ = {
610610
isa = XCBuildConfiguration;
611-
baseConfigurationReference = C7209C93B04D2F92A3381078 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */;
611+
baseConfigurationReference = 43BD9EA9C966A424C6636738 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */;
612612
buildSettings = {
613613
"ARCHS[sdk=iphonesimulator*]" = x86_64;
614614
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

‎GoogleMaps-Swift/GoogleMapsSwiftDemos/MapsDemoAssets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 46 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,97 +2,102 @@
22
"images" : [
33
{
44
"idiom" : "iphone",
5-
"size" : "20x20",
6-
"scale" : "2x"
5+
"scale" : "2x",
6+
"size" : "20x20"
77
},
88
{
99
"idiom" : "iphone",
10-
"size" : "20x20",
11-
"scale" : "3x"
10+
"scale" : "3x",
11+
"size" : "20x20"
1212
},
1313
{
1414
"idiom" : "iphone",
15-
"size" : "29x29",
16-
"scale" : "2x"
15+
"scale" : "2x",
16+
"size" : "29x29"
1717
},
1818
{
1919
"idiom" : "iphone",
20-
"size" : "29x29",
21-
"scale" : "3x"
20+
"scale" : "3x",
21+
"size" : "29x29"
2222
},
2323
{
2424
"idiom" : "iphone",
25-
"size" : "40x40",
26-
"scale" : "2x"
25+
"scale" : "2x",
26+
"size" : "40x40"
2727
},
2828
{
2929
"idiom" : "iphone",
30-
"size" : "40x40",
31-
"scale" : "3x"
30+
"scale" : "3x",
31+
"size" : "40x40"
3232
},
3333
{
34-
"size" : "60x60",
35-
"idiom" : "iphone",
3634
"filename" : "Maps-SDK-Demo-App_120.png",
37-
"scale" : "2x"
35+
"idiom" : "iphone",
36+
"scale" : "2x",
37+
"size" : "60x60"
3838
},
3939
{
40-
"size" : "60x60",
41-
"idiom" : "iphone",
4240
"filename" : "Maps-SDK-Demo-App_180.png",
43-
"scale" : "3x"
41+
"idiom" : "iphone",
42+
"scale" : "3x",
43+
"size" : "60x60"
4444
},
4545
{
4646
"idiom" : "ipad",
47-
"size" : "20x20",
48-
"scale" : "1x"
47+
"scale" : "1x",
48+
"size" : "20x20"
4949
},
5050
{
5151
"idiom" : "ipad",
52-
"size" : "20x20",
53-
"scale" : "2x"
52+
"scale" : "2x",
53+
"size" : "20x20"
5454
},
5555
{
5656
"idiom" : "ipad",
57-
"size" : "29x29",
58-
"scale" : "1x"
57+
"scale" : "1x",
58+
"size" : "29x29"
5959
},
6060
{
6161
"idiom" : "ipad",
62-
"size" : "29x29",
63-
"scale" : "2x"
62+
"scale" : "2x",
63+
"size" : "29x29"
6464
},
6565
{
6666
"idiom" : "ipad",
67-
"size" : "40x40",
68-
"scale" : "1x"
67+
"scale" : "1x",
68+
"size" : "40x40"
6969
},
7070
{
7171
"idiom" : "ipad",
72-
"size" : "40x40",
73-
"scale" : "2x"
72+
"scale" : "2x",
73+
"size" : "40x40"
7474
},
7575
{
76-
"size" : "76x76",
77-
"idiom" : "ipad",
7876
"filename" : "Maps-SDK-Demo-App_76.png",
79-
"scale" : "1x"
77+
"idiom" : "ipad",
78+
"scale" : "1x",
79+
"size" : "76x76"
8080
},
8181
{
82-
"size" : "76x76",
83-
"idiom" : "ipad",
8482
"filename" : "Maps-SDK-Demo-App_152.png",
85-
"scale" : "2x"
83+
"idiom" : "ipad",
84+
"scale" : "2x",
85+
"size" : "76x76"
8686
},
8787
{
88-
"size" : "83.5x83.5",
89-
"idiom" : "ipad",
9088
"filename" : "Maps-SDK-Demo-App_167.png",
91-
"scale" : "2x"
89+
"idiom" : "ipad",
90+
"scale" : "2x",
91+
"size" : "83.5x83.5"
92+
},
93+
{
94+
"idiom" : "ios-marketing",
95+
"scale" : "1x",
96+
"size" : "1024x1024"
9297
}
9398
],
9499
"info" : {
95-
"version" : 1,
96-
"author" : "xcode"
100+
"author" : "xcode",
101+
"version" : 1
97102
}
98103
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ class StyledMapViewController: UIViewController {
4646
})
4747
}
4848
alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
49+
alert.popoverPresentationController?.barButtonItem = sender
4950
present(alert, animated: true)
5051
}
5152
}

‎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, '12.0'
5-
pod 'GoogleMaps', '= 6.1.1'
5+
pod 'GoogleMaps', '= 6.2.0'
66
end

0 commit comments

Comments
 (0)