Merge pull request #15 from rynecheow/master

Update to 3.3.0
leoneparise · Sep 25, 2019 · 976d329 · 976d329
2 parents bf67a66 + 5965027
commit 976d329
Show file tree

Hide file tree

Showing 50 changed files with 217 additions and 73 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,5 @@
+GoogleMaps/GoogleMaps filter=lfs diff=lfs merge=lfs -text
+GoogleMapsBase/GoogleMapsBase filter=lfs diff=lfs merge=lfs -text
+GoogleMapsCore/GoogleMapsCore filter=lfs diff=lfs merge=lfs -text
+GoogleMapsM4B/GoogleMapsM4B filter=lfs diff=lfs merge=lfs -text
+GooglePlaces/GooglePlaces filter=lfs diff=lfs merge=lfs -text
diff --git a/GoogleMaps.xcodeproj/project.pbxproj b/GoogleMaps.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -586,24 +586,24 @@
 		B9EE03981D9D84CC003E7610 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				B9EE03C41D9D8758003E7610 /* Accelerate.framework */,
+				B9EE03AB1D9D8518003E7610 /* CoreData.framework */,
 				6D552E4522378AC500E9367F /* CoreFoundation.framework */,
+				B9EE03A91D9D8511003E7610 /* CoreGraphics.framework */,
 				A76265072037689800DD730E /* CoreImage.framework */,
+				B9EE039B1D9D84D1003E7610 /* CoreLocation.framework */,
 				A72C2FA91F6A88100076B723 /* CoreTelephony.framework */,
-				B9EE03C41D9D8758003E7610 /* Accelerate.framework */,
 				B9EE03B91D9D85E5003E7610 /* CoreText.framework */,
-				B9EE03B71D9D85DD003E7610 /* OpenGLES.framework */,
-				B9EE03B51D9D85D4003E7610 /* ImageIO.framework */,
+				B9EE039D1D9D84D8003E7610 /* Foundation.framework */,
 				B9EE03B31D9D85CD003E7610 /* GLKit.framework */,
-				B9EE03AB1D9D8518003E7610 /* CoreData.framework */,
-				B9EE03A91D9D8511003E7610 /* CoreGraphics.framework */,
+				B9EE03B51D9D85D4003E7610 /* ImageIO.framework */,
+				B9EE03B71D9D85DD003E7610 /* OpenGLES.framework */,
 				B9EE03A71D9D8508003E7610 /* QuartzCore.framework */,
-				B9EE03A51D9D8500003E7610 /* SystemConfiguration.framework */,
 				B9EE03A31D9D84EC003E7610 /* Security.framework */,
-				B9EE03A11D9D84E3003E7610 /* libz.tbd */,
-				B9EE039F1D9D84DE003E7610 /* libc++.tbd */,
-				B9EE039D1D9D84D8003E7610 /* Foundation.framework */,
-				B9EE039B1D9D84D1003E7610 /* CoreLocation.framework */,
+				B9EE03A51D9D8500003E7610 /* SystemConfiguration.framework */,
 				B9EE03991D9D84CC003E7610 /* UIKit.framework */,
+				B9EE039F1D9D84DE003E7610 /* libc++.tbd */,
+				B9EE03A11D9D84E3003E7610 /* libz.tbd */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -850,10 +850,11 @@
 				};
 			};
 			buildConfigurationList = B9EE03671D9D8429003E7610 /* Build configuration list for PBXProject "GoogleMaps" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 10.0";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = B9EE03631D9D8429003E7610;
@@ -967,7 +968,11 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = GooglePlaces/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.GooglePlaces;
@@ -998,12 +1003,17 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = GooglePlaces/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.GooglePlaces;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -1134,7 +1144,11 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = GoogleMaps/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MODULEMAP_FILE = GoogleMaps/Modules/module.modulemap;
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.GoogleMaps;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1153,7 +1167,11 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = GoogleMaps/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MODULEMAP_FILE = GoogleMaps/Modules/module.modulemap;
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.GoogleMaps;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1171,7 +1189,11 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = GoogleMapsBase/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MODULEMAP_FILE = GoogleMapsBase/Modules/module.modulemap;
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.GoogleMapsBase;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1189,7 +1211,11 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = GoogleMapsBase/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MODULEMAP_FILE = GoogleMapsBase/Modules/module.modulemap;
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.GoogleMapsBase;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1208,7 +1234,11 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = GoogleMapsCore/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MODULEMAP_FILE = GoogleMapsCore/Modules/module.modulemap;
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.GoogleMapsCore;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1227,7 +1257,11 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = GoogleMapsCore/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MODULEMAP_FILE = GoogleMapsCore/Modules/module.modulemap;
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.GoogleMapsCore;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1245,7 +1279,11 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = GoogleMapsM4B/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MODULEMAP_FILE = GoogleMapsM4B/Modules/module.modulemap;
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.GoogleMapsM4B;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1263,7 +1301,11 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = GoogleMapsM4B/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MODULEMAP_FILE = GoogleMapsM4B/Modules/module.modulemap;
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.GoogleMapsM4B;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/GoogleMaps/GoogleMaps b/GoogleMaps/GoogleMaps
diff --git a/GoogleMaps/Headers/GMSPolyline.h b/GoogleMaps/Headers/GMSPolyline.h
@@ -11,22 +11,12 @@
 #import <UIKit/UIKit.h>
 
 #import "GMSOverlay.h"
+#import "GMSStrokeStyle.h"
 
 @class GMSPath;
 
 NS_ASSUME_NONNULL_BEGIN
 
-/** Describes the drawing style for one-dimensional entities such as polylines. */
-@interface GMSStrokeStyle : NSObject
-
-/** Creates a solid color stroke style. */
-+ (instancetype)solidColor:(UIColor *)color;
-
-/** Creates a gradient stroke style interpolating from |fromColor| to |toColor|. */
-+ (instancetype)gradientFromColor:(UIColor *)fromColor toColor:(UIColor *)toColor;
-
-@end
-
 /** Describes the style for some region of a polyline. */
 @interface GMSStyleSpan : NSObject
 

diff --git a/GoogleMaps/Headers/GMSServices.h b/GoogleMaps/Headers/GMSServices.h
@@ -62,10 +62,16 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSString *)openSourceLicenseInfo;
 
 /**
- * Returns the version for this release of the Google Maps SDK for iOS.
+ * Returns the version for this release of the Google Maps SDK for iOS. For example, "1.0.0"
  */
 + (NSString *)SDKVersion;
 
+/**
+ * Returns the long version for this release of the Google Maps SDK for iOS. For example, "1.0.0
+ * (102.1)".
+ */
++ (NSString *)SDKLongVersion;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/GoogleMaps/Headers/GMSStrokeStyle.h b/GoogleMaps/Headers/GMSStrokeStyle.h
@@ -0,0 +1,26 @@
+//
+//  GMSStrokeStyle.h
+//  Google Maps SDK for iOS
+//
+//  Copyright 2019 Google Inc.
+//
+//  Usage of this SDK is subject to the Google Maps/Google Earth APIs Terms of
+//  Service: https://developers.google.com/maps/terms
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/** Describes the drawing style for one-dimensional entities such as polylines. */
+@interface GMSStrokeStyle : NSObject
+
+/** Creates a solid color stroke style. */
++ (instancetype)solidColor:(UIColor *)color;
+
+/** Creates a gradient stroke style interpolating from |fromColor| to |toColor|. */
++ (instancetype)gradientFromColor:(UIColor *)fromColor toColor:(UIColor *)toColor;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/GoogleMaps/Headers/GoogleMaps.h b/GoogleMaps/Headers/GoogleMaps.h
@@ -26,6 +26,7 @@
 #import "GMSPolygon.h"
 #import "GMSPolygonLayer.h"
 #import "GMSPolyline.h"
+#import "GMSStrokeStyle.h"
 #import "GMSSyncTileLayer.h"
 #import "GMSTileLayer.h"
 #import "GMSURLTileLayer.h"

diff --git a/GoogleMaps/Info.plist b/GoogleMaps/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.0</string>
+	<string>3.3.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/GoogleMaps/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/Assets.car b/GoogleMaps/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/Assets.car
diff --git a/GoogleMaps/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/Info.plist b/GoogleMaps/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/Info.plist
diff --git a/GoogleMaps/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/de.lproj/GMSCore.strings b/GoogleMaps/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/de.lproj/GMSCore.strings
diff --git a/GoogleMaps/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/hi.lproj/GMSCore.strings b/GoogleMaps/Resources/GoogleMaps.bundle/GMSCoreResources.bundle/hi.lproj/GMSCore.strings
diff --git a/GoogleMaps/Resources/GoogleMaps.bundle/Info.plist b/GoogleMaps/Resources/GoogleMaps.bundle/Info.plist
diff --git a/GoogleMaps/Resources/GoogleMaps.bundle/oss_licenses_maps.txt.gz b/GoogleMaps/Resources/GoogleMaps.bundle/oss_licenses_maps.txt.gz
diff --git a/GoogleMapsBase/GoogleMapsBase b/GoogleMapsBase/GoogleMapsBase
diff --git a/GoogleMapsBase/Info.plist b/GoogleMapsBase/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.0</string>
+	<string>3.3.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>