diff --git a/.swift-version b/.swift-version index 9f55b2c..5186d07 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -3.0 +4.0 diff --git a/Cartfile b/Cartfile index 89ae4e3..ec2bbb1 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "xmartlabs/Eureka" ~> 3.0 +github "xmartlabs/Eureka" ~> 4.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index ce97367..c1b5a43 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -git "file:///Users/mathiasclaasen/Developer/Eureka" "2ca4188a722eb0dda6f714d6aecfab84aad018fe" +github "xmartlabs/Eureka" "4.0.1" diff --git a/Example.xcodeproj/project.pbxproj b/Example.xcodeproj/project.pbxproj index 9df0934..65b0e06 100644 --- a/Example.xcodeproj/project.pbxproj +++ b/Example.xcodeproj/project.pbxproj @@ -160,11 +160,11 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 0920; TargetAttributes = { 28F828CB1C4B714D00330CF4 = { CreatedOnToolsVersion = 7.2; - LastSwiftMigration = 0800; + LastSwiftMigration = 0920; }; }; }; @@ -289,14 +289,20 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -335,14 +341,20 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -381,7 +393,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Example; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -399,7 +412,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Example; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; }; name = Release; }; diff --git a/Example/Example/ViewController.swift b/Example/Example/ViewController.swift index 7c657bb..7d29e6d 100644 --- a/Example/Example/ViewController.swift +++ b/Example/Example/ViewController.swift @@ -21,7 +21,7 @@ class ViewController: FormViewController { +++ Section("Choose from table view") <<< GooglePlacesTableRow("tableview(2)"){ $0.onNetworkingError = { error in - print(error) + print(error ?? "There was a netwrok error") } } +++ Section("Customized cell, customized layout") diff --git a/Frameworks/GoogleMapsBase.framework/Headers b/Frameworks/GoogleMapsBase.framework/Headers deleted file mode 120000 index a177d2a..0000000 --- a/Frameworks/GoogleMapsBase.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GMSCompatabilityMacros.h b/Frameworks/GoogleMapsBase.framework/Headers/GMSCompatabilityMacros.h similarity index 100% rename from Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GMSCompatabilityMacros.h rename to Frameworks/GoogleMapsBase.framework/Headers/GMSCompatabilityMacros.h diff --git a/Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GMSCoordinateBounds.h b/Frameworks/GoogleMapsBase.framework/Headers/GMSCoordinateBounds.h similarity index 95% rename from Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GMSCoordinateBounds.h rename to Frameworks/GoogleMapsBase.framework/Headers/GMSCoordinateBounds.h index dbc4bd6..a8b6a11 100755 --- a/Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GMSCoordinateBounds.h +++ b/Frameworks/GoogleMapsBase.framework/Headers/GMSCoordinateBounds.h @@ -10,7 +10,7 @@ #import -NS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN; /** * GMSCoordinateBounds represents a rectangular bounding box on the Earth's surface. @@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN * 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; +@property(nonatomic, readonly, getter=isValid) BOOL valid; /** * Inits the northEast and southWest bounds corresponding to the rectangular region defined by the @@ -72,4 +72,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END; diff --git a/Frameworks/GoogleMapsBase.framework/Headers/GMSDeprecationMacros.h b/Frameworks/GoogleMapsBase.framework/Headers/GMSDeprecationMacros.h new file mode 100755 index 0000000..4341a0e --- /dev/null +++ b/Frameworks/GoogleMapsBase.framework/Headers/GMSDeprecationMacros.h @@ -0,0 +1,22 @@ +// +// GMSDeprecationMacros.h +// Google Maps SDK for iOS +// +// Copyright 2015 Google Inc. +// +// Usage of this SDK is subject to the Google Maps/Google Earth APIs Terms of +// Service: https://developers.google.com/maps/terms +// + +#ifndef IPHONE_MAPS_SDK_BASE_GMSDEPRECATIONMACROS_H_ +#define IPHONE_MAPS_SDK_BASE_GMSDEPRECATIONMACROS_H_ + +#ifndef __GMS_AVAILABLE_BUT_DEPRECATED +#define __GMS_AVAILABLE_BUT_DEPRECATED __deprecated +#endif + +#ifndef __GMS_AVAILABLE_BUT_DEPRECATED_MSG +#define __GMS_AVAILABLE_BUT_DEPRECATED_MSG(msg) __deprecated_msg(msg) +#endif + +#endif diff --git a/Frameworks/GoogleMapsBase.framework/Headers/GoogleMapsBase.h b/Frameworks/GoogleMapsBase.framework/Headers/GoogleMapsBase.h new file mode 100755 index 0000000..95ec44c --- /dev/null +++ b/Frameworks/GoogleMapsBase.framework/Headers/GoogleMapsBase.h @@ -0,0 +1,3 @@ +#import "GMSCompatabilityMacros.h" +#import "GMSCoordinateBounds.h" +#import "GMSDeprecationMacros.h" diff --git a/Frameworks/GoogleMapsBase.framework/Modules b/Frameworks/GoogleMapsBase.framework/Modules deleted file mode 120000 index 5736f31..0000000 --- a/Frameworks/GoogleMapsBase.framework/Modules +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Modules \ No newline at end of file diff --git a/Frameworks/GoogleMapsBase.framework/Modules/module.modulemap b/Frameworks/GoogleMapsBase.framework/Modules/module.modulemap new file mode 100755 index 0000000..a680417 --- /dev/null +++ b/Frameworks/GoogleMapsBase.framework/Modules/module.modulemap @@ -0,0 +1,8 @@ +framework module GoogleMapsBase { + umbrella header "GoogleMapsBase.h" + export * + module * { export *} + link "z" + link framework "CoreLocation" + link framework "CoreTelephony" + link framework "Security"} diff --git a/Frameworks/GoogleMapsBase.framework/Versions/A/GoogleMapsBase b/Frameworks/GoogleMapsBase.framework/Versions/A/GoogleMapsBase deleted file mode 100755 index eeee42c..0000000 Binary files a/Frameworks/GoogleMapsBase.framework/Versions/A/GoogleMapsBase and /dev/null differ diff --git a/Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GoogleMapsBase.h b/Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GoogleMapsBase.h deleted file mode 100755 index 9183bb1..0000000 --- a/Frameworks/GoogleMapsBase.framework/Versions/A/Headers/GoogleMapsBase.h +++ /dev/null @@ -1,2 +0,0 @@ -#import -#import diff --git a/Frameworks/GoogleMapsBase.framework/Versions/A/Modules/module.modulemap b/Frameworks/GoogleMapsBase.framework/Versions/A/Modules/module.modulemap deleted file mode 100755 index 360c546..0000000 --- a/Frameworks/GoogleMapsBase.framework/Versions/A/Modules/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -framework module GoogleMapsBase { umbrella header "GoogleMapsBase.h" -header "GMSCompatabilityMacros.h" -header "GMSCoordinateBounds.h" -export * module * { export * } } diff --git a/Frameworks/GoogleMapsBase.framework/Versions/Current b/Frameworks/GoogleMapsBase.framework/Versions/Current deleted file mode 120000 index 8c7e5a6..0000000 --- a/Frameworks/GoogleMapsBase.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/Frameworks/GooglePlaces.framework/Headers b/Frameworks/GooglePlaces.framework/Headers deleted file mode 120000 index a177d2a..0000000 --- a/Frameworks/GooglePlaces.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAddressComponent.h b/Frameworks/GooglePlaces.framework/Headers/GMSAddressComponent.h similarity index 94% rename from Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAddressComponent.h rename to Frameworks/GooglePlaces.framework/Headers/GMSAddressComponent.h index d115437..ffcc5a9 100755 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAddressComponent.h +++ b/Frameworks/GooglePlaces.framework/Headers/GMSAddressComponent.h @@ -10,7 +10,7 @@ #import -NS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN; /** * Represents a component of an address, e.g., street number, postcode, city, etc. @@ -29,4 +29,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END; diff --git a/Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteBoundsMode.h b/Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteBoundsMode.h new file mode 100755 index 0000000..67c01bf --- /dev/null +++ b/Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteBoundsMode.h @@ -0,0 +1,32 @@ +// +// GMSAutocompleteBoundsMode.h +// Google Places API for iOS +// +// Copyright 2017 Google Inc. +// +// Usage of this SDK is subject to the Google Maps/Google Earth APIs Terms of +// Service: https://developers.google.com/maps/terms +// + +/** + * \defgroup AutocompleteBoundsMode GMSAutocompleteBoundsMode + * @{ + */ + +#import + +NS_ASSUME_NONNULL_BEGIN; + +/** + * Specifies how autocomplete should interpret the |bounds| parameters. + */ +typedef NS_ENUM(NSUInteger, GMSAutocompleteBoundsMode) { + /** Interpret |bounds| as a bias. */ + kGMSAutocompleteBoundsModeBias, + /** Interpret |bounds| as a restrict. */ + kGMSAutocompleteBoundsModeRestrict +}; + +NS_ASSUME_NONNULL_END; + +/**@}*/ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteFetcher.h b/Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteFetcher.h similarity index 77% rename from Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteFetcher.h rename to Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteFetcher.h index fb21045..032032c 100755 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteFetcher.h +++ b/Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteFetcher.h @@ -13,11 +13,12 @@ #else #import #endif -#import +#import "GMSAutocompleteBoundsMode.h" +#import "GMSAutocompleteFilter.h" @class GMSAutocompletePrediction; -NS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN; /** * Protocol for objects that can receive callbacks from GMSAutocompleteFetcher @@ -54,21 +55,32 @@ NS_ASSUME_NONNULL_BEGIN @interface GMSAutocompleteFetcher : NSObject /** - * Initialise the fetcher - * @param bounds The bounds used to bias the results. This is not a hard restrict - places may still - * be returned outside of these bounds. This parameter may be nil. + * Initialize the fetcher. + * + * @param bounds The bounds used to bias or restrict the results. Whether this biases or restricts + * is determined by the value of the |autocompleteBoundsMode| property. + * This parameter may be nil. * @param filter The filter to apply to the results. This parameter may be nil. */ - (instancetype)initWithBounds:(nullable GMSCoordinateBounds *)bounds - filter:(nullable GMSAutocompleteFilter *)filter - NS_DESIGNATED_INITIALIZER; + filter:(nullable GMSAutocompleteFilter *)filter NS_DESIGNATED_INITIALIZER; /** Delegate to be notified with autocomplete prediction results. */ @property(nonatomic, weak, nullable) id delegate; -/** Bounds used to bias the autocomplete search (can be nil). */ +/** + * Bounds used to bias or restrict the autocomplete results depending on the value of + * |autocompleteBoundsMode| (can be nil). + */ @property(nonatomic, strong, nullable) GMSCoordinateBounds *autocompleteBounds; +/** + * How to treat the |autocompleteBounds| property. Defaults to |kGMSAutocompleteBoundsModeBias|. + * + * Has no effect if |autocompleteBounds| is nil. + */ +@property(nonatomic, assign) GMSAutocompleteBoundsMode autocompleteBoundsMode; + /** Filter to apply to autocomplete suggestions (can be nil). */ @property(nonatomic, strong, nullable) GMSAutocompleteFilter *autocompleteFilter; @@ -86,4 +98,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END; diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteFilter.h b/Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteFilter.h similarity index 92% rename from Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteFilter.h rename to Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteFilter.h index f28972c..6a52b60 100755 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteFilter.h +++ b/Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteFilter.h @@ -10,7 +10,12 @@ #import -NS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN; + +/** + * \defgroup PlacesAutocompleteTypeFilter GMSPlacesAutocompleteTypeFilter + * @{ + */ /** * The type filters that may be applied to an autocomplete request to restrict results to different @@ -51,6 +56,8 @@ typedef NS_ENUM(NSInteger, GMSPlacesAutocompleteTypeFilter) { kGMSPlacesAutocompleteTypeFilterCity, }; +/**@}*/ + /** * This class represents a set of restrictions that may be applied to autocomplete requests. This * allows customization of autocomplete suggestions to only those places that are of interest. @@ -71,4 +78,4 @@ typedef NS_ENUM(NSInteger, GMSPlacesAutocompleteTypeFilter) { @end -NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END; diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteMatchFragment.h b/Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteMatchFragment.h similarity index 94% rename from Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteMatchFragment.h rename to Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteMatchFragment.h index fdc1b50..564fee9 100755 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteMatchFragment.h +++ b/Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteMatchFragment.h @@ -11,7 +11,7 @@ #import -NS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN; /** * This class represents a matched fragment of a string. This is a contiguous range of characters @@ -32,4 +32,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END; diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompletePrediction.h b/Frameworks/GooglePlaces.framework/Headers/GMSAutocompletePrediction.h similarity index 96% rename from Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompletePrediction.h rename to Frameworks/GooglePlaces.framework/Headers/GMSAutocompletePrediction.h index 26fd692..bbba200 100755 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompletePrediction.h +++ b/Frameworks/GooglePlaces.framework/Headers/GMSAutocompletePrediction.h @@ -9,10 +9,12 @@ // -NS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN; -/* +/** * Attribute name for match fragments in |GMSAutocompletePrediction| attributedFullText. + * + * @related GMSAutocompletePrediction */ extern NSString *const kGMSAutocompleteMatchAttribute; @@ -79,4 +81,4 @@ extern NSString *const kGMSAutocompleteMatchAttribute; @end -NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END; diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteResultsViewController.h b/Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteResultsViewController.h similarity index 89% rename from Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteResultsViewController.h rename to Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteResultsViewController.h index f4de38b..72532e6 100755 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteResultsViewController.h +++ b/Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteResultsViewController.h @@ -15,11 +15,12 @@ #else #import #endif -#import -#import -#import +#import "GMSAutocompleteBoundsMode.h" +#import "GMSAutocompleteFilter.h" +#import "GMSAutocompletePrediction.h" +#import "GMSPlace.h" -NS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN; @class GMSAutocompleteResultsViewController; @@ -85,7 +86,6 @@ NS_ASSUME_NONNULL_BEGIN @end - /** * GMSAutocompleteResultsViewController provides an interface that displays place autocomplete * predictions in a table view. The table view will be automatically updated as input text @@ -99,15 +99,24 @@ NS_ASSUME_NONNULL_BEGIN * Use the |GMSAutocompleteResultsViewControllerDelegate| delegate protocol to be notified when a * place is selected from the list. */ -@interface GMSAutocompleteResultsViewController : UIViewController < - UISearchResultsUpdating> +@interface GMSAutocompleteResultsViewController : UIViewController /** Delegate to be notified when a place is selected. */ @property(nonatomic, weak, nullable) id delegate; -/** Bounds used to bias the autocomplete search (can be nil). */ +/** + * Bounds used to bias or restrict the autocomplete results depending on the value of + * |autocompleteBoundsMode| (can be nil). + */ @property(nonatomic, strong, nullable) GMSCoordinateBounds *autocompleteBounds; +/** + * How to treat the |autocompleteBounds| property. Defaults to |kGMSAutocompleteBoundsModeBias|. + * + * Has no effect if |autocompleteBounds| is nil. + */ +@property(nonatomic, assign) GMSAutocompleteBoundsMode autocompleteBoundsMode; + /** Filter to apply to autocomplete suggestions (can be nil). */ @property(nonatomic, strong, nullable) GMSAutocompleteFilter *autocompleteFilter; @@ -131,4 +140,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END; diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteTableDataSource.h b/Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteTableDataSource.h similarity index 86% rename from Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteTableDataSource.h rename to Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteTableDataSource.h index ce96d66..1a2a5a0 100755 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteTableDataSource.h +++ b/Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteTableDataSource.h @@ -15,11 +15,12 @@ #else #import #endif -#import -#import -#import +#import "GMSAutocompleteBoundsMode.h" +#import "GMSAutocompleteFilter.h" +#import "GMSAutocompletePrediction.h" +#import "GMSPlace.h" -NS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN; @class GMSAutocompleteTableDataSource; @@ -85,7 +86,6 @@ NS_ASSUME_NONNULL_BEGIN @end - /** * GMSAutocompleteTableDataSource provides an interface for providing place autocomplete * predictions to populate a UITableView by implementing the UITableViewDataSource and @@ -94,9 +94,9 @@ NS_ASSUME_NONNULL_BEGIN * GMSAutocompleteTableDataSource is designed to be used as the data source for a * UISearchDisplayController. * - * NOTE: Unless iOS 7 compatibility is required, using UISearchController with - * |GMSAutocompleteResultsViewController| instead of UISearchDisplayController is highly - * recommended. + * NOTE: UISearchDisplayController has been deprecated since iOS 8. It is now recommended to use + * UISearchController with |GMSAutocompleteResultsViewController| to display autocomplete results + * using the iOS search UI. * * Set an instance of GMSAutocompleteTableDataSource as the searchResultsDataSource and * searchResultsDelegate properties of UISearchDisplayController. In your implementation of @@ -108,15 +108,24 @@ NS_ASSUME_NONNULL_BEGIN * UISearchDisplayController's table view. * */ -@interface GMSAutocompleteTableDataSource : NSObject < - UITableViewDataSource, UITableViewDelegate> +@interface GMSAutocompleteTableDataSource : NSObject /** Delegate to be notified when a place is selected or picking is cancelled. */ @property(nonatomic, weak, nullable) IBOutlet id delegate; -/** Bounds used to bias the autocomplete search (can be nil). */ +/** + * Bounds used to bias or restrict the autocomplete results depending on the value of + * |autocompleteBoundsMode| (can be nil). + */ @property(nonatomic, strong, nullable) GMSCoordinateBounds *autocompleteBounds; +/** + * How to treat the |autocompleteBounds| property. Defaults to |kGMSAutocompleteBoundsModeBias|. + * + * Has no effect if |autocompleteBounds| is nil. + */ +@property(nonatomic, assign) GMSAutocompleteBoundsMode autocompleteBoundsMode; + /** Filter to apply to autocomplete suggestions (can be nil). */ @property(nonatomic, strong, nullable) GMSAutocompleteFilter *autocompleteFilter; @@ -155,4 +164,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END; diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteViewController.h b/Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteViewController.h similarity index 83% rename from Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteViewController.h rename to Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteViewController.h index f7b7eb9..4cd070a 100755 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSAutocompleteViewController.h +++ b/Frameworks/GooglePlaces.framework/Headers/GMSAutocompleteViewController.h @@ -15,11 +15,12 @@ #else #import #endif -#import -#import -#import +#import "GMSAutocompleteBoundsMode.h" +#import "GMSAutocompleteFilter.h" +#import "GMSAutocompletePrediction.h" +#import "GMSPlace.h" -NS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN; @class GMSAutocompleteViewController; @@ -33,6 +34,10 @@ NS_ASSUME_NONNULL_BEGIN /** * Called when a place has been selected from the available autocomplete predictions. + * + * Implementations of this method should dismiss the view controller as the view controller will not + * dismiss itself. + * * @param viewController The |GMSAutocompleteViewController| that generated the event. * @param place The |GMSPlace| that was returned. */ @@ -43,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN * Called when a non-retryable error occurred when retrieving autocomplete predictions or place * details. A non-retryable error is defined as one that is unlikely to be fixed by immediately * retrying the operation. - *

+ * * Only the following values of |GMSPlacesErrorCode| are retryable: *

    *
  • kGMSPlacesNetworkError @@ -51,6 +56,7 @@ NS_ASSUME_NONNULL_BEGIN *
  • kGMSPlacesInternalError *
* All other error codes are non-retryable. + * * @param viewController The |GMSAutocompleteViewController| that generated the event. * @param error The |NSError| that was returned. */ @@ -59,6 +65,10 @@ NS_ASSUME_NONNULL_BEGIN /** * Called when the user taps the Cancel button in a |GMSAutocompleteViewController|. + * + * Implementations of this method should dismiss the view controller as the view controller will not + * dismiss itself. + * * @param viewController The |GMSAutocompleteViewController| that generated the event. */ - (void)wasCancelled:(GMSAutocompleteViewController *)viewController; @@ -67,8 +77,11 @@ NS_ASSUME_NONNULL_BEGIN /** * Called when the user selects an autocomplete prediction from the list but before requesting - * place details. Returning NO from this method will suppress the place details fetch and - * didAutocompleteWithPlace will not be called. + * place details. + * + * Returning NO from this method will suppress the place details fetch and didAutocompleteWithPlace + * will not be called. + * * @param viewController The |GMSAutocompleteViewController| that generated the event. * @param prediction The |GMSAutocompletePrediction| that was selected. */ @@ -77,19 +90,20 @@ NS_ASSUME_NONNULL_BEGIN /** * Called once every time new autocomplete predictions are received. + * * @param viewController The |GMSAutocompleteViewController| that generated the event. */ - (void)didUpdateAutocompletePredictions:(GMSAutocompleteViewController *)viewController; /** - * @param viewController The |GMSAutocompleteViewController| that generated the event. * Called once immediately after a request for autocomplete predictions is made. + * + * @param viewController The |GMSAutocompleteViewController| that generated the event. */ - (void)didRequestAutocompletePredictions:(GMSAutocompleteViewController *)viewController; @end - /** * GMSAutocompleteViewController provides an interface that displays a table of autocomplete * predictions that updates as the user enters text. Place selections made by the user are @@ -105,9 +119,19 @@ NS_ASSUME_NONNULL_BEGIN /** Delegate to be notified when a place is selected or picking is cancelled. */ @property(nonatomic, weak, nullable) IBOutlet id delegate; -/** Bounds used to bias the autocomplete search (can be nil). */ +/** + * Bounds used to bias or restrict the autocomplete results depending on the value of + * |autocompleteBoundsMode| (can be nil). + */ @property(nonatomic, strong, nullable) GMSCoordinateBounds *autocompleteBounds; +/** + * How to treat the |autocompleteBounds| property. Defaults to |kGMSAutocompleteBoundsModeBias|. + * + * Has no effect if |autocompleteBounds| is nil. + */ +@property(nonatomic, assign) GMSAutocompleteBoundsMode autocompleteBoundsMode; + /** Filter to apply to autocomplete suggestions (can be nil). */ @property(nonatomic, strong, nullable) GMSAutocompleteFilter *autocompleteFilter; @@ -131,4 +155,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END; diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlace.h b/Frameworks/GooglePlaces.framework/Headers/GMSPlace.h similarity index 93% rename from Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlace.h rename to Frameworks/GooglePlaces.framework/Headers/GMSPlace.h index 35881bc..f5ccce7 100755 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlace.h +++ b/Frameworks/GooglePlaces.framework/Headers/GMSPlace.h @@ -10,13 +10,20 @@ #import -NS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN; @class GMSAddressComponent; @class GMSCoordinateBounds; -/** Describes the current open status of a place. */ +/** + * \defgroup PlacesOpenNowStatus GMSPlacesOpenNowStatus + * @{ + */ + +/** + * Describes the current open status of a place. + */ typedef NS_ENUM(NSInteger, GMSPlacesOpenNowStatus) { /** The place is open now. */ kGMSPlacesOpenNowStatusYes, @@ -26,6 +33,16 @@ typedef NS_ENUM(NSInteger, GMSPlacesOpenNowStatus) { kGMSPlacesOpenNowStatusUnknown, }; +/**@}*/ + +/** + * \defgroup PlacesPriceLevel GMSPlacesPriceLevel + * @{ + */ + +/** + * Describes the price level of a place. + */ typedef NS_ENUM(NSInteger, GMSPlacesPriceLevel) { kGMSPlacesPriceLevelUnknown = -1, kGMSPlacesPriceLevelFree = 0, @@ -35,6 +52,8 @@ typedef NS_ENUM(NSInteger, GMSPlacesPriceLevel) { kGMSPlacesPriceLevelExpensive = 4, }; +/**@}*/ + /** * Represents a particular physical place. A GMSPlace encapsulates information about a physical * location, including its name, location, and any other information we might have about it. This @@ -128,4 +147,4 @@ typedef NS_ENUM(NSInteger, GMSPlacesPriceLevel) { @end -NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END; diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceLikelihood.h b/Frameworks/GooglePlaces.framework/Headers/GMSPlaceLikelihood.h similarity index 91% rename from Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceLikelihood.h rename to Frameworks/GooglePlaces.framework/Headers/GMSPlaceLikelihood.h index 632705c..fa5cd1f 100755 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceLikelihood.h +++ b/Frameworks/GooglePlaces.framework/Headers/GMSPlaceLikelihood.h @@ -11,7 +11,7 @@ #import -NS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN; @class GMSPlace; @@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN * list of returned places for a single request. For more information about place likelihoods, see * |GMSPlaceLikelihoodList|. */ -@interface GMSPlaceLikelihood : NSObject +@interface GMSPlaceLikelihood : NSObject /** * The place contained in this place likelihood. @@ -38,4 +38,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END; diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceLikelihoodList.h b/Frameworks/GooglePlaces.framework/Headers/GMSPlaceLikelihoodList.h similarity index 96% rename from Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceLikelihoodList.h rename to Frameworks/GooglePlaces.framework/Headers/GMSPlaceLikelihoodList.h index 1364fe1..ffa6ca8 100755 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceLikelihoodList.h +++ b/Frameworks/GooglePlaces.framework/Headers/GMSPlaceLikelihoodList.h @@ -10,7 +10,7 @@ #import -NS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN; @class GMSPlaceLikelihood; @@ -39,4 +39,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END; diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacePhotoMetadata.h b/Frameworks/GooglePlaces.framework/Headers/GMSPlacePhotoMetadata.h similarity index 95% rename from Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacePhotoMetadata.h rename to Frameworks/GooglePlaces.framework/Headers/GMSPlacePhotoMetadata.h index da29fdf..7fa3b8e 100755 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacePhotoMetadata.h +++ b/Frameworks/GooglePlaces.framework/Headers/GMSPlacePhotoMetadata.h @@ -10,7 +10,7 @@ #import -NS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN; /** * The metadata corresponding to a single photo associated with a place. @@ -35,4 +35,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END; diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacePhotoMetadataList.h b/Frameworks/GooglePlaces.framework/Headers/GMSPlacePhotoMetadataList.h similarity index 84% rename from Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacePhotoMetadataList.h rename to Frameworks/GooglePlaces.framework/Headers/GMSPlacePhotoMetadataList.h index 206b3a0..e089040 100755 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacePhotoMetadataList.h +++ b/Frameworks/GooglePlaces.framework/Headers/GMSPlacePhotoMetadataList.h @@ -10,9 +10,9 @@ #import -#import +#import "GMSPlacePhotoMetadata.h" -NS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN; /** * A list of |GMSPlacePhotoMetadata| objects. @@ -26,4 +26,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END; diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceTypes.h b/Frameworks/GooglePlaces.framework/Headers/GMSPlaceTypes.h similarity index 99% rename from Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceTypes.h rename to Frameworks/GooglePlaces.framework/Headers/GMSPlaceTypes.h index f72a83b..f06900c 100755 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlaceTypes.h +++ b/Frameworks/GooglePlaces.framework/Headers/GMSPlaceTypes.h @@ -10,6 +10,10 @@ #import +/** + * \defgroup PlaceTypes GMSPlaceType + * @{ + */ extern NSString *const kGMSPlaceTypeAccounting; @@ -141,3 +145,5 @@ extern NSString *const kGMSPlaceTypeTravelAgency; extern NSString *const kGMSPlaceTypeUniversity; extern NSString *const kGMSPlaceTypeVeterinaryCare; extern NSString *const kGMSPlaceTypeZoo; + +/**@}*/ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacesClient.h b/Frameworks/GooglePlaces.framework/Headers/GMSPlacesClient.h similarity index 79% rename from Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacesClient.h rename to Frameworks/GooglePlaces.framework/Headers/GMSPlacesClient.h index 3706885..3886123 100755 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacesClient.h +++ b/Frameworks/GooglePlaces.framework/Headers/GMSPlacesClient.h @@ -11,9 +11,15 @@ #import #import -#import -#import -#import +#if __has_feature(modules) +@import GoogleMapsBase; +#else +#import +#endif +#import "GMSAutocompleteBoundsMode.h" +#import "GMSPlace.h" +#import "GMSPlacesErrors.h" +#import "GMSUserAddedPlace.h" @class GMSAutocompleteFilter; @@ -22,53 +28,58 @@ @class GMSPlacePhotoMetadata; @class GMSPlacePhotoMetadataList; -NS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN; /** - * @relates GMSPlacesClient * Callback type for receiving place details lookups. If an error occurred, * |result| will be nil and |error| will contain information about the error. * @param result The |GMSPlace| that was returned. * @param error The error that occurred, if any. + * + * @related GMSPlacesClient */ typedef void (^GMSPlaceResultCallback)(GMSPlace *_Nullable result, NSError *_Nullable error); /** - * @relates GMSPlacesClient * Callback type for receiving place likelihood lists. If an error occurred, |likelihoodList| will * be nil and |error| will contain information about the error. * @param likelihoodList The list of place likelihoods. * @param error The error that occurred, if any. + * + * @related GMSPlacesClient */ typedef void (^GMSPlaceLikelihoodListCallback)(GMSPlaceLikelihoodList *_Nullable likelihoodList, NSError *_Nullable error); /** - * @relates GMSPlacesClient * Callback type for receiving autocompletion results. |results| is an array of * GMSAutocompletePredictions representing candidate completions of the query. * @param results An array of |GMSAutocompletePrediction|s. * @param error The error that occurred, if any. + * + * @related GMSPlacesClient */ typedef void (^GMSAutocompletePredictionsCallback)( NSArray *_Nullable results, NSError *_Nullable error); /** - * @relates GMSPlacesClient * Callback type for receiving place photos results. If an error occurred, |photos| will be nil and * |error| will contain information about the error. * @param photos The result containing |GMSPlacePhotoMetadata| objects. * @param error The error that occurred, if any. + * + * @related GMSPlacesClient */ -typedef void (^GMSPlacePhotoMetadataResultCallback)( - GMSPlacePhotoMetadataList *_Nullable photos, NSError *_Nullable error); +typedef void (^GMSPlacePhotoMetadataResultCallback)(GMSPlacePhotoMetadataList *_Nullable photos, + NSError *_Nullable error); /** - * @relates GMSPlacesClient * Callback type for receiving |UIImage| objects from a |GMSPlacePhotoMetadata| object. If an error * occurred, |photo| will be nil and |error| will contain information about the error. * @param photo The |UIImage| which was loaded. * @param error The error that occurred, if any. + * + * @related GMSPlacesClient */ typedef void (^GMSPlacePhotoImageResultCallback)(UIImage *_Nullable photo, NSError *_Nullable error); @@ -191,8 +202,8 @@ typedef void (^GMSPlacePhotoImageResultCallback)(UIImage *_Nullable photo, * Generates a place likelihood list based on the device's last estimated location. The supplied * callback will be invoked with this likelihood list upon success and an NSError upon an error. * - * NOTE: This method requires that your app has permission to access the devices location. Before - * calling this make sure to request access to the users location using [CLLocationManager + * NOTE: This method requires that your app has permission to access the current device location. + * Before calling this make sure to request access to the users location using [CLLocationManager * requestWhenInUseAuthorization] or [CLLocationManager requestAlwaysAuthorization]. If you do call * this method and your app does not have the correct authorization status, the callback will be * called with an error. @@ -203,8 +214,10 @@ typedef void (^GMSPlacePhotoImageResultCallback)(UIImage *_Nullable photo, /** * Autocompletes a given text query. Results may optionally be biased towards a certain location. + * * The supplied callback will be invoked with an array of autocompletion predictions upon success * and an NSError upon an error. + * * @param query The partial text to autocomplete. * @param bounds The bounds used to bias the results. This is not a hard restrict - places may still * be returned outside of these bounds. This parameter may be nil. @@ -216,15 +229,42 @@ typedef void (^GMSPlacePhotoImageResultCallback)(UIImage *_Nullable photo, filter:(nullable GMSAutocompleteFilter *)filter callback:(GMSAutocompletePredictionsCallback)callback; +/** + * Autocompletes a given text query. Results may optionally be biased towards a certain location, + * or restricted to an area. + * + * The supplied callback will be invoked with an array of autocompletion predictions upon success + * and an NSError upon an error. + * + * @param query The partial text to autocomplete. + * @param bounds The bounds used to bias or restrict the results. Whether this biases or restricts + * is determined by the value of the |boundsMode| parameter. This parameter may be + * nil. + * @param boundsMode How to treat the |bounds| parameter. Has no effect if |bounds| is nil. + * @param filter The filter to apply to the results. This parameter may be nil. + * @param callback The callback to invoke with the predictions. + */ +- (void)autocompleteQuery:(NSString *)query + bounds:(nullable GMSCoordinateBounds *)bounds + boundsMode:(GMSAutocompleteBoundsMode)boundsMode + filter:(nullable GMSAutocompleteFilter *)filter + callback:(GMSAutocompletePredictionsCallback)callback; + /** * Add a place. The |place| must have all its fields set, except that website or phoneNumber may be * nil. * @param place The details of the place to be added. * @param callback The callback to invoke with the place that was added. + * + * NOTE: The Add Place feature is deprecated as of June 30, 2017. This feature will be turned down + * on June 30, 2018, and will no longer be available after that date. */ - (void)addPlace:(GMSUserAddedPlace *)place - callback:(GMSPlaceResultCallback)callback; + callback:(GMSPlaceResultCallback)callback + __GMS_AVAILABLE_BUT_DEPRECATED_MSG( + "The Add Place feature is deprecated as of June 30, 2017. This feature will be turned down " + "on June 30, 2018, and will no longer be available after that date."); @end -NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END; diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacesErrors.h b/Frameworks/GooglePlaces.framework/Headers/GMSPlacesErrors.h similarity index 73% rename from Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacesErrors.h rename to Frameworks/GooglePlaces.framework/Headers/GMSPlacesErrors.h index 226caeb..d6eec74 100755 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSPlacesErrors.h +++ b/Frameworks/GooglePlaces.framework/Headers/GMSPlacesErrors.h @@ -8,14 +8,23 @@ // Service: https://developers.google.com/maps/terms // +/** + * \defgroup PlacesErrors GMSPlacesErrors + * @{ + */ + #import -NS_ASSUME_NONNULL_BEGIN +NS_ASSUME_NONNULL_BEGIN; -/* Error domain used for Places API errors. */ -extern NSString * const kGMSPlacesErrorDomain; +/** + * Error domain used for Places API errors. + */ +extern NSString *const kGMSPlacesErrorDomain; -/* Error codes for |kGMSPlacesErrorDomain|. */ +/** + * Error codes for |kGMSPlacesErrorDomain|. + */ typedef NS_ENUM(NSInteger, GMSPlacesErrorCode) { /** * Something went wrong with the connection to the Places API server. @@ -25,34 +34,34 @@ typedef NS_ENUM(NSInteger, GMSPlacesErrorCode) { * The Places API server returned a response that we couldn't understand. *

* If you believe this error represents a bug, please file a report using the instructions on our - * community and support page. + * community and support page. */ kGMSPlacesServerError = -2, /** * An internal error occurred in the Places API library. *

* If you believe this error represents a bug, please file a report using the instructions on our - * community and support page. + * community and support page. */ kGMSPlacesInternalError = -3, /** * Operation failed due to an invalid (malformed or missing) API key. *

- * See the developer's guide + * See the developer's guide * for information on creating and using an API key. */ kGMSPlacesKeyInvalid = -4, /** * Operation failed due to an expired API key. *

- * See the developer's guide + * See the developer's guide * for information on creating and using an API key. */ kGMSPlacesKeyExpired = -5, /** * Operation failed due to exceeding the quota usage limit. *

- * See the usage limits guide + * See the usage limits guide * for information on usage limits and how to request a higher limit. */ kGMSPlacesUsageLimitExceeded = -6, @@ -77,15 +86,15 @@ typedef NS_ENUM(NSInteger, GMSPlacesErrorCode) { /** * The Places API for iOS is not enabled. *

- * See the developer's guide for how - * to enable the Google Places API for iOS. + * See the developer's guide for + * how to enable the Google Places API for iOS. */ kGMSPlacesAccessNotConfigured = -9, /** * The application's bundle identifier does not match one of the allowed iOS applications for the * API key. *

- * See the developer's guide + * See the developer's guide * for how to configure bundle restrictions on API keys. */ kGMSPlacesIncorrectBundleIdentifier = -10, @@ -96,4 +105,6 @@ typedef NS_ENUM(NSInteger, GMSPlacesErrorCode) { kGMSPlacesLocationError = -11 }; -NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END; + +/**@}*/ diff --git a/Frameworks/GooglePlaces.framework/Headers/GMSUserAddedPlace.h b/Frameworks/GooglePlaces.framework/Headers/GMSUserAddedPlace.h new file mode 100755 index 0000000..1ca2b21 --- /dev/null +++ b/Frameworks/GooglePlaces.framework/Headers/GMSUserAddedPlace.h @@ -0,0 +1,71 @@ +// +// GMSUserAddedPlace.h +// Google Places API for iOS +// +// Copyright 2016 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 +#import + +#if __has_feature(modules) +@import GoogleMapsBase; +#else +#import +#endif + +NS_ASSUME_NONNULL_BEGIN; + +/** + * Represents a place constructed by a user, suitable for adding to Google's collection of places. + * + * All properties must be set before passing to GMSPlacesClient.addPlace, except that either website + * _or_ phoneNumber may be nil. + * + * NOTE: The Add Place feature is deprecated as of June 30, 2017. This feature will be turned down + * on June 30, 2018, and will no longer be available after that date. + */ +__GMS_AVAILABLE_BUT_DEPRECATED_MSG( + "The Add Place feature is deprecated as of June 30, 2017. This feature will be turned down on " + "June 30, 2018, and will no longer be available after that date.") +@interface GMSUserAddedPlace : NSObject + +/** Name of the place. */ +@property(nonatomic, copy, nullable) NSString *name __GMS_AVAILABLE_BUT_DEPRECATED_MSG( + "The Add Place feature is deprecated as of June 30, 2017. This feature will be turned down on " + "June 30, 2018, and will no longer be available after that date."); + +/** Address of the place. */ +@property(nonatomic, copy, nullable) NSString *address __GMS_AVAILABLE_BUT_DEPRECATED_MSG( + "The Add Place feature is deprecated as of June 30, 2017. This feature will be turned down on " + "June 30, 2018, and will no longer be available after that date."); + +/** Location of the place. */ +@property(nonatomic, assign) CLLocationCoordinate2D coordinate __GMS_AVAILABLE_BUT_DEPRECATED_MSG( + "The Add Place feature is deprecated as of June 30, 2017. This feature will be turned down on " + "June 30, 2018, and will no longer be available after that date."); + +/** Phone number of the place. */ +@property(nonatomic, copy, nullable) NSString *phoneNumber __GMS_AVAILABLE_BUT_DEPRECATED_MSG( + "The Add Place feature is deprecated as of June 30, 2017. This feature will be turned down on " + "June 30, 2018, and will no longer be available after that date."); + +/** List of types of the place as an array of NSStrings, like the GMSPlace.types property. +* Only table 1 types +* are valid. +*/ +@property(nonatomic, copy, nullable) NSArray *types __GMS_AVAILABLE_BUT_DEPRECATED_MSG( + "The Add Place feature is deprecated as of June 30, 2017. This feature will be turned down on " + "June 30, 2018, and will no longer be available after that date."); + +/** The website for the place. */ +@property(nonatomic, copy, nullable) NSString *website __GMS_AVAILABLE_BUT_DEPRECATED_MSG( + "The Add Place feature is deprecated as of June 30, 2017. This feature will be turned down on " + "June 30, 2018, and will no longer be available after that date."); + +@end + +NS_ASSUME_NONNULL_END; diff --git a/Frameworks/GooglePlaces.framework/Headers/GooglePlaces.h b/Frameworks/GooglePlaces.framework/Headers/GooglePlaces.h new file mode 100755 index 0000000..d42a670 --- /dev/null +++ b/Frameworks/GooglePlaces.framework/Headers/GooglePlaces.h @@ -0,0 +1,18 @@ +#import "GMSAutocompleteBoundsMode.h" +#import "GMSAutocompleteFetcher.h" +#import "GMSAutocompleteFilter.h" +#import "GMSAutocompleteMatchFragment.h" +#import "GMSAutocompletePrediction.h" +#import "GMSAutocompleteResultsViewController.h" +#import "GMSAutocompleteTableDataSource.h" +#import "GMSAutocompleteViewController.h" +#import "GMSAddressComponent.h" +#import "GMSPlace.h" +#import "GMSPlaceLikelihood.h" +#import "GMSPlaceLikelihoodList.h" +#import "GMSPlacePhotoMetadata.h" +#import "GMSPlacePhotoMetadataList.h" +#import "GMSPlaceTypes.h" +#import "GMSPlacesClient.h" +#import "GMSPlacesErrors.h" +#import "GMSUserAddedPlace.h" diff --git a/Frameworks/GooglePlaces.framework/Modules b/Frameworks/GooglePlaces.framework/Modules deleted file mode 120000 index 5736f31..0000000 --- a/Frameworks/GooglePlaces.framework/Modules +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Modules \ No newline at end of file diff --git a/Frameworks/GooglePlaces.framework/Modules/module.modulemap b/Frameworks/GooglePlaces.framework/Modules/module.modulemap new file mode 100755 index 0000000..79fbfce --- /dev/null +++ b/Frameworks/GooglePlaces.framework/Modules/module.modulemap @@ -0,0 +1,8 @@ +framework module GooglePlaces { + umbrella header "GooglePlaces.h" + export * + module * { export *} + link "z" + link framework "CoreLocation" + link framework "CoreTelephony" + link framework "Security"} diff --git a/Frameworks/GooglePlaces.framework/Resources b/Frameworks/GooglePlaces.framework/Resources deleted file mode 120000 index 953ee36..0000000 --- a/Frameworks/GooglePlaces.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/Info.plist b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/Info.plist new file mode 100755 index 0000000..73bc019 Binary files /dev/null and b/Frameworks/GooglePlaces.framework/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/Resources/GooglePlaces.bundle/ar.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ar.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/ar.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ca.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/ca.lproj/GooglePlaces.strings similarity index 75% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ca.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/ca.lproj/GooglePlaces.strings index c90a9dc..98901a2 100755 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ca.lproj/GooglePlaces.strings and b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/ca.lproj/GooglePlaces.strings differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/cs.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/cs.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/cs.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/cs.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/da.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/da.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/da.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/da.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/de.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/de.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/de.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/de.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/el.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/el.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/el.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/el.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/en.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/en.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/en.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/en.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/en_AU.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/en_AU.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/en_AU.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/en_AU.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/en_GB.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/en_GB.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/en_GB.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/en_GB.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/en_IN.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/en_IN.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/en_IN.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/en_IN.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/es.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/es.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/es.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/es.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/es_419.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/es_419.lproj/GooglePlaces.strings new file mode 100755 index 0000000..bef06c8 Binary files /dev/null and b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/es_419.lproj/GooglePlaces.strings differ diff --git a/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/es_MX.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/es_MX.lproj/GooglePlaces.strings new file mode 100755 index 0000000..bef06c8 Binary files /dev/null and b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/es_MX.lproj/GooglePlaces.strings differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/fi.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/fi.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/fi.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/fi.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/fr.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/fr.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/fr.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/fr.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/fr_CA.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/fr_CA.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/fr_CA.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/fr_CA.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/he.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/he.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/he.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/he.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/hi.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/hi.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/hi.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/hi.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/hr.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/hr.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/hr.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/hr.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/hu.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/hu.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/hu.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/hu.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/id.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/id.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/id.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/id.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/it.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/it.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/it.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/it.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/iw.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/iw.lproj/GooglePlaces.strings new file mode 100755 index 0000000..ae5d522 Binary files /dev/null and b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/iw.lproj/GooglePlaces.strings differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ja.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/ja.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ja.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/ja.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ko.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/ko.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ko.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/ko.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/lt.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/lt.lproj/GooglePlaces.strings new file mode 100755 index 0000000..76f26e4 Binary files /dev/null and b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/lt.lproj/GooglePlaces.strings differ diff --git a/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/lv.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/lv.lproj/GooglePlaces.strings new file mode 100755 index 0000000..76f26e4 Binary files /dev/null and b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/lv.lproj/GooglePlaces.strings differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ms.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/ms.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ms.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/ms.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/nb.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/nb.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/nb.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/nb.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/nl.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/nl.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/nl.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/nl.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/no.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/no.lproj/GooglePlaces.strings new file mode 100755 index 0000000..5898919 Binary files /dev/null and b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/no.lproj/GooglePlaces.strings differ diff --git a/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/oss_licenses_places.txt.gz b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/oss_licenses_places.txt.gz new file mode 100755 index 0000000..98f4de1 Binary files /dev/null and b/Frameworks/GooglePlaces.framework/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/Resources/GooglePlaces.bundle/pl.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/pl.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/pl.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-dark.png b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/powered-by-google-dark.png similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-dark.png rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/powered-by-google-dark.png diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-dark@2x.png b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/powered-by-google-dark@2x.png similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-dark@2x.png rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/powered-by-google-dark@2x.png diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-dark@3x.png b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/powered-by-google-dark@3x.png similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-dark@3x.png rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/powered-by-google-dark@3x.png diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-light.png b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/powered-by-google-light.png similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-light.png rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/powered-by-google-light.png diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-light@2x.png b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/powered-by-google-light@2x.png similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-light@2x.png rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/powered-by-google-light@2x.png diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-light@3x.png b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/powered-by-google-light@3x.png similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/powered-by-google-light@3x.png rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/powered-by-google-light@3x.png diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/pt.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/pt.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/pt.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/pt.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/pt_BR.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/pt_BR.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/pt_BR.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/pt_BR.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/pt_PT.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/pt_PT.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/pt_PT.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/pt_PT.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ro.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/ro.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ro.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/ro.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ru.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/ru.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/ru.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/ru.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud.png b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/sad_cloud.png similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud.png rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/sad_cloud.png diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud@2x.png b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/sad_cloud@2x.png similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud@2x.png rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/sad_cloud@2x.png diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud@3x.png b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/sad_cloud@3x.png similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud@3x.png rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/sad_cloud@3x.png diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud_dark.png b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/sad_cloud_dark.png similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud_dark.png rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/sad_cloud_dark.png diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud_dark@2x.png b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/sad_cloud_dark@2x.png similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud_dark@2x.png rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/sad_cloud_dark@2x.png diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud_dark@3x.png b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/sad_cloud_dark@3x.png similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sad_cloud_dark@3x.png rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/sad_cloud_dark@3x.png diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sk.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/sk.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sk.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/sk.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sv.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/sv.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/sv.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/sv.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/th.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/th.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/th.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/th.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/tr.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/tr.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/tr.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/tr.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/uk.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/uk.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/uk.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/uk.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/vi.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/vi.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/vi.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/vi.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/zh_CN.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/zh_CN.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/zh_CN.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/zh_CN.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/zh_HK.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/zh_HK.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/zh_HK.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/zh_HK.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/zh_TW.lproj/GooglePlaces.strings b/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/zh_TW.lproj/GooglePlaces.strings similarity index 100% rename from Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/zh_TW.lproj/GooglePlaces.strings rename to Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle/zh_TW.lproj/GooglePlaces.strings diff --git a/Frameworks/GooglePlaces.framework/Versions/A/GooglePlaces b/Frameworks/GooglePlaces.framework/Versions/A/GooglePlaces deleted file mode 100755 index 69753b1..0000000 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/GooglePlaces and /dev/null differ diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSUserAddedPlace.h b/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSUserAddedPlace.h deleted file mode 100755 index 2e0a9fa..0000000 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GMSUserAddedPlace.h +++ /dev/null @@ -1,47 +0,0 @@ -// -// GMSUserAddedPlace.h -// Google Places API for iOS -// -// Copyright 2016 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 -#import - -NS_ASSUME_NONNULL_BEGIN - -/** - * Represents a place constructed by a user, suitable for adding to Google's collection of places. - * - * All properties must be set before passing to GMSPlacesClient.addPlace, except that either website - * _or_ phoneNumber may be nil. - */ -@interface GMSUserAddedPlace : NSObject - -/** Name of the place. */ -@property(nonatomic, copy, nullable) NSString *name; - -/** Address of the place. */ -@property(nonatomic, copy, nullable) NSString *address; - -/** Location of the place. */ -@property(nonatomic, assign) CLLocationCoordinate2D coordinate; - -/** Phone number of the place. */ -@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 -* are valid. -*/ -@property(nonatomic, copy, nullable) NSArray *types; - -/** The website for the place. */ -@property(nonatomic, copy, nullable) NSString *website; - -@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 deleted file mode 100755 index e4fb191..0000000 --- a/Frameworks/GooglePlaces.framework/Versions/A/Headers/GooglePlaces.h +++ /dev/null @@ -1,17 +0,0 @@ -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Modules/module.modulemap b/Frameworks/GooglePlaces.framework/Versions/A/Modules/module.modulemap deleted file mode 100755 index 8a46427..0000000 --- a/Frameworks/GooglePlaces.framework/Versions/A/Modules/module.modulemap +++ /dev/null @@ -1,19 +0,0 @@ -framework module GooglePlaces { umbrella header "GooglePlaces.h" -header "GMSAddressComponent.h" -header "GMSAutocompleteFetcher.h" -header "GMSAutocompleteFilter.h" -header "GMSAutocompleteMatchFragment.h" -header "GMSAutocompletePrediction.h" -header "GMSAutocompleteResultsViewController.h" -header "GMSAutocompleteTableDataSource.h" -header "GMSAutocompleteViewController.h" -header "GMSPlace.h" -header "GMSPlaceLikelihood.h" -header "GMSPlaceLikelihoodList.h" -header "GMSPlacePhotoMetadata.h" -header "GMSPlacePhotoMetadataList.h" -header "GMSPlaceTypes.h" -header "GMSPlacesClient.h" -header "GMSPlacesErrors.h" -header "GMSUserAddedPlace.h" -export * module * { export * } } diff --git a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/Info.plist b/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/Info.plist deleted file mode 100755 index b55ea89..0000000 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/Info.plist and /dev/null differ 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 deleted file mode 100755 index fe60c57..0000000 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/es_419.lproj/GooglePlaces.strings and /dev/null differ 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 deleted file mode 100755 index fe60c57..0000000 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/es_MX.lproj/GooglePlaces.strings and /dev/null differ 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 deleted file mode 100755 index 3035344..0000000 Binary files a/Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle/oss_licenses_places.txt.gz and /dev/null differ diff --git a/Frameworks/GooglePlaces.framework/Versions/Current b/Frameworks/GooglePlaces.framework/Versions/Current deleted file mode 120000 index 8c7e5a6..0000000 --- a/Frameworks/GooglePlaces.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/GooglePlacesRow.podspec b/GooglePlacesRow.podspec index 78816de..4c70d97 100644 --- a/GooglePlacesRow.podspec +++ b/GooglePlacesRow.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "GooglePlacesRow" - s.version = "2.1.0" + s.version = "3.0.0" s.summary = "A row extension for Eureka that allows the user to pick a place based on Google Places autocomplete feature" s.homepage = "https://github.com/EurekaCommunity/GooglePlacesRow" s.license = { type: 'MIT', file: 'LICENSE' } @@ -11,7 +11,7 @@ Pod::Spec.new do |s| s.requires_arc = true s.ios.source_files = 'Sources/**/*' s.ios.frameworks = 'UIKit', 'Foundation' - s.dependency 'Eureka' , '~> 3.0' + s.dependency 'Eureka' , '~> 4.0' s.libraries = "c++", "icucore", "z" # required for GoogleMaps.framework 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" diff --git a/GooglePlacesRow.xcodeproj/project.pbxproj b/GooglePlacesRow.xcodeproj/project.pbxproj index acdf28a..d2d5e4e 100644 --- a/GooglePlacesRow.xcodeproj/project.pbxproj +++ b/GooglePlacesRow.xcodeproj/project.pbxproj @@ -93,7 +93,7 @@ 8F79C23A1D9C018300EE6D27 /* Eureka.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Eureka.xcodeproj; path = Eureka/Eureka.xcodeproj; sourceTree = ""; }; 8F965AA01D4BDDBD00F2CB0B /* GoogleMapsBase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GoogleMapsBase.framework; path = Frameworks/GoogleMapsBase.framework; sourceTree = ""; }; 8F965AA21D4BDDBF00F2CB0B /* GooglePlaces.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GooglePlaces.framework; path = Frameworks/GooglePlaces.framework; sourceTree = ""; }; - 8F965AA41D4BDDDB00F2CB0B /* GooglePlaces.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = GooglePlaces.bundle; path = Frameworks/GooglePlaces.framework/Versions/A/Resources/GooglePlaces.bundle; sourceTree = ""; }; + 8F965AA41D4BDDDB00F2CB0B /* GooglePlaces.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = GooglePlaces.bundle; path = Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -278,15 +278,15 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 0920; TargetAttributes = { 28F8287C1C494B2C00330CF4 = { CreatedOnToolsVersion = 7.2; - LastSwiftMigration = 0800; + LastSwiftMigration = 0920; }; 28F828861C494B2C00330CF4 = { CreatedOnToolsVersion = 7.2; - LastSwiftMigration = 0800; + LastSwiftMigration = 0920; }; }; }; @@ -390,14 +390,20 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -444,14 +450,20 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -505,7 +517,8 @@ PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.GooglePlacesRow; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -530,7 +543,8 @@ PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.GooglePlacesRow; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; }; name = Release; }; @@ -543,7 +557,8 @@ PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.GooglePlacesRowTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -555,7 +570,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.GooglePlacesRowTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; }; name = Release; }; diff --git a/GooglePlacesRow.xcodeproj/xcshareddata/xcschemes/GooglePlacesRow.xcscheme b/GooglePlacesRow.xcodeproj/xcshareddata/xcschemes/GooglePlacesRow.xcscheme index 16b5911..725afda 100644 --- a/GooglePlacesRow.xcodeproj/xcshareddata/xcschemes/GooglePlacesRow.xcscheme +++ b/GooglePlacesRow.xcodeproj/xcshareddata/xcschemes/GooglePlacesRow.xcscheme @@ -1,6 +1,6 @@ Platform iOS -Swift 2 compatible -Swift 2 compatible +Swift 3 compatible CocoaPods compatible License: MIT

By [Xmartlabs SRL](http://EurekaCommunity.com). -**Current Google Places version used is 2.2 (in version 2.1.0)** +**Current Google Places version used is 2.5 ** -**Swift 3 is supported from version 2.0** +**Swift 4 is supported from version 3.0** ## Contents diff --git a/Sources/GooglePlacesCell.swift b/Sources/GooglePlacesCell.swift index a64bb8d..ecb0567 100644 --- a/Sources/GooglePlacesCell.swift +++ b/Sources/GooglePlacesCell.swift @@ -82,7 +82,7 @@ open class GooglePlacesCell: _FieldCell, CellType { /** Function called when the Google Places autocomplete timer is fired */ - func timerFired(_ timer: Timer?) { + @objc func timerFired(_ timer: Timer?) { autocompleteTimer?.invalidate() autocompleteTimer = nil autocomplete()