Merge pull request #14 from EurekaCommunity/placesUpdate

Update GooglePlaces to 2.2

CHANGELOG.md

@@ -5,6 +5,7 @@ All notable changes to GooglePlacesRow will be documented in this file.
 <!-- Released on 2017-04-26. -->
 
 * Added Eureka 3.0.0 support
+* Support for GooglePlaces 2.2
 
 ### [2.0.0](https://github.com/EurekaCommunity/GooglePlacesRow/releases/tag/2.0.0)
 

Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GMSCompatabilityMacros.h

@@ -10,34 +10,8 @@
 
 #import <Foundation/Foundation.h>
 
-#if !__has_feature(nullability) || !defined(NS_ASSUME_NONNULL_BEGIN) || \
-    !defined(NS_ASSUME_NONNULL_END)
-#define GMS_ASSUME_NONNULL_BEGIN
-#define GMS_ASSUME_NONNULL_END
-#define GMS_NULLABLE
-#define GMS_NULLABLE_PTR
-#define GMS_NULLABLE_INSTANCETYPE instancetype
+#if defined(SWIFT_SDK_OVERLAY_UIKIT_EPOCH)
+#define GMS_SWIFT_NAME_2_0_3_0(name_swift_2, name_swift_3) NS_SWIFT_NAME(name_swift_3)
 #else
-#define GMS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
-#define GMS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
-#define GMS_NULLABLE nullable
-#define GMS_NULLABLE_PTR __nullable
-#define GMS_NULLABLE_INSTANCETYPE nullable instancetype
-#endif
-
-#if __has_feature(objc_generics) && defined(__IPHONE_9_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0
-#define GMS_DECLARE_GENERICS 1
-#else
-#define GMS_DECLARE_GENERICS 0
-#endif
-
-#if GMS_DECLARE_GENERICS
-#define GMS_NSArrayOf(value) NSArray<value>
-#define GMS_NSDictionaryOf(key, value) NSDictionary<key, value>
-#define GMS_NSSetOf(value) NSSet<value>
-#else
-#define GMS_NSArrayOf(value) NSArray
-#define GMS_NSDictionaryOf(key, value) NSDictionary
-#define GMS_NSSetOf(value) NSSet
+#define GMS_SWIFT_NAME_2_0_3_0(name_swift_2, name_swift_3) NS_SWIFT_NAME(name_swift_2)
 #endif

Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GMSCoordinateBounds.h

@@ -10,14 +10,11 @@
 
 #import <CoreLocation/CoreLocation.h>
 
-#import <GoogleMapsBase/GMSCompatabilityMacros.h>
-
-GMS_ASSUME_NONNULL_BEGIN
+NS_ASSUME_NONNULL_BEGIN
 
 /**
- * GMSCoordinateBounds represents a rectangular bounding box on the Earth's
- * surface. GMSCoordinateBounds is immutable and can't be modified after
- * construction.
+ * GMSCoordinateBounds represents a rectangular bounding box on the Earth's surface.
+ * GMSCoordinateBounds is immutable and can't be modified after construction.
  */
 @interface GMSCoordinateBounds : NSObject
 
@@ -28,55 +25,51 @@ GMS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, readonly) CLLocationCoordinate2D southWest;
 
 /**
- * Returns NO if this bounds does not contain any points.
- * For example, [[GMSCoordinateBounds alloc] init].valid == NO.
- * When an invalid bounds is expanded with valid coordinates via
- * includingCoordinate: or includingBounds:, the resulting bounds will be valid
- * but contain only the new coordinates.
+ * Returns NO if this bounds does not contain any points. For example,
+ * [[GMSCoordinateBounds alloc] init].valid == NO.
+ *
+ * When an invalid bounds is expanded with valid coordinates via includingCoordinate: or
+ * includingBounds:, the resulting bounds will be valid but contain only the new coordinates.
  */
 @property(readonly, getter=isValid) BOOL valid;
 
 /**
- * Inits the northEast and southWest bounds corresponding
- * to the rectangular region defined by the two corners.
+ * Inits the northEast and southWest bounds corresponding to the rectangular region defined by the
+ * two corners.
  *
- * It is ambiguous whether the longitude of the box
- * extends from |coord1| to |coord2| or vice-versa;
- * the box is constructed as the smaller of the two variants, eliminating the
- * ambiguity.
+ * It is ambiguous whether the longitude of the box extends from |coord1| to |coord2| or vice-versa;
+ * the box is constructed as the smaller of the two variants, eliminating the ambiguity.
  */
-- (id)initWithCoordinate:(CLLocationCoordinate2D)coord1
-              coordinate:(CLLocationCoordinate2D)coord2;
+- (id)initWithCoordinate:(CLLocationCoordinate2D)coord1 coordinate:(CLLocationCoordinate2D)coord2;
 
 /**
- * Returns a GMSCoordinateBounds representing
- * the current bounds extended to include the passed-in coordinate.
- * If the current bounds is invalid, the result is a valid bounds containing
- * only |coordinate|.
+ * Returns a GMSCoordinateBounds representing the current bounds extended to include the passed-in
+ * coordinate.
+ *
+ * If the current bounds is invalid, the result is a valid bounds containing only |coordinate|.
  */
 - (GMSCoordinateBounds *)includingCoordinate:(CLLocationCoordinate2D)coordinate;
 
 /**
- * Returns a GMSCoordinateBounds representing
- * the current bounds extended to include the entire other bounds.
- * If the current bounds is invalid, the result is a valid bounds equal
- * to |other|.
+ * Returns a GMSCoordinateBounds representing the current bounds extended to include the entire
+ * other bounds.
+ *
+ * If the current bounds is invalid, the result is a valid bounds equal to |other|.
  */
 - (GMSCoordinateBounds *)includingBounds:(GMSCoordinateBounds *)other;
 
 /**
- * Returns YES if |coordinate| is contained within this bounds. This includes
- * points that lie exactly on the edge of the bounds.
+ * Returns YES if |coordinate| is contained within this bounds. This includes points that lie
+ * exactly on the edge of the bounds.
  */
 - (BOOL)containsCoordinate:(CLLocationCoordinate2D)coordinate;
 
 /**
- * Returns YES if |other| overlaps with this bounds.
- * Two bounds are overlapping if there is at least one coordinate point
- * contained by both.
+ * Returns YES if |other| overlaps with this bounds. Two bounds are overlapping if there is at least
+ * one coordinate point contained by both.
  */
 - (BOOL)intersectsBounds:(GMSCoordinateBounds *)other;
 
 @end
 
-GMS_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAddressComponent.h

@@ -8,13 +8,9 @@
 //  Service: https://developers.google.com/maps/terms
 //
 
-#if __has_feature(modules)
-@import GoogleMapsBase;
-#else
-#import <GoogleMapsBase/GoogleMapsBase.h>
-#endif
+#import <Foundation/Foundation.h>
 
-GMS_ASSUME_NONNULL_BEGIN
+NS_ASSUME_NONNULL_BEGIN
 
 /**
  * Represents a component of an address, e.g., street number, postcode, city, etc.
@@ -23,8 +19,8 @@ GMS_ASSUME_NONNULL_BEGIN
 
 /**
  * Type of the address component. For a list of supported types, see
- * https://developers.google.com/places/supported_types#table2. This string will be one of the
- * constants defined in GMSPlaceTypes.h.
+ * https://developers.google.com/places/ios-api/supported_types#table2. This string will be one
+ * of the constants defined in GMSPlaceTypes.h.
  */
 @property(nonatomic, readonly, copy) NSString *type;
 
@@ -33,4 +29,4 @@ GMS_ASSUME_NONNULL_BEGIN
 
 @end
 
-GMS_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteFetcher.h

@@ -8,11 +8,6 @@
 //  Service: https://developers.google.com/maps/terms
 //
 
-#if __has_feature(modules)
-@import GoogleMapsBase;
-#else
-#import <GoogleMapsBase/GoogleMapsBase.h>
-#endif
 #if __has_feature(modules)
 @import GoogleMapsBase;
 #else
@@ -22,7 +17,7 @@
 
 @class GMSAutocompletePrediction;
 
-GMS_ASSUME_NONNULL_BEGIN
+NS_ASSUME_NONNULL_BEGIN
 
 /**
  * Protocol for objects that can receive callbacks from GMSAutocompleteFetcher
@@ -35,7 +30,7 @@ GMS_ASSUME_NONNULL_BEGIN
  * Called when autocomplete predictions are available.
  * @param predictions an array of GMSAutocompletePrediction objects.
  */
-- (void)didAutocompleteWithPredictions:(GMS_NSArrayOf(GMSAutocompletePrediction *) *)predictions;
+- (void)didAutocompleteWithPredictions:(NSArray<GMSAutocompletePrediction *> *)predictions;
 
 /**
  * Called when an autocomplete request returns an error.
@@ -64,18 +59,18 @@ GMS_ASSUME_NONNULL_BEGIN
  *               be returned outside of these bounds. This parameter may be nil.
  * @param filter The filter to apply to the results. This parameter may be nil.
  */
-- (instancetype)initWithBounds:(GMSCoordinateBounds *GMS_NULLABLE_PTR)bounds
-                        filter:(GMSAutocompleteFilter *GMS_NULLABLE_PTR)filter
+- (instancetype)initWithBounds:(nullable GMSCoordinateBounds *)bounds
+                        filter:(nullable GMSAutocompleteFilter *)filter
     NS_DESIGNATED_INITIALIZER;
 
 /** Delegate to be notified with autocomplete prediction results. */
-@property(nonatomic, weak) id<GMSAutocompleteFetcherDelegate> GMS_NULLABLE_PTR delegate;
+@property(nonatomic, weak, nullable) id<GMSAutocompleteFetcherDelegate> delegate;
 
 /** Bounds used to bias the autocomplete search (can be nil). */
-@property(nonatomic, strong) GMSCoordinateBounds *GMS_NULLABLE_PTR autocompleteBounds;
+@property(nonatomic, strong, nullable) GMSCoordinateBounds *autocompleteBounds;
 
 /** Filter to apply to autocomplete suggestions (can be nil). */
-@property(nonatomic, strong) GMSAutocompleteFilter *GMS_NULLABLE_PTR autocompleteFilter;
+@property(nonatomic, strong, nullable) GMSAutocompleteFilter *autocompleteFilter;
 
 /**
  * Notify the fetcher that the source text to autocomplete has changed.
@@ -87,8 +82,8 @@ GMS_ASSUME_NONNULL_BEGIN
  * This method is non-blocking.
  * @param text The partial text to autocomplete.
  */
-- (void)sourceTextHasChanged:(NSString *GMS_NULLABLE_PTR)text;
+- (void)sourceTextHasChanged:(nullable NSString *)text;
 
 @end
 
-GMS_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteFilter.h

@@ -8,13 +8,9 @@
 //  Service: https://developers.google.com/maps/terms
 //
 
-#if __has_feature(modules)
-@import GoogleMapsBase;
-#else
-#import <GoogleMapsBase/GoogleMapsBase.h>
-#endif
+#import <Foundation/Foundation.h>
 
-GMS_ASSUME_NONNULL_BEGIN
+NS_ASSUME_NONNULL_BEGIN
 
 /**
  * The type filters that may be applied to an autocomplete request to restrict results to different
@@ -71,8 +67,8 @@ typedef NS_ENUM(NSInteger, GMSPlacesAutocompleteTypeFilter) {
  * The country to restrict results to. This should be a ISO 3166-1 Alpha-2 country code (case
  * insensitive). If nil, no country filtering will take place.
  */
-@property(nonatomic, copy) NSString *GMS_NULLABLE_PTR country;
+@property(nonatomic, copy, nullable) NSString *country;
 
 @end
 
-GMS_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteMatchFragment.h

@@ -9,13 +9,9 @@
 //
 
 
-#if __has_feature(modules)
-@import GoogleMapsBase;
-#else
-#import <GoogleMapsBase/GoogleMapsBase.h>
-#endif
+#import <Foundation/Foundation.h>
 
-GMS_ASSUME_NONNULL_BEGIN
+NS_ASSUME_NONNULL_BEGIN
 
 /**
  * This class represents a matched fragment of a string. This is a contiguous range of characters
@@ -36,4 +32,4 @@ GMS_ASSUME_NONNULL_BEGIN
 
 @end
 
-GMS_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompletePrediction.h

@@ -9,13 +9,7 @@
 //
 
 
-#if __has_feature(modules)
-@import GoogleMapsBase;
-#else
-#import <GoogleMapsBase/GoogleMapsBase.h>
-#endif
-
-GMS_ASSUME_NONNULL_BEGIN
+NS_ASSUME_NONNULL_BEGIN
 
 /*
  * Attribute name for match fragments in |GMSAutocompletePrediction| attributedFullText.
@@ -69,20 +63,20 @@ extern NSString *const kGMSAutocompleteMatchAttribute;
  *
  * May be nil.
  */
-@property(nonatomic, copy, readonly) NSAttributedString *GMS_NULLABLE_PTR attributedSecondaryText;
+@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.
  */
-@property(nonatomic, copy, readonly) NSString *GMS_NULLABLE_PTR placeID;
+@property(nonatomic, copy, readonly, nullable) NSString *placeID;
 
 /**
  * The types of this autocomplete result.  Types are NSStrings, valid values are any types
- * documented at <https://developers.google.com/places/supported_types>.
+ * documented at <https://developers.google.com/places/ios-api/supported_types>.
  */
-@property(nonatomic, copy, readonly) GMS_NSArrayOf(NSString *) *types;
+@property(nonatomic, copy, readonly) NSArray<NSString *> *types;
 
 @end
 
-GMS_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteResultsViewController.h

@@ -10,11 +10,6 @@
 
 #import <UIKit/UIKit.h>
 
-#if __has_feature(modules)
-@import GoogleMapsBase;
-#else
-#import <GoogleMapsBase/GoogleMapsBase.h>
-#endif
 #if __has_feature(modules)
 @import GoogleMapsBase;
 #else
@@ -24,7 +19,7 @@
 #import <GooglePlaces/GMSAutocompletePrediction.h>
 #import <GooglePlaces/GMSPlace.h>
 
-GMS_ASSUME_NONNULL_BEGIN
+NS_ASSUME_NONNULL_BEGIN
 
 @class GMSAutocompleteResultsViewController;
 
@@ -108,14 +103,13 @@ GMS_ASSUME_NONNULL_BEGIN
     UISearchResultsUpdating>
 
 /** Delegate to be notified when a place is selected. */
-@property(nonatomic, weak)
-    id<GMSAutocompleteResultsViewControllerDelegate> GMS_NULLABLE_PTR delegate;
+@property(nonatomic, weak, nullable) id<GMSAutocompleteResultsViewControllerDelegate> delegate;
 
 /** Bounds used to bias the autocomplete search (can be nil). */
-@property(nonatomic, strong) GMSCoordinateBounds *GMS_NULLABLE_PTR autocompleteBounds;
+@property(nonatomic, strong, nullable) GMSCoordinateBounds *autocompleteBounds;
 
 /** Filter to apply to autocomplete suggestions (can be nil). */
-@property(nonatomic, strong) GMSAutocompleteFilter *GMS_NULLABLE_PTR autocompleteFilter;
+@property(nonatomic, strong, nullable) GMSAutocompleteFilter *autocompleteFilter;
 
 /** The background color of table cells. */
 @property(nonatomic, strong) IBInspectable UIColor *tableCellBackgroundColor;
@@ -133,8 +127,8 @@ GMS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, strong) IBInspectable UIColor *secondaryTextColor;
 
 /** The tint color applied to controls in the Autocomplete view. */
-@property(nonatomic, strong) IBInspectable UIColor *GMS_NULLABLE_PTR tintColor;
+@property(nonatomic, strong, nullable) IBInspectable UIColor *tintColor;
 
 @end
 
-GMS_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END