Skip to content

Commit

Permalink
chore: Update Maps and Places samples from CocoaPods (#161)
Browse files Browse the repository at this point in the history
  • Loading branch information
@googlemaps-bot
googlemaps-bot authored Nov 9, 2022
1 parent 645a191 commit c3fb245
Show file tree
Hide file tree
Showing 12 changed files with 143 additions and 128 deletions.
60 changes: 30 additions & 30 deletions GoogleMaps-Swift/GoogleMapsSwiftDemos.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
4412D5711BE701B4DF734178 /* MarkerLayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABD5CD72476857CF2A348366 /* MarkerLayerViewController.swift */; };
4773BB1B2EBD65AEC32F9E7C /* step3.png in Resources */ = {isa = PBXBuildFile; fileRef = E8E67F17F84C0169D05D684B /* step3.png */; };
4A9E3BF5489DCA1C7A200A64 /* mapstyle-retro.json in Resources */ = {isa = PBXBuildFile; fileRef = 8E0F7227CD83A68A40D74050 /* mapstyle-retro.json */; };
4CCB99CE0C86A4B513FC5F87 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 789BFE914A0151D5CCC3821A /* libPods-GoogleMapsSwiftDemos.a */; };
4D932F94F684532C309EB4BF /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = C96B86B64A6F458F79250076 /* [email protected] */; };
4EA38ACBC98F34B1F0AF5BDD /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 922338CA529F228A03DE6422 /* UIKit.framework */; };
4F01A0839D992FC9F724CD85 /* mapstyle-silver.json in Resources */ = {isa = PBXBuildFile; fileRef = 30CF698467FA9E7F200017B3 /* mapstyle-silver.json */; };
Expand All @@ -63,7 +64,6 @@
901043470A299C77DD977AD7 /* GeocoderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03D1BEF5B3B6C6A990EA98C5 /* GeocoderViewController.swift */; };
91D8C803DEDB4A701699AF8D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 0A676DB2BE6F08848CCC5F44 /* [email protected] */; };
93DF8E1D616607C73D24D731 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8DCC6728BCC97657B2285199 /* [email protected] */; };
940EC54ABB85DC452211E8B1 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5AC932682FDF13726178F857 /* libPods-GoogleMapsSwiftDemos.a */; };
960FB4FB5A416023B5C19485 /* Samples.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE8CA03ED74DC7887D70CCA6 /* Samples.swift */; };
96C875435D27456CC476392F /* PolygonsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C54F70F6C6426F576247C16F /* PolygonsViewController.swift */; };
9E993392AC110B9DC9DA3BF3 /* SnapshotReadyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DB76DC4B0DC1CB6692AE61E /* SnapshotReadyViewController.swift */; };
Expand Down Expand Up @@ -136,7 +136,6 @@
4E35664DD7AE7235688F9964 /* IndoorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IndoorViewController.swift; sourceTree = "<group>"; };
522113F4629950AB8239E18A /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
582E8D45A41BDDC81EA48DD7 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
5AC932682FDF13726178F857 /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5B08A9836FC58ADF5E6C36DC /* CustomIndoorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomIndoorViewController.swift; sourceTree = "<group>"; };
5B8C82F193D6253A379BF3FD /* CustomMarkersViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomMarkersViewController.swift; sourceTree = "<group>"; };
5CFB2179FECC8DF98666E98A /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
Expand All @@ -152,6 +151,7 @@
72C6A03E42A9983A4FB4A7E3 /* GradientPolylinesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GradientPolylinesViewController.swift; sourceTree = "<group>"; };
73E9911385541153DF35EE99 /* australia-large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "australia-large.png"; sourceTree = "<group>"; };
784B90031ED0D2E68FA9EF93 /* PolylinesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PolylinesViewController.swift; sourceTree = "<group>"; };
789BFE914A0151D5CCC3821A /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
822521FD132C2E44D03EE0E8 /* argentina.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = argentina.png; sourceTree = "<group>"; };
83F342A6AF95FF580F924D74 /* SampleListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleListViewController.swift; sourceTree = "<group>"; };
87E37B0AEBC49DF8A0F89492 /* spitfire.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spitfire.png; sourceTree = "<group>"; };
Expand Down Expand Up @@ -185,9 +185,9 @@
D10973A4336C45EE56319A9B /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
D1A99C0C04795272C12DD9EF /* StructuredGeocoderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StructuredGeocoderViewController.swift; sourceTree = "<group>"; };
D27175E880CA9EEC63374BD4 /* PanoramaServiceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PanoramaServiceController.swift; sourceTree = "<group>"; };
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>"; };
DE91B8EA42AFFCEDA758CE06 /* SDKConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SDKConstants.swift; sourceTree = "<group>"; };
DF1488DDE60393FF03CF8A87 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
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>"; };
E18764F42392A93B39C775AB /* SampleMapStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleMapStyle.swift; sourceTree = "<group>"; };
E5AB6411A9C7E6CEDB98041D /* BasicMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasicMapViewController.swift; sourceTree = "<group>"; };
E8E67F17F84C0169D05D684B /* step3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step3.png; sourceTree = "<group>"; };
Expand All @@ -210,7 +210,7 @@
buildActionMask = 2147483647;
files = (
4EA38ACBC98F34B1F0AF5BDD /* UIKit.framework in Frameworks */,
940EC54ABB85DC452211E8B1 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
4CCB99CE0C86A4B513FC5F87 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -353,20 +353,11 @@
isa = PBXGroup;
children = (
922338CA529F228A03DE6422 /* UIKit.framework */,
5AC932682FDF13726178F857 /* libPods-GoogleMapsSwiftDemos.a */,
789BFE914A0151D5CCC3821A /* libPods-GoogleMapsSwiftDemos.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
C7B46A7BE166DCF839A06842 /* Pods */ = {
isa = PBXGroup;
children = (
DCA6F6BE3A6C1ED62B8A984B /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
D0ED9A279E12177F7FDFA2FF /* Source */ = {
isa = PBXGroup;
children = (
Expand All @@ -381,7 +372,7 @@
D0ED9A279E12177F7FDFA2FF /* Source */,
AC723F443153D968479E59F3 /* Frameworks */,
DD0B6FB690051F4443F4132B /* Products */,
C7B46A7BE166DCF839A06842 /* Pods */,
F1DBFA6CC671B2284D319829 /* Pods */,
);
sourceTree = "<group>";
};
Expand All @@ -393,18 +384,27 @@
name = Products;
sourceTree = "<group>";
};
F1DBFA6CC671B2284D319829 /* Pods */ = {
isa = PBXGroup;
children = (
E01F214444C329C1FB20445D /* Pods-GoogleMapsSwiftDemos.default.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
56AB213E97CDD413D8EDA2B0 /* GoogleMapsSwiftDemos */ = {
isa = PBXNativeTarget;
buildConfigurationList = 65556A7591C40D0E8B77989F /* Build configuration list for PBXNativeTarget "GoogleMapsSwiftDemos" */;
buildPhases = (
F07204C1B9979AFBBADE97D4 /* [CP] Check Pods Manifest.lock */,
4E1DC9F6677285BFA23A8FA6 /* [CP] Check Pods Manifest.lock */,
2ADDADBB329E244AF7ED1FB2 /* Resources */,
22EB17F407E92B9B4F3B601A /* Sources */,
B4530C282FE2BDE3D1071779 /* Frameworks */,
4CFF6811A09B5A0C2F731BF5 /* [CP] Copy Pods Resources */,
5476A60E3B26EAB0DE44E3F6 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -502,48 +502,48 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
4CFF6811A09B5A0C2F731BF5 /* [CP] Copy Pods Resources */ = {
4E1DC9F6677285BFA23A8FA6 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos-resources.sh",
"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle",
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Copy Pods Resources";
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
"$(DERIVED_FILE_DIR)/Pods-GoogleMapsSwiftDemos-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos-resources.sh\"\n";
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";
showEnvVarsInLog = 0;
};
F07204C1B9979AFBBADE97D4 /* [CP] Check Pods Manifest.lock */ = {
5476A60E3B26EAB0DE44E3F6 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos-resources.sh",
"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle",
);
name = "[CP] Check Pods Manifest.lock";
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-GoogleMapsSwiftDemos-checkManifestLockResult.txt",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -612,7 +612,7 @@
};
6798450D013ACAFF39CF0187 /* Default */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = DCA6F6BE3A6C1ED62B8A984B /* Pods-GoogleMapsSwiftDemos.default.xcconfig */;
baseConfigurationReference = E01F214444C329C1FB20445D /* Pods-GoogleMapsSwiftDemos.default.xcconfig */;
buildSettings = {
"ARCHS[sdk=iphonesimulator*]" = x86_64;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
Expand Down
1 change: 1 addition & 0 deletions GoogleMaps-Swift/GoogleMapsSwiftDemos/Swift/Samples/StructuredGeocoderViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ extension StructuredGeocoderViewController: GMSMapViewDelegate {
marker.appearAnimation = .pop
marker.map = mapView
marker.title = address.thoroughfare
mapView.selectedMarker = marker

var snippet = ""
if let subLocality = address.subLocality {
Expand Down
2 changes: 1 addition & 1 deletion GoogleMaps-Swift/Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ source 'https://github.com/CocoaPods/Specs.git'

target 'GoogleMapsSwiftDemos' do
platform :ios, '13.0'
pod 'GoogleMaps', '= 7.1.0'
pod 'GoogleMaps', '= 7.2.0'
end
Loading

0 comments on commit c3fb245

Please sign in to comment.