diff --git a/CHANGELOG.md b/CHANGELOG.md index d807b3b..c269630 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to GooglePlacesRow will be documented in this file. * Added Eureka 3.0.0 support +* Support for GooglePlaces 2.2 ### [2.0.0](https://github.com/EurekaCommunity/GooglePlacesRow/releases/tag/2.0.0) diff --git a/Frameworks/GoogleMapsBase.framework/Resources b/Frameworks/GoogleMapsBase.framework/Resources deleted file mode 120000 index 953ee36..0000000 --- a/Frameworks/GoogleMapsBase.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/Frameworks/GoogleMapsBase.framework/Versions/A/GoogleMapsBase b/Frameworks/GoogleMapsBase.framework/Versions/A/GoogleMapsBase old mode 100644 new mode 100755 index b825240..eeee42c Binary files a/Frameworks/GoogleMapsBase.framework/Versions/A/GoogleMapsBase and b/Frameworks/GoogleMapsBase.framework/Versions/A/GoogleMapsBase differ diff --git a/Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GMSCompatabilityMacros.h b/Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GMSCompatabilityMacros.h old mode 100644 new mode 100755 index 2deea17..786586a --- a/Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GMSCompatabilityMacros.h +++ b/Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GMSCompatabilityMacros.h @@ -10,34 +10,8 @@ #import -#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 -#define GMS_NSDictionaryOf(key, value) NSDictionary -#define GMS_NSSetOf(value) NSSet -#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 diff --git a/Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GMSCoordinateBounds.h b/Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GMSCoordinateBounds.h old mode 100644 new mode 100755 index 4db7511..dbc4bd6 --- a/Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GMSCoordinateBounds.h +++ b/Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GMSCoordinateBounds.h @@ -10,14 +10,11 @@ #import -#import - -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 diff --git a/Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GoogleMapsBase.h b/Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GoogleMapsBase.h old mode 100644 new mode 100755 diff --git a/Frameworks/GoogleMapsBase.framework/Versions/A/Modules/module.modulemap b/Frameworks/GoogleMapsBase.framework/Versions/A/Modules/module.modulemap old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/GooglePlaces b/Frameworks/GooglePlaces.framework/Versions/A/GooglePlaces old mode 100644 new mode 100755 index 714d127..69753b1 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/GooglePlaces and b/Frameworks/GooglePlaces.framework/Versions/A/GooglePlaces differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAddressComponent.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAddressComponent.h old mode 100644 new mode 100755 index d0dc2e9..d115437 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAddressComponent.h +++ b/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 -#endif +#import -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 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteFetcher.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteFetcher.h old mode 100644 new mode 100755 index 8097873..fb21045 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteFetcher.h +++ b/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 -#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 *)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 GMS_NULLABLE_PTR delegate; +@property(nonatomic, weak, nullable) id 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 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteFilter.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteFilter.h old mode 100644 new mode 100755 index 4425135..f28972c --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteFilter.h +++ b/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 -#endif +#import -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 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteMatchFragment.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteMatchFragment.h old mode 100644 new mode 100755 index bc77959..fdc1b50 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteMatchFragment.h +++ b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteMatchFragment.h @@ -9,13 +9,9 @@ // -#if __has_feature(modules) -@import GoogleMapsBase; -#else -#import -#endif +#import -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 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompletePrediction.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompletePrediction.h old mode 100644 new mode 100755 index 55fe373..26fd692 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompletePrediction.h +++ b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompletePrediction.h @@ -9,13 +9,7 @@ // -#if __has_feature(modules) -@import GoogleMapsBase; -#else -#import -#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 . + * documented at . */ -@property(nonatomic, copy, readonly) GMS_NSArrayOf(NSString *) *types; +@property(nonatomic, copy, readonly) NSArray *types; @end -GMS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteResultsViewController.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteResultsViewController.h old mode 100644 new mode 100755 index cf89e5f..f4de38b --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteResultsViewController.h +++ b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteResultsViewController.h @@ -10,11 +10,6 @@ #import -#if __has_feature(modules) -@import GoogleMapsBase; -#else -#import -#endif #if __has_feature(modules) @import GoogleMapsBase; #else @@ -24,7 +19,7 @@ #import #import -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 GMS_NULLABLE_PTR delegate; +@property(nonatomic, weak, nullable) id 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 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteTableDataSource.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteTableDataSource.h old mode 100644 new mode 100755 index 4ddd5fa..ce96d66 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteTableDataSource.h +++ b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteTableDataSource.h @@ -10,11 +10,6 @@ #import -#if __has_feature(modules) -@import GoogleMapsBase; -#else -#import -#endif #if __has_feature(modules) @import GoogleMapsBase; #else @@ -24,7 +19,7 @@ #import #import -GMS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN @class GMSAutocompleteTableDataSource; @@ -117,14 +112,13 @@ GMS_ASSUME_NONNULL_BEGIN UITableViewDataSource, UITableViewDelegate> /** Delegate to be notified when a place is selected or picking is cancelled. */ -@property(nonatomic, weak) - IBOutlet id GMS_NULLABLE_PTR delegate; +@property(nonatomic, weak, nullable) IBOutlet id 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) UIColor *tableCellBackgroundColor; @@ -142,7 +136,7 @@ GMS_ASSUME_NONNULL_BEGIN @property(nonatomic, strong) UIColor *secondaryTextColor; /** The tint color applied to controls in the Autocomplete view. */ -@property(nonatomic, strong) UIColor *GMS_NULLABLE_PTR tintColor; +@property(nonatomic, strong, nullable) UIColor *tintColor; /** Designated initializer */ - (instancetype)init NS_DESIGNATED_INITIALIZER; @@ -157,8 +151,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 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteViewController.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteViewController.h old mode 100644 new mode 100755 index 3ebd960..f7b7eb9 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteViewController.h +++ b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteViewController.h @@ -10,11 +10,6 @@ #import -#if __has_feature(modules) -@import GoogleMapsBase; -#else -#import -#endif #if __has_feature(modules) @import GoogleMapsBase; #else @@ -24,7 +19,7 @@ #import #import -GMS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN @class GMSAutocompleteViewController; @@ -78,7 +73,7 @@ GMS_ASSUME_NONNULL_BEGIN * @param prediction The |GMSAutocompletePrediction| that was selected. */ - (BOOL)viewController:(GMSAutocompleteViewController *)viewController - didSelectPrediction:(GMSAutocompletePrediction *)prediction; + didSelectPrediction:(GMSAutocompletePrediction *)prediction; /** * Called once every time new autocomplete predictions are received. @@ -108,14 +103,13 @@ GMS_ASSUME_NONNULL_BEGIN @interface GMSAutocompleteViewController : UIViewController /** Delegate to be notified when a place is selected or picking is cancelled. */ -@property(nonatomic, weak) - IBOutlet id GMS_NULLABLE_PTR delegate; +@property(nonatomic, weak, nullable) IBOutlet id 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 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlace.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlace.h old mode 100644 new mode 100755 index 86834a0..35881bc --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlace.h +++ b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlace.h @@ -10,13 +10,7 @@ #import -#if __has_feature(modules) -@import GoogleMapsBase; -#else -#import -#endif - -GMS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN @class GMSAddressComponent; @class GMSCoordinateBounds; @@ -70,12 +64,12 @@ typedef NS_ENUM(NSInteger, GMSPlacesPriceLevel) { * Phone number of this place, in international format, i.e. including the country code prefixed * with "+". For example, Google Sydney's phone number is "+61 2 9374 4000". */ -@property(nonatomic, copy, readonly) NSString *GMS_NULLABLE_PTR phoneNumber; +@property(nonatomic, copy, readonly, nullable) NSString *phoneNumber; /** * Address of the place as a simple string. */ -@property(nonatomic, copy, readonly) NSString *GMS_NULLABLE_PTR formattedAddress; +@property(nonatomic, copy, readonly, nullable) NSString *formattedAddress; /** * Five-star rating for this place based on user reviews. @@ -95,12 +89,12 @@ typedef NS_ENUM(NSInteger, GMSPlacesPriceLevel) { /** * The types of this place. Types are NSStrings, valid values are any types documented at - * . + * . */ -@property(nonatomic, copy, readonly) GMS_NSArrayOf(NSString *) *types; +@property(nonatomic, copy, readonly) NSArray *types; /** Website for this place. */ -@property(nonatomic, copy, readonly) NSURL *GMS_NULLABLE_PTR website; +@property(nonatomic, copy, readonly, nullable) NSURL *website; /** * The data provider attribution string for this place. @@ -111,7 +105,7 @@ typedef NS_ENUM(NSInteger, GMSPlacesPriceLevel) { * In general, these must be shown to the user if data from this GMSPlace is shown, as described in * the Places API Terms of Service. */ -@property(nonatomic, copy, readonly) NSAttributedString *GMS_NULLABLE_PTR attributions; +@property(nonatomic, copy, readonly, nullable) NSAttributedString *attributions; /** * The recommended viewport for this place. May be nil if the size of the place is not known. @@ -120,7 +114,7 @@ typedef NS_ENUM(NSInteger, GMSPlacesPriceLevel) { * |GMSPlace| object representing a store may have a relatively small viewport, while a |GMSPlace| * object representing a country may have a very large viewport. */ -@property(nonatomic, strong, readonly) GMSCoordinateBounds *GMS_NULLABLE_PTR viewport; +@property(nonatomic, strong, readonly, nullable) GMSCoordinateBounds *viewport; /** * An array of |GMSAddressComponent| objects representing the components in the place's address. @@ -130,9 +124,8 @@ typedef NS_ENUM(NSInteger, GMSPlacesPriceLevel) { * These components should not be used for address formatting. If a formatted address is required, * use the |formattedAddress| property, which provides a localized formatted address. */ -@property(nonatomic, copy, readonly) - GMS_NSArrayOf(GMSAddressComponent *) *GMS_NULLABLE_PTR addressComponents; +@property(nonatomic, copy, readonly, nullable) NSArray *addressComponents; @end -GMS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceLikelihood.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceLikelihood.h old mode 100644 new mode 100755 index 79a923a..632705c --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceLikelihood.h +++ b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceLikelihood.h @@ -9,13 +9,9 @@ // -#if __has_feature(modules) -@import GoogleMapsBase; -#else -#import -#endif +#import -GMS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN @class GMSPlace; @@ -42,4 +38,4 @@ GMS_ASSUME_NONNULL_BEGIN @end -GMS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceLikelihoodList.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceLikelihoodList.h old mode 100644 new mode 100755 index 891223b..1364fe1 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceLikelihoodList.h +++ b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceLikelihoodList.h @@ -8,13 +8,9 @@ // Service: https://developers.google.com/maps/terms // -#if __has_feature(modules) -@import GoogleMapsBase; -#else -#import -#endif +#import -GMS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN @class GMSPlaceLikelihood; @@ -27,8 +23,8 @@ GMS_ASSUME_NONNULL_BEGIN */ @interface GMSPlaceLikelihoodList : NSObject -/** An array of |GMSPlaceLikelihood|s containing the likelihoods in the list. */ -@property(nonatomic, copy) GMS_NSArrayOf(GMSPlaceLikelihood *) * likelihoods; +/** An array of likelihoods, sorted in descending order. */ +@property(nonatomic, copy) NSArray *likelihoods; /** * The data provider attribution strings for the likelihood list. @@ -39,8 +35,8 @@ GMS_ASSUME_NONNULL_BEGIN * In general, these must be shown to the user if data from this likelihood list is shown, as * described in the Places API Terms of Service. */ -@property(nonatomic, copy, readonly) NSAttributedString *GMS_NULLABLE_PTR attributions; +@property(nonatomic, copy, readonly, nullable) NSAttributedString *attributions; @end -GMS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacePhotoMetadata.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacePhotoMetadata.h old mode 100644 new mode 100755 index de05af2..da29fdf --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacePhotoMetadata.h +++ b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacePhotoMetadata.h @@ -10,13 +10,7 @@ #import -#if __has_feature(modules) -@import GoogleMapsBase; -#else -#import -#endif - -GMS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /** * The metadata corresponding to a single photo associated with a place. @@ -32,7 +26,7 @@ GMS_ASSUME_NONNULL_BEGIN * In general, these must be shown to the user if data from this GMSPlacePhotoMetadata is shown, as * described in the Places API Terms of Service. */ -@property(nonatomic, readonly, copy) NSAttributedString* GMS_NULLABLE_PTR attributions; +@property(nonatomic, readonly, copy, nullable) NSAttributedString *attributions; /** * The maximum pixel size in which this photo is available. @@ -41,4 +35,4 @@ GMS_ASSUME_NONNULL_BEGIN @end -GMS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacePhotoMetadataList.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacePhotoMetadataList.h old mode 100644 new mode 100755 index e913f6f..206b3a0 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacePhotoMetadataList.h +++ b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacePhotoMetadataList.h @@ -10,14 +10,9 @@ #import -#if __has_feature(modules) -@import GoogleMapsBase; -#else -#import -#endif #import -GMS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /** * A list of |GMSPlacePhotoMetadata| objects. @@ -27,8 +22,8 @@ GMS_ASSUME_NONNULL_BEGIN /** * The array of |GMSPlacePhotoMetadata| objects. */ -@property(nonatomic, readonly, copy) GMS_NSArrayOf(GMSPlacePhotoMetadata *) * results; +@property(nonatomic, readonly, copy) NSArray *results; @end -GMS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceTypes.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceTypes.h old mode 100644 new mode 100755 index acbceee..f72a83b --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceTypes.h +++ b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceTypes.h @@ -8,6 +8,8 @@ // Service: https://developers.google.com/maps/terms // +#import + extern NSString *const kGMSPlaceTypeAccounting; diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacesClient.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacesClient.h old mode 100644 new mode 100755 index e2c2cc4..3706885 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacesClient.h +++ b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacesClient.h @@ -9,12 +9,8 @@ // #import +#import -#if __has_feature(modules) -@import GoogleMapsBase; -#else -#import -#endif #import #import #import @@ -26,7 +22,7 @@ @class GMSPlacePhotoMetadata; @class GMSPlacePhotoMetadataList; -GMS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /** * @relates GMSPlacesClient @@ -35,9 +31,7 @@ GMS_ASSUME_NONNULL_BEGIN * @param result The |GMSPlace| that was returned. * @param error The error that occurred, if any. */ -typedef void (^GMSPlaceResultCallback)( - GMSPlace * GMS_NULLABLE_PTR result, - NSError * GMS_NULLABLE_PTR error); +typedef void (^GMSPlaceResultCallback)(GMSPlace *_Nullable result, NSError *_Nullable error); /** * @relates GMSPlacesClient @@ -46,9 +40,8 @@ typedef void (^GMSPlaceResultCallback)( * @param likelihoodList The list of place likelihoods. * @param error The error that occurred, if any. */ -typedef void (^GMSPlaceLikelihoodListCallback)( - GMSPlaceLikelihoodList * GMS_NULLABLE_PTR likelihoodList, - NSError * GMS_NULLABLE_PTR error); +typedef void (^GMSPlaceLikelihoodListCallback)(GMSPlaceLikelihoodList *_Nullable likelihoodList, + NSError *_Nullable error); /** * @relates GMSPlacesClient @@ -57,9 +50,8 @@ typedef void (^GMSPlaceLikelihoodListCallback)( * @param results An array of |GMSAutocompletePrediction|s. * @param error The error that occurred, if any. */ -typedef void (^GMSAutocompletePredictionsCallback)(GMS_NSArrayOf(GMSAutocompletePrediction *) * - GMS_NULLABLE_PTR results, - NSError *GMS_NULLABLE_PTR error); +typedef void (^GMSAutocompletePredictionsCallback)( + NSArray *_Nullable results, NSError *_Nullable error); /** * @relates GMSPlacesClient @@ -69,7 +61,7 @@ typedef void (^GMSAutocompletePredictionsCallback)(GMS_NSArrayOf(GMSAutocomplete * @param error The error that occurred, if any. */ typedef void (^GMSPlacePhotoMetadataResultCallback)( - GMSPlacePhotoMetadataList *GMS_NULLABLE_PTR photos, NSError *GMS_NULLABLE_PTR error); + GMSPlacePhotoMetadataList *_Nullable photos, NSError *_Nullable error); /** * @relates GMSPlacesClient @@ -78,8 +70,8 @@ typedef void (^GMSPlacePhotoMetadataResultCallback)( * @param photo The |UIImage| which was loaded. * @param error The error that occurred, if any. */ -typedef void (^GMSPlacePhotoImageResultCallback)(UIImage *GMS_NULLABLE_PTR photo, - NSError *GMS_NULLABLE_PTR error); +typedef void (^GMSPlacePhotoImageResultCallback)(UIImage *_Nullable photo, + NSError *_Nullable error); /** * Main interface to the Places API. Used for searching and getting details about places. This class @@ -220,8 +212,8 @@ typedef void (^GMSPlacePhotoImageResultCallback)(UIImage *GMS_NULLABLE_PTR photo * @param callback The callback to invoke with the predictions. */ - (void)autocompleteQuery:(NSString *)query - bounds:(GMSCoordinateBounds * GMS_NULLABLE_PTR)bounds - filter:(GMSAutocompleteFilter * GMS_NULLABLE_PTR)filter + bounds:(nullable GMSCoordinateBounds *)bounds + filter:(nullable GMSAutocompleteFilter *)filter callback:(GMSAutocompletePredictionsCallback)callback; /** @@ -235,4 +227,4 @@ typedef void (^GMSPlacePhotoImageResultCallback)(UIImage *GMS_NULLABLE_PTR photo @end -GMS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacesErrors.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacesErrors.h old mode 100644 new mode 100755 index 7564418..226caeb --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacesErrors.h +++ b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacesErrors.h @@ -8,13 +8,9 @@ // Service: https://developers.google.com/maps/terms // -#if __has_feature(modules) -@import GoogleMapsBase; -#else -#import -#endif +#import -GMS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /* Error domain used for Places API errors. */ extern NSString * const kGMSPlacesErrorDomain; @@ -100,4 +96,4 @@ typedef NS_ENUM(NSInteger, GMSPlacesErrorCode) { kGMSPlacesLocationError = -11 }; -GMS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSUserAddedPlace.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSUserAddedPlace.h old mode 100644 new mode 100755 index 639bc6f..2e0a9fa --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSUserAddedPlace.h +++ b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSUserAddedPlace.h @@ -11,13 +11,7 @@ #import #import -#if __has_feature(modules) -@import GoogleMapsBase; -#else -#import -#endif - -GMS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN /** * Represents a place constructed by a user, suitable for adding to Google's collection of places. @@ -28,26 +22,26 @@ GMS_ASSUME_NONNULL_BEGIN @interface GMSUserAddedPlace : NSObject /** Name of the place. */ -@property(nonatomic, copy) NSString *GMS_NULLABLE_PTR name; +@property(nonatomic, copy, nullable) NSString *name; /** Address of the place. */ -@property(nonatomic, copy) NSString *GMS_NULLABLE_PTR address; +@property(nonatomic, copy, nullable) NSString *address; /** Location of the place. */ @property(nonatomic, assign) CLLocationCoordinate2D coordinate; /** Phone number of the place. */ -@property(nonatomic, copy) NSString *GMS_NULLABLE_PTR phoneNumber; +@property(nonatomic, copy, nullable) NSString *phoneNumber; /** List of types of the place as an array of NSStrings, like the GMSPlace.types property. -* Only table 1 types +* Only table 1 types * are valid. */ -@property(nonatomic, copy) GMS_NSArrayOf(NSString *) * GMS_NULLABLE_PTR types; +@property(nonatomic, copy, nullable) NSArray *types; /** The website for the place. */ -@property(nonatomic, copy) NSString *GMS_NULLABLE_PTR website; +@property(nonatomic, copy, nullable) NSString *website; @end -GMS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GooglePlaces.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GooglePlaces.h old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Modules/module.modulemap b/Frameworks/GooglePlaces.framework/Versions/A/Modules/module.modulemap old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/Info.plist b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/Info.plist old mode 100644 new mode 100755 index 546aba0..b55ea89 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/Info.plist and b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/Info.plist differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ar.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ar.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ca.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ca.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/cs.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/cs.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/da.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/da.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/de.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/de.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/el.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/el.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/en.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/en.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/en_AU.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/en_AU.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/en_GB.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/en_GB.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/en_IN.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/en_IN.lproj/GooglePlaces.strings old mode 100644 new mode 100755 index 2e7f8c7..d1409b5 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/en_IN.lproj/GooglePlaces.strings and b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/en_IN.lproj/GooglePlaces.strings differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/es.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/es.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/es_419.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/es_419.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/es_MX.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/es_MX.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/fi.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/fi.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/fr.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/fr.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/fr_CA.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/fr_CA.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/he.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/he.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/hi.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/hi.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/hr.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/hr.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/hu.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/hu.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/id.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/id.lproj/GooglePlaces.strings old mode 100644 new mode 100755 index dfc646d..6f1a365 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/id.lproj/GooglePlaces.strings and b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/id.lproj/GooglePlaces.strings differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/it.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/it.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ja.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ja.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ko.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ko.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ms.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ms.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/nb.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/nb.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/nl.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/nl.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/oss_licenses_places.txt.gz b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/oss_licenses_places.txt.gz old mode 100644 new mode 100755 index d28dae0..3035344 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/oss_licenses_places.txt.gz and b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/oss_licenses_places.txt.gz differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/pl.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/pl.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-dark.png b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-dark.png old mode 100644 new mode 100755 index 6b93ac7..5d10345 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-dark.png and b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-dark.png differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-dark@2x.png b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-dark@2x.png old mode 100644 new mode 100755 index 5725af3..71f1c8e Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-dark@2x.png and b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-dark@2x.png differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-dark@3x.png b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-dark@3x.png old mode 100644 new mode 100755 index d48ada7..6b8b9a6 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-dark@3x.png and b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-dark@3x.png differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-light.png b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-light.png old mode 100644 new mode 100755 index f9bfb06..7e67463 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-light.png and b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-light.png differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-light@2x.png b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-light@2x.png old mode 100644 new mode 100755 index 3437461..50c3ace Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-light@2x.png and b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-light@2x.png differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-light@3x.png b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-light@3x.png old mode 100644 new mode 100755 index ba5cc90..bcafb09 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-light@3x.png and b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-light@3x.png differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/pt.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/pt.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/pt_BR.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/pt_BR.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/pt_PT.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/pt_PT.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ro.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ro.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ru.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ru.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud.png b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud.png old mode 100644 new mode 100755 index 60ff4a1..1c30882 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud.png and b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud.png differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud@2x.png b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud@2x.png old mode 100644 new mode 100755 index aef35f3..e199181 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud@2x.png and b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud@2x.png differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud@3x.png b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud@3x.png old mode 100644 new mode 100755 index 4a47965..ce3e035 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud@3x.png and b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud@3x.png differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud_dark.png b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud_dark.png old mode 100644 new mode 100755 index 9eed3bf..a16f5a2 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud_dark.png and b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud_dark.png differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud_dark@2x.png b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud_dark@2x.png old mode 100644 new mode 100755 index 5e86b28..e61cabd Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud_dark@2x.png and b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud_dark@2x.png differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud_dark@3x.png b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud_dark@3x.png old mode 100644 new mode 100755 index 25ef651..90d2380 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud_dark@3x.png and b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud_dark@3x.png differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sk.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sk.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sv.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sv.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/th.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/th.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/tr.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/tr.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/uk.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/uk.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/vi.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/vi.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/zh_CN.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/zh_CN.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/zh_HK.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/zh_HK.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/zh_TW.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/zh_TW.lproj/GooglePlaces.strings old mode 100644 new mode 100755 diff --git a/GooglePlacesRow.podspec b/GooglePlacesRow.podspec index bf5646a..78816de 100644 --- a/GooglePlacesRow.podspec +++ b/GooglePlacesRow.podspec @@ -16,12 +16,4 @@ Pod::Spec.new do |s| s.frameworks = "Accelerate", "AVFoundation", "CoreData", "CoreGraphics", "CoreBluetooth", "CoreLocation", "CoreText", "Foundation", "GLKit", "ImageIO", "OpenGLES", "QuartzCore", "SystemConfiguration", "GoogleMapsBase", "GooglePlaces" # required for GooglePlaces.framework s.vendored_frameworks = "Frameworks/GoogleMapsBase.framework", "Frameworks/GooglePlaces.framework" s.user_target_xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => '"$(PODS_ROOT)/GooglePlacesRow/Frameworks"' } - #s.prepare_command = <<-CMD - # curl -o GoogleMaps 'https://www.gstatic.com/cpdc/5a212b0fa429156f-GoogleMaps-2.0.1.tar.gz' - # tar -zxvf GoogleMaps - # curl -o GooglePlaces 'https://www.gstatic.com/cpdc/2b9e8b99fc05d124-GooglePlaces-2.0.1.tar.gz' - # tar -zxvf GooglePlaces - # CMD - #s.dependency 'GoogleMaps', '~> 2.0.1' - #s.dependency 'GooglePlaces', '~> 2.0.1' end diff --git a/README.md b/README.md index d8656a7..de11260 100755 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ By [Xmartlabs SRL](http://EurekaCommunity.com). -**Current Google Places version used is 2.0.1** +**Current Google Places version used is 2.2 (in version 2.1.0)** **Swift 3 is supported from version 2.0** @@ -124,7 +124,7 @@ To install GooglePlacesRow, simply add the following line to your Podfile: pod 'GooglePlacesRow' ``` -Then you have to tell Xcode where the Google Places framework is. The easiest way to do it is by adding `$(PROJECT_DIR)/Pods/GooglePlacesRow/Frameworks` to the `Build Settings/Framework Search Paths` of your target. +This will also install Eureka and GooglePlaces. > Note: Do not add `pod 'GooglePlaces'` to your podfile as this library includes it as a vendored framework @@ -191,7 +191,7 @@ In this case just make sure your cell conforms to `EurekaGooglePlacesTableViewCe #### Xcode says `ld: framework not found GoogleMaps for architecture x86_64`. -This is most probalby because you forgot to tell Xcode where `GoogleMapsBase.framework` or `GooglePlaces.framework` is or you did forget to download it altogether. Please follow the [example instructions](#examples) or the [installation instructions](#installation). +This is most probably because you forgot to tell Xcode where `GoogleMapsBase.framework` or `GooglePlaces.framework` is or you did forget to download it altogether. Please follow the [example instructions](#examples) or the [installation instructions](#installation). ## Future work * Carthage compatibility