Skip to content

Commit 14bf1e5

Browse files
chore: Update Maps and Places samples from CocoaPods (#110)
1 parent fd80c19 commit 14bf1e5

File tree

11 files changed

+350
-244
lines changed

11 files changed

+350
-244
lines changed

GoogleMaps-Swift/GoogleMapsSwiftDemos.xcodeproj/project.pbxproj

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
2E3A841E83BC75E113066610 /* boat.png in Resources */ = {isa = PBXBuildFile; fileRef = EB1DB9C65356269FB0E9805F /* boat.png */; };
3838
32A5B9AE4D6B05579715DDD0 /* GradientPolylinesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72C6A03E42A9983A4FB4A7E3 /* GradientPolylinesViewController.swift */; };
3939
362C49E4DB90848A82AA5F1B /* museum-exhibits.json in Resources */ = {isa = PBXBuildFile; fileRef = AFCF3BFD151B8E93B8704001 /* museum-exhibits.json */; };
40-
381D371BE12E1DC59E751BED /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C593867D36B17929900C223 /* libPods-GoogleMapsSwiftDemos.a */; };
4140
3D3F2A8EA739004B1489A792 /* step8.png in Resources */ = {isa = PBXBuildFile; fileRef = EFD1B4A1869A5ED24977724F /* step8.png */; };
4241
41B7BD6313F16FFB24A404B2 /* step7.png in Resources */ = {isa = PBXBuildFile; fileRef = ED3D93ABBF24BFEF78629B0D /* step7.png */; };
4342
4206C1EEB8BE8EDAFE843D2B /* FixedPanoramaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1730B1B4AD1EF5754F84355B /* FixedPanoramaViewController.swift */; };
43+
45367BE851D69AB992B7C0DB /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 622F4CA3A164F2B224780251 /* libPods-GoogleMapsSwiftDemos.a */; };
4444
4773BB1B2EBD65AEC32F9E7C /* step3.png in Resources */ = {isa = PBXBuildFile; fileRef = E8E67F17F84C0169D05D684B /* step3.png */; };
4545
485D079B6D198FAB726B0505 /* CameraViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 612E451B3A594633E32B3131 /* CameraViewController.swift */; };
4646
4902D3615AFEEE5B646A4262 /* PanoramaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDABCFB71E0D9B75FA2091CF /* PanoramaViewController.swift */; };
@@ -142,16 +142,15 @@
142142
5DE971B436125DBE256A5FA5 /* mapstyle-night.json */ = {isa = PBXFileReference; lastKnownFileType = text; path = "mapstyle-night.json"; sourceTree = "<group>"; };
143143
5ED4F2473A7C9EB8BA05986B /* MarkersViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkersViewController.swift; sourceTree = "<group>"; };
144144
612E451B3A594633E32B3131 /* CameraViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraViewController.swift; sourceTree = "<group>"; };
145+
622F4CA3A164F2B224780251 /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
145146
63E4201AB786148B34D7190E /* IndoorMuseumNavigationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IndoorMuseumNavigationViewController.swift; sourceTree = "<group>"; };
146147
69B644212DDBA2509AD4CF5A /* VisibleRegionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VisibleRegionViewController.swift; sourceTree = "<group>"; };
147-
6C593867D36B17929900C223 /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
148148
6E8E2784C6B7A0900490D68D /* x29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = x29.png; sourceTree = "<group>"; };
149149
713A9415F77D646F9547193B /* bulgaria.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bulgaria.png; sourceTree = "<group>"; };
150150
71F546CBD85FE306F988C2F0 /* australia.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = australia.png; sourceTree = "<group>"; };
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-
7C36D817E980E40A80307C5B /* 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>"; };
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>"; };
@@ -180,6 +179,7 @@
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>"; };
182+
CBF5804C13F10F88F88BA169 /* 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>"; };
183183
CBFD03041A5EAA400168D31F /* DoubleMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DoubleMapViewController.swift; sourceTree = "<group>"; };
184184
CD93738C4D90134DB506ECFE /* MarkerEventsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkerEventsViewController.swift; sourceTree = "<group>"; };
185185
D10973A4336C45EE56319A9B /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
@@ -208,7 +208,7 @@
208208
buildActionMask = 2147483647;
209209
files = (
210210
4EA38ACBC98F34B1F0AF5BDD /* UIKit.framework in Frameworks */,
211-
381D371BE12E1DC59E751BED /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
211+
45367BE851D69AB992B7C0DB /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
212212
);
213213
runOnlyForDeploymentPostprocessing = 0;
214214
};
@@ -346,11 +346,20 @@
346346
path = Swift;
347347
sourceTree = "<group>";
348348
};
349+
98EBBCD9B48EDDD91E579E50 /* Pods */ = {
350+
isa = PBXGroup;
351+
children = (
352+
CBF5804C13F10F88F88BA169 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
353+
);
354+
name = Pods;
355+
path = Pods;
356+
sourceTree = "<group>";
357+
};
349358
AC723F443153D968479E59F3 /* Frameworks */ = {
350359
isa = PBXGroup;
351360
children = (
352361
922338CA529F228A03DE6422 /* UIKit.framework */,
353-
6C593867D36B17929900C223 /* libPods-GoogleMapsSwiftDemos.a */,
362+
622F4CA3A164F2B224780251 /* libPods-GoogleMapsSwiftDemos.a */,
354363
);
355364
name = Frameworks;
356365
sourceTree = "<group>";
@@ -369,7 +378,7 @@
369378
D0ED9A279E12177F7FDFA2FF /* Source */,
370379
AC723F443153D968479E59F3 /* Frameworks */,
371380
DD0B6FB690051F4443F4132B /* Products */,
372-
FEB2434D006CD309573AF32A /* Pods */,
381+
98EBBCD9B48EDDD91E579E50 /* Pods */,
373382
);
374383
sourceTree = "<group>";
375384
};
@@ -381,27 +390,18 @@
381390
name = Products;
382391
sourceTree = "<group>";
383392
};
384-
FEB2434D006CD309573AF32A /* Pods */ = {
385-
isa = PBXGroup;
386-
children = (
387-
7C36D817E980E40A80307C5B /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
388-
);
389-
name = Pods;
390-
path = Pods;
391-
sourceTree = "<group>";
392-
};
393393
/* End PBXGroup section */
394394

395395
/* Begin PBXNativeTarget section */
396396
56AB213E97CDD413D8EDA2B0 /* GoogleMapsSwiftDemos */ = {
397397
isa = PBXNativeTarget;
398398
buildConfigurationList = 65556A7591C40D0E8B77989F /* Build configuration list for PBXNativeTarget "GoogleMapsSwiftDemos" */;
399399
buildPhases = (
400-
0BB2A0437AF83B0F025D8D32 /* [CP] Check Pods Manifest.lock */,
400+
79055AD9C2E471679A59F1DF /* [CP] Check Pods Manifest.lock */,
401401
2ADDADBB329E244AF7ED1FB2 /* Resources */,
402402
22EB17F407E92B9B4F3B601A /* Sources */,
403403
B4530C282FE2BDE3D1071779 /* Frameworks */,
404-
8A4A654B05BAF848EABD26C4 /* [CP] Copy Pods Resources */,
404+
FF8D61581DFB5BCB7F8F3229 /* [CP] Copy Pods Resources */,
405405
);
406406
buildRules = (
407407
);
@@ -499,7 +499,7 @@
499499
/* End PBXResourcesBuildPhase section */
500500

501501
/* Begin PBXShellScriptBuildPhase section */
502-
0BB2A0437AF83B0F025D8D32 /* [CP] Check Pods Manifest.lock */ = {
502+
79055AD9C2E471679A59F1DF /* [CP] Check Pods Manifest.lock */ = {
503503
isa = PBXShellScriptBuildPhase;
504504
buildActionMask = 2147483647;
505505
files = (
@@ -521,7 +521,7 @@
521521
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";
522522
showEnvVarsInLog = 0;
523523
};
524-
8A4A654B05BAF848EABD26C4 /* [CP] Copy Pods Resources */ = {
524+
FF8D61581DFB5BCB7F8F3229 /* [CP] Copy Pods Resources */ = {
525525
isa = PBXShellScriptBuildPhase;
526526
buildActionMask = 2147483647;
527527
files = (
@@ -608,7 +608,7 @@
608608
};
609609
6798450D013ACAFF39CF0187 /* Default */ = {
610610
isa = XCBuildConfiguration;
611-
baseConfigurationReference = 7C36D817E980E40A80307C5B /* Pods-GoogleMapsSwiftDemos.default.xcconfig */;
611+
baseConfigurationReference = CBF5804C13F10F88F88BA169 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */;
612612
buildSettings = {
613613
"ARCHS[sdk=iphonesimulator*]" = x86_64;
614614
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

GoogleMaps-Swift/GoogleMapsSwiftDemos/MapsDemoAssets.xcassets/Contents.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@
44
"author" : "xcode"
55
}
66
}
7-

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, '11.0'
5-
pod 'GoogleMaps', '= 5.1.0'
5+
pod 'GoogleMaps', '= 5.2.0'
66
end

0 commit comments

Comments
 (0)