Swift 5 migration and bump to 3.2 (#33)

Author: mats-claassen

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 All notable changes to GooglePlacesRow will be documented in this file.
 
+### [3.2.0](https://github.com/EurekaCommunity/GooglePlacesRow/releases/tag/3.2.0)
+<!-- Released on 2018-10-08. -->
+
+* Swift 5 migration
+* Upgrade to GooglePlaces 3.3
+
 ### [3.1.0](https://github.com/EurekaCommunity/GooglePlacesRow/releases/tag/3.1.0)
 <!-- Released on 2018-10-08. -->
 

Cartfile

@@ -1 +1 @@
-github "xmartlabs/Eureka" ~> 4.3
+github "xmartlabs/Eureka" ~> 5.0

Cartfile.resolved

@@ -1 +1 @@
-github "xmartlabs/Eureka" "4.0.1"
+github "xmartlabs/Eureka" "5.0.0"

Eureka

@@ -174,17 +174,17 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 				TargetAttributes = {
 					28F828CB1C4B714D00330CF4 = {
 						CreatedOnToolsVersion = 7.2;
-						LastSwiftMigration = 0920;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
 			buildConfigurationList = 28F828C71C4B714D00330CF4 /* Build configuration list for PBXProject "Example" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -301,6 +301,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -343,7 +344,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -355,6 +356,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -391,7 +393,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -404,6 +406,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Frameworks",
@@ -412,8 +415,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -422,6 +424,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Frameworks",
@@ -430,8 +433,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

Example.xcodeproj/project.pbxproj

@@ -3,6 +3,8 @@ framework module GoogleMapsBase {
   export *
   module * { export *}
   link "z"
+  link framework "CoreFoundation"
   link framework "CoreLocation"
   link framework "CoreTelephony"
+  link framework "CoreText"
   link framework "Security"}

Frameworks/GoogleMapsBase.framework/GoogleMapsBase

@@ -19,14 +19,17 @@ NS_ASSUME_NONNULL_BEGIN;
 
 /**
  * Type of the address component. For a list of supported types, see
- * https://developers.google.com/places/ios-api/supported_types#table2. This string will be one
+ * https://developers.google.com/places/ios-sdk/supported_types#table2. This string will be one
  * of the constants defined in GMSPlaceTypes.h.
  */
 @property(nonatomic, readonly, copy) NSString *type;
 
 /** Name of the address component, e.g. "Sydney" */
 @property(nonatomic, readonly, copy) NSString *name;
 
+/** Short name of the address component, e.g. "AU" */
+@property(nonatomic, readonly, copy) NSString *_Nullable shortName;
+
 @end
 
 NS_ASSUME_NONNULL_END;

Frameworks/GoogleMapsBase.framework/Modules/module.modulemap

@@ -17,6 +17,7 @@
 #import "GMSAutocompleteFilter.h"
 
 @class GMSAutocompletePrediction;
+@class GMSAutocompleteSessionToken;
 
 NS_ASSUME_NONNULL_BEGIN;
 
@@ -84,6 +85,11 @@ NS_ASSUME_NONNULL_BEGIN;
 /** Filter to apply to autocomplete suggestions (can be nil). */
 @property(nonatomic, strong, nullable) GMSAutocompleteFilter *autocompleteFilter;
 
+/**
+ * Provide a |GMSAutocompleteSessionToken| for tracking the specific autocomplete query flow.
+ */
+- (void)provideSessionToken:(GMSAutocompleteSessionToken *)sessionToken;
+
 /**
  * Notify the fetcher that the source text to autocomplete has changed.
  *

Frameworks/GooglePlaces.framework/GooglePlaces

@@ -9,14 +9,25 @@
 //
 
 
+#import <Foundation/Foundation.h>
+
 NS_ASSUME_NONNULL_BEGIN;
 
+#if defined(__IPHONE_11_0) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_11_0)
+/**
+ * Attribute name for match fragments in |GMSAutocompletePrediction| attributedFullText.
+ *
+ * @related GMSAutocompletePrediction
+ */
+extern NSAttributedStringKey const kGMSAutocompleteMatchAttribute;
+#else
 /**
  * Attribute name for match fragments in |GMSAutocompletePrediction| attributedFullText.
  *
  * @related GMSAutocompletePrediction
  */
 extern NSString *const kGMSAutocompleteMatchAttribute;
+#endif
 
 /**
  * This class represents a prediction of a full query based on a partially typed string.
@@ -68,14 +79,14 @@ extern NSString *const kGMSAutocompleteMatchAttribute;
 @property(nonatomic, copy, readonly, nullable) NSAttributedString *attributedSecondaryText;
 
 /**
- * An optional property representing the place ID of the prediction, suitable for use in a place
- * details request.
+ * A property representing the place ID of the prediction, suitable for use in a place details
+ * request.
  */
-@property(nonatomic, copy, readonly, nullable) NSString *placeID;
+@property(nonatomic, copy, readonly) NSString *placeID;
 
 /**
  * The types of this autocomplete result.  Types are NSStrings, valid values are any types
- * documented at <https://developers.google.com/places/ios-api/supported_types>.
+ * documented at <https://developers.google.com/places/ios-sdk/supported_types>.
  */
 @property(nonatomic, copy, readonly) NSArray<NSString *> *types;
 

Frameworks/GooglePlaces.framework/Headers/GMSAddressComponent.h

@@ -19,11 +19,12 @@
 #import "GMSAutocompleteFilter.h"
 #import "GMSAutocompletePrediction.h"
 #import "GMSPlace.h"
-
-NS_ASSUME_NONNULL_BEGIN;
+#import "GMSPlaceFieldMask.h"
 
 @class GMSAutocompleteResultsViewController;
 
+NS_ASSUME_NONNULL_BEGIN;
+
 /**
  * Protocol used by |GMSAutocompleteResultsViewController|, to communicate the user's interaction
  * with the controller to the application.
@@ -138,6 +139,12 @@ NS_ASSUME_NONNULL_BEGIN;
 /** The tint color applied to controls in the Autocomplete view. */
 @property(nonatomic, strong, nullable) IBInspectable UIColor *tintColor;
 
+/**
+ * Specify individual place details to fetch for object |GMSPlace|.
+ * Defaults to returning all details if not overidden.
+ */
+@property(nonatomic, assign) GMSPlaceField placeFields;
+
 @end
 
 NS_ASSUME_NONNULL_END;

Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteFetcher.h

@@ -0,0 +1,23 @@
+//
+//  GMSAutocompleteSessionToken.h
+//  Google Places API for iOS
+//
+//  Copyright 2018 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 <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN;
+
+/**
+ * This class represents an session token to uniquely identify an series of queries to the Google
+ * Places API Services for fetching place predictions for a partial search string.
+ */
+@interface GMSAutocompleteSessionToken : NSObject
+@end
+
+NS_ASSUME_NONNULL_END;

Frameworks/GooglePlaces.framework/Headers/GMSAutocompletePrediction.h

@@ -19,11 +19,12 @@
 #import "GMSAutocompleteFilter.h"
 #import "GMSAutocompletePrediction.h"
 #import "GMSPlace.h"
-
-NS_ASSUME_NONNULL_BEGIN;
+#import "GMSPlaceFieldMask.h"
 
 @class GMSAutocompleteTableDataSource;
 
+NS_ASSUME_NONNULL_BEGIN;
+
 /**
  * Protocol used by |GMSAutocompleteTableDataSource|, to communicate the user's interaction with the
  * data source to the application.
@@ -147,6 +148,12 @@ NS_ASSUME_NONNULL_BEGIN;
 /** The tint color applied to controls in the Autocomplete view. */
 @property(nonatomic, strong, nullable) UIColor *tintColor;
 
+/**
+ * The |GMSPlaceField| for specifying explicit place details to be requested. Default returns
+ * all avilable fields.
+ */
+@property(nonatomic, assign) GMSPlaceField placeFields;
+
 /** Designated initializer */
 - (instancetype)init NS_DESIGNATED_INITIALIZER;
 
@@ -162,6 +169,18 @@ NS_ASSUME_NONNULL_BEGIN;
  */
 - (void)sourceTextHasChanged:(nullable NSString *)text;
 
+/**
+ * Clear all predictions.
+ *
+ *  NOTE: This will call the two delegate methods below:
+ *
+ *  - |didUpdateAutocompletePredictionsForResultsController:|
+ *  - |didRequestAutocompletePredictionsForResultsController:|
+ *
+ *  The implementation of this method is guaranteed to call these synchronously and in-order.
+ */
+- (void)clearResults;
+
 @end
 
 NS_ASSUME_NONNULL_END;

Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteResultsViewController.h

@@ -19,11 +19,12 @@
 #import "GMSAutocompleteFilter.h"
 #import "GMSAutocompletePrediction.h"
 #import "GMSPlace.h"
-
-NS_ASSUME_NONNULL_BEGIN;
+#import "GMSPlaceFieldMask.h"
 
 @class GMSAutocompleteViewController;
 
+NS_ASSUME_NONNULL_BEGIN;
+
 /**
  * Protocol used by |GMSAutocompleteViewController|, to communicate the user's interaction
  * with the controller to the application.
@@ -153,6 +154,12 @@ NS_ASSUME_NONNULL_BEGIN;
 /** The tint color applied to controls in the Autocomplete view. */
 @property(nonatomic, strong, nullable) IBInspectable UIColor *tintColor;
 
+/**
+ * Specify individual place details to fetch for object |GMSPlace|.
+ * Defaults to returning all details if not overidden.
+ */
+@property(nonatomic, assign) GMSPlaceField placeFields;
+
 @end
 
 NS_ASSUME_NONNULL_END;