diff --git a/README.md b/README.md index acda61a6c..8f9ff5e9f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,9 @@ # What is this? -This plugin offers support to receive and handle native push notifications with a **single unified API**, and **with no dependency on any other plugins**. +This plugin offers support to receive and handle native push notifications with a **single unified API**. + +Starting with version `1.9.0`, this plugin will support `CocoaPods` installation of the `Google Cloud Messaging` library. More details are available in the [Installation](docs/INSTALLATION.md#cocoapods) documentation. - [Reporting Issues](docs/ISSUES.md) - [Installation](docs/INSTALLATION.md) diff --git a/docs/INSTALLATION.md b/docs/INSTALLATION.md index 3bd777f0f..e0071010f 100644 --- a/docs/INSTALLATION.md +++ b/docs/INSTALLATION.md @@ -11,8 +11,9 @@ - [Browser quirks](#browser-quirks) - [Browser Support](#browser-support) - [iOS details](#ios-details) - - [XCode](#xcode) + - [Xcode](#xcode) - [Bitcode](#bitcode) + - [CocoaPods](#cocoapods) - [Additional Resources](#additional-resources) This requires phonegap/cordova CLI 5.0+ @@ -191,9 +192,9 @@ Firefox 46+ ## iOS details -### XCode +### Xcode -XCode version 7.0 or greater is required for building this plugin. +Xcode version 7.0 or greater is required for building this plugin. ### Bitcode @@ -209,6 +210,25 @@ You have two options. The first is to [disable bitcode as per this StackOverflow cordova platform update ios@4.0.0 ``` +### CocoaPods + +Required `cordova-cli` version: `6.4.0` + +Required `cordova-ios` version: `4.3.0` + +Version `1.9.0` (and above) of this plugin supports [CocoaPods](https://cocoapods.org) installation of the [Google Cloud Messaging](https://cocoapods.org/pods/GoogleCloudMessaging) library. + +If you are installing this plugin using `npm`, and you are using version `6.1.0` or greater of the `cordova-cli`, it will automatically download the right version of this plugin for both your platform and cli. + +If you are on a `cordova-cli` version less than `6.1.0`, you will either have to upgrade your `cordova-cli` version, or install the plugin explicitly: + +i.e. +``` +cordova plugin add phonegap-plugin-push@1.8.1 +``` + +If you are installing this plugin using a `local file reference` or a `git url`, you will have to specify the version of this plugin explicitly (see above) if you don't fulfill the `cordova-cli` and `cordova-ios` requirements. + ## Additional Resources The push plugin enables you to play sounds and display different icons during push (Android only). These additional resources need to be added to your projects `platforms` directory in order for them to be included into your final application binary. One way of doing it is to create a hook to do the copying for you on each build. diff --git a/package.json b/package.json index 48f63f869..3149c8b89 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "phonegap-plugin-push", "description": "Register and receive push notifications.", - "version": "1.8.4", + "version": "1.9.0", "homepage": "http://github.com/phonegap/phonegap-plugin-push#readme", "repository": { "type": "git", @@ -36,9 +36,12 @@ "cordova-android": ">=4.0.0", "cordova-ios": ">=4.1.0" }, + "1.9.0": { + "cordova-ios": ">=4.3.0", + "cordova": ">=6.4.0" + }, "2.0.0": { - "cordova": ">100" - } + "cordova": ">100" } }, "author": "Adobe PhoneGap Team", diff --git a/plugin.xml b/plugin.xml index 615332a35..7391c372a 100755 --- a/plugin.xml +++ b/plugin.xml @@ -1,5 +1,5 @@ - + PushPlugin This plugin allows your application to receive push notifications on Android, iOS and Windows devices. @@ -12,9 +12,9 @@ - + - + @@ -95,52 +95,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -151,4 +113,4 @@ - \ No newline at end of file + diff --git a/src/ios/GGLInstanceID/Headers/Public/GGLInstanceID.h b/src/ios/GGLInstanceID/Headers/Public/GGLInstanceID.h deleted file mode 100644 index 749144089..000000000 --- a/src/ios/GGLInstanceID/Headers/Public/GGLInstanceID.h +++ /dev/null @@ -1,277 +0,0 @@ -#if GMP_NO_MODULES -#import -#else -@import Foundation; -#endif - -@class GGLInstanceIDConfig; - -/** - * @memberof GGLInstanceID - * - * The key for APNS token to be included in the options dictionary when - * registering for GCM (Google Cloud Messaging). The value should be a - * NSData object that represents the APNS token for the app. This - * key is required to get a GCM token. - */ -FOUNDATION_EXPORT NSString *const kGGLInstanceIDRegisterAPNSOption; - -/** - * @memberof GGLInstanceID - * - * The key to specify if the APNS token type is sandbox or production. Set - * to YES if the app was built with Sandbox certificate else NO for production. - * At any point of time InstanceID library will support only one type of token. - */ -FOUNDATION_EXPORT NSString *const kGGLInstanceIDAPNSServerTypeSandboxOption; - -/** - * @memberof GGLInstanceID - * - * The scope to be used when fetching/deleting a token for - * GCM (Google Cloud Messaging). - */ -FOUNDATION_EXPORT NSString *const kGGLInstanceIDScopeGCM; - -/** - * @related GGLInstanceID - * - * The completion handler invoked when the InstanceID token returns. If - * the call fails we return the appropriate `error code` as described below. - * - * @param token The valid token as returned by InstanceID backend. - * - * @param error The error describing why generating a new token - * failed. See the error codes below for a more detailed - * description. - */ -typedef void(^GGLInstanceIDTokenHandler)(NSString *token, NSError *error); - - -/** - * @related GGLInstanceID - * - * The completion handler invoked when the InstanceID `deleteToken` returns. If - * the call fails we return the appropriate `error code` as described below - * - * @param error The error describing why deleting the token failed. - * See the error codes below for a more detailed description. - */ -typedef void(^GGLInstanceIDDeleteTokenHandler)(NSError *error); - -/** - * @related GGLInstanceID - * - * The completion handler invoked when the app identity is created. If the - * identity wasn't created for some reason we return the appropriate error code. - * - * @param identity A valid identity for the app instance, nil if there was an error - * while creating an identity. - * @param error The error if fetching the identity fails else nil. - */ -typedef void(^GGLInstanceIDHandler)(NSString *identity, NSError *error); - -/** - * @related GGLInstanceID - * - * The completion handler invoked when the app identity and all the tokens associated - * with it are deleted. Returns a valid error object in case of failure else nil. - * - * @param error The error if deleting the identity and all the tokens associated with - * it fails else nil. - */ -typedef void(^GGLInstanceIDDeleteHandler)(NSError *error); - -/** - * @enum GGLInstanceIDOperationErrorCode - * Description of error codes - */ -typedef NS_ENUM(NSUInteger, GGLInstanceIDOperationErrorCode) { - // Http related errors. - - /// InvalidRequest -- Some parameters of the request were invalid. - kGGLInstanceIDOperationErrorCodeInvalidRequest = 0, - - /// Auth Error -- GCM couldn't validate request from this client. - kGGLInstanceIDOperationErrorCodeAuthentication = 1, - - /// NoAccess -- InstanceID service cannot be accessed. - kGGLInstanceIDOperationErrorCodeNoAccess = 2, - - /// Timeout -- Request to InstanceID backend timed out. - kGGLInstanceIDOperationErrorCodeTimeout = 3, - - - /// Network -- No network available to reach the servers. - kGGLInstanceIDOperationErrorCodeNetwork = 4, - - /// OperationInProgress -- Another similar operation in progress, - /// bailing this one. - kGGLInstanceIDOperationErrorCodeOperationInProgress = 5, - - /// Unknown error. - kGGLInstanceIDOperationErrorCodeUnknown = 7, - - // InstanceID specific errors - - /* - * Generic errors. - */ - - // Device seems to be missing a valid deviceID. Cannot - // authenticate device requests. - kGGLInstanceIDOperationErrorCodeMissingDeviceID = 501, - - /** - * Token specific errors. - */ - - /// GCM token request is missing APNS token. - kGGLInstanceIDOperationErrorCodeMissingAPNSToken = 1001, - - /// GCM token request is missing server type. - kGGLInstanceIDOperationErrorCodeMissingAPNSServerType = 1002, - - /// Token request has invalid authorizedEntity. - kGGLInstanceIDOperationErrorCodeInvalidAuthorizedEntity = 1003, - - /// Token request has invalid scope. - kGGLInstanceIDOperationErrorCodeInvalidScope = 1004, - - /// Should call `startWithConfig:` before requesting token. - kGGLInstanceIDOperationErrorCodeInvalidStart = 1005, - - /// KeyPair access error. - kGGLInstanceIDOperationErrorCodeInvalidKeyPair = 1006, - - /** - * Identity specific errors. - */ - - /// Missing KeyPair. - kGGLInstanceIDOperationErrorCodeMissingKeyPair = 2001, -}; - -/** - * Instance ID provides a unique identifier for each app instance and a mechanism - * to authenticate and authorize actions (for example, sending a GCM message). - * - * Instance ID is long lived but, may be reset if the device is not used for - * a long time or the Instance ID service detects a problem. - * If Instance ID is reset, the app will be notified with a callback to - * [GGLInstanceIDDelegate onTokenRefresh] - * - * If the Instance ID has become invalid, the app can request a new one and - * send it to the app server. - * To prove ownership of Instance ID and to allow servers to access data or - * services associated with the app, call - * `[GGLInstanceID tokenWithAuthorizedEntity:scope:options:handler]`. - */ -@interface GGLInstanceID : NSObject - -/** - * GGLInstanceID. - * - * @return A shared instance of GGLInstanceID. - */ -+ (instancetype)sharedInstance; - -/** - * Start `GGLInstanceID` with the specified config. - * - * @see GGLInstanceIDConfig - * - * @param config The `GGLInstanceIDConfig` used to build the service. - */ -- (void)startWithConfig:(GGLInstanceIDConfig *)config; - -/** - * Stop any network requests started by the client and release any handlers - * associated with it. - */ -- (void)stopAllRequests; - -#pragma mark - Tokens - -/** - * Returns a token that authorizes an Entity (example: cloud service) to perform - * an action on behalf of the application identified by Instance ID. - * - * This is similar to an OAuth2 token except, it applies to the - * application instance instead of a user. - * - * This is an asynchronous call. If the token fetching fails for some reason - * we invoke the completion callback with nil `token` and the appropriate - * error. - * - * Note, you can only have one `token` or `deleteToken` call for a given - * authorizedEntity and scope at any point of time. Making another such call with the - * same authorizedEntity and scope before the last one finishes will result in an - * error with code `OperationInProgress`. - * - * @see GGLInstanceID deleteTokenWithAuthorizedEntity:scope:handler: - * - * @param authorizedEntity Entity authorized by the token. - * @param scope Action authorized for authorizedEntity. - * @param options The extra options to be sent with your token request. The - * value for the `apns_token` should be the NSData object - * passed to UIApplication's - * `didRegisterForRemoteNotificationsWithDeviceToken` method. - * All other keys and values in the options dict need to be - * instances of NSString or else they will be discarded. Bundle - * keys starting with 'GCM.' and 'GOOGLE.' are reserved. - * @param handler The callback handler which is invoked when the token is - * successfully fetched. In case of success a valid `token` and - * `nil` error are returned. In case of any error the `token` - * is nil and a valid `error` is returned. The valid error - * codes have been documented above. - */ -- (void)tokenWithAuthorizedEntity:(NSString *)authorizedEntity - scope:(NSString *)scope - options:(NSDictionary *)options - handler:(GGLInstanceIDTokenHandler)handler; - -/** - * Revokes access to a scope (action) for an entity previously - * authorized by `[GGLInstanceID tokenWithAuthorizedEntity:scope:options:handler]`. - * - * This is an asynchronous call. Call this on the main thread since InstanceID lib - * is not thread safe. In case token deletion fails for some reason we invoke the - * `handler` callback passed in with the appropriate error code. - * - * Note, you can only have one `token` or `deleteToken` call for a given - * authorizedEntity and scope at a point of time. Making another such call with the - * same authorizedEntity and scope before the last one finishes will result in an error - * with code `OperationInProgress`. - * - * @param authorizedEntity Entity that must no longer have access. - * @param scope Action that entity is no longer authorized to perform. - * @param handler The handler that is invoked once the unsubscribe call ends. - * In case of error an appropriate error object is returned - * else error is nil. - */ -- (void)deleteTokenWithAuthorizedEntity:(NSString *)authorizedEntity - scope:(NSString *)scope - handler:(GGLInstanceIDDeleteTokenHandler)handler; - -#pragma mark - Identity - -/** - * Asynchronously fetch a stable identifier that uniquely identifies the app - * instance. If the identifier has been revoked or has expired, this method will - * return a new identifier. - * - * - * @param handler The handler to invoke once the identifier has been fetched. - * In case of error an appropriate error object is returned else - * a valid identifier is returned and a valid identifier for the - * application instance. - */ -- (void)getIDWithHandler:(GGLInstanceIDHandler)handler; - -/** - * Resets Instance ID and revokes all tokens. - */ -- (void)deleteIDWithHandler:(GGLInstanceIDDeleteHandler)handler; - -@end diff --git a/src/ios/GGLInstanceID/Headers/Public/GGLInstanceIDConfig.h b/src/ios/GGLInstanceID/Headers/Public/GGLInstanceIDConfig.h deleted file mode 100644 index 7d6b3b4d0..000000000 --- a/src/ios/GGLInstanceID/Headers/Public/GGLInstanceIDConfig.h +++ /dev/null @@ -1,32 +0,0 @@ -@protocol GGLInstanceIDDelegate; - -typedef NS_ENUM(int8_t, GGLInstanceIDLogLevel) { - kGGLInstanceIDLogLevelDebug, - kGGLInstanceIDLogLevelInfo, - kGGLInstanceIDLogLevelError, - kGGLInstanceIDLogLevelAssert, -}; - -/** - * The config used to configure different options in GGLInstanceID library. - */ -@interface GGLInstanceIDConfig : NSObject - -/** - * Set the GGLInstanceIDDelegate to receive callbacks. - * - * @see GGLInstanceIDDelegate - */ -@property(nonatomic, readwrite, weak) id delegate; - -// the log level for the GGLInstanceID library. -@property(nonatomic, readwrite, assign) GGLInstanceIDLogLevel logLevel; - -/** - * Initialize a default config with logLevel set to `kGGLInstanceIDLogLevelError`. - * - * @return A default config for GGLInstanceID. - */ -+ (instancetype)defaultConfig; - -@end diff --git a/src/ios/GGLInstanceID/Headers/Public/GGLInstanceIDDelegate.h b/src/ios/GGLInstanceID/Headers/Public/GGLInstanceIDDelegate.h deleted file mode 100644 index dc706a2d9..000000000 --- a/src/ios/GGLInstanceID/Headers/Public/GGLInstanceIDDelegate.h +++ /dev/null @@ -1,13 +0,0 @@ -@protocol GGLInstanceIDDelegate - -/** - * Called when the system determines that tokens need to be refreshed. - * This method is also called if Instance ID has been reset in which - * case, tokens and `GcmPubSub` subscriptions also need to be refreshed. - * - * Instance ID service will throttle the refresh event across all devices - * to control the rate of token updates on application servers. - */ -- (void)onTokenRefresh; - -@end diff --git a/src/ios/GGLInstanceID/Headers/Public/GGLInstanceIDHeaders.h b/src/ios/GGLInstanceID/Headers/Public/GGLInstanceIDHeaders.h deleted file mode 100644 index 2aa4edddb..000000000 --- a/src/ios/GGLInstanceID/Headers/Public/GGLInstanceIDHeaders.h +++ /dev/null @@ -1,4 +0,0 @@ -#import "GGLInstanceID.h" -#import "GGLInstanceIDConfig.h" -#import "GGLInstanceIDDelegate.h" - diff --git a/src/ios/GGLInstanceID/Libraries/libGGLInstanceIDLib.a b/src/ios/GGLInstanceID/Libraries/libGGLInstanceIDLib.a deleted file mode 100644 index 4107fff44..000000000 Binary files a/src/ios/GGLInstanceID/Libraries/libGGLInstanceIDLib.a and /dev/null differ diff --git a/src/ios/Google/Headers/GGLCloudMessaging/Public/CloudMessaging.h b/src/ios/Google/Headers/GGLCloudMessaging/Public/CloudMessaging.h deleted file mode 100755 index a7a83fbf3..000000000 --- a/src/ios/Google/Headers/GGLCloudMessaging/Public/CloudMessaging.h +++ /dev/null @@ -1,8 +0,0 @@ -#import "Core.h" - -#import "GCMConfig.h" -#import "GCMPubSub.h" -#import "GCMService.h" -#import "GGLContext+CloudMessaging.h" -#import "GGLInstanceIDHeaders.h" -#import "GoogleCloudMessaging.h" diff --git a/src/ios/Google/Headers/GGLCloudMessaging/Public/GGLContext+CloudMessaging.h b/src/ios/Google/Headers/GGLCloudMessaging/Public/GGLContext+CloudMessaging.h deleted file mode 100755 index ec6f71b32..000000000 --- a/src/ios/Google/Headers/GGLCloudMessaging/Public/GGLContext+CloudMessaging.h +++ /dev/null @@ -1,122 +0,0 @@ -#import "GGLContext.h" - -#import "GGLInstanceIDHeaders.h" -#import "GoogleCloudMessaging.h" - -@class GCMConfig; - -/** - * This category extends |GGLContext| with Google Cloud Messaging. To integrate - * Google Cloud Messaging import import GGLContext+CloudMessaging.h. - * - * |[GGLContext sharedInstance].gcmSenderID| should be ready to use after calling - * -[[GGLContext sharedInstance] configureWithError:]. Functions - * -[fetchInstanceIDTokenWithAPNSToken:handler:], -[connectToGCMWithHandler:] and - * -[disconnectFromGCM] can be then used. - * - * @see GGLContext - */ -@interface GGLContext (CloudMessaging) - -/** - * The Project Number used to configure Google Cloud Messaging. - * It will be ready to use once -[[GGLContext sharedInstance] configureWithError:] is called. - * - * @see GGLContext configure - */ -@property(nonatomic, readonly, strong) NSString *gcmSenderID; - -/** - * Provides a token identifying this instance of the app, which can be used by a remote server to - * push messages to this client. It will only be ready to use after - * -[[GGLContext sharedInstance] configureWithError:] has been called and - * -[fetchInstanceIDTokenWithAPNSToken:handler:]'s completion handler has been invoked. - * - * @see GGLContext configure - */ -@property(nonatomic, readonly, strong) NSString *registrationToken; - -/** - * Gets an InstanceID token scoped for GCM using the gcmSenderID. This allows the app to receive - * push notifications using Apple Push Notification Service (APNS). - * - * This method should be called on app launch after - * -[[GGLContext sharedInstance] configureWithError:] has completed. - * - * @param apnsToken The APNS token returned from UIApplication's - * didRegisterForRemoteNotificationsWithDeviceToken method. - * @param handler The handler to be invoked once the InstanceID token has been successfully - * fetched. - */ -- (void)fetchInstanceIDTokenWithAPNSToken:(NSData *)apnsToken - handler:(GGLInstanceIDTokenHandler)handler; - -/** - * Start the Google Cloud Messaging service after setting the appropriate properties. - * Call this only once during the lifetime of the app before you start using Google - * Cloud Messaging. - * - * Uses the default config to start the service. The log level is set to DEBUG and - * it does not provide an implementation for `GCMReceiverDelegate`. - */ -- (void)startGCMService; - -/** - * Start the Google Cloud Messaging service with the given config. - * Call this only once during the lifetime of the app before you start using Google - * Cloud Messaging. - * - * @param config The GCMConfig used to start the service. - */ -- (void)startGCMServiceWithConfig:(GCMConfig *)config; - -/** - * Stop the Google Cloud Messaging service. Stop all the operations associated with it - * and clear any objects or data associated with it. Call this only once during the - * lifetime of your app when you don't want to use Google Cloud Messaging anymore. - */ -- (void)stopGCMService; - -/** - * Creates a connection to Google Cloud Messaging, which will be used to receive push and topic - * notifications when the app is in the foreground, and to send upstream messages. - * It will also be used to send ACKS and other messages based on the GCM protocol. - * - * This method should be called on app launch after - * -[[GGLContext sharedInstance] configureWithError:], in - * -[fetchInstanceIDTokenWithAPNSToken:handler:]'s completion handler. As well as each time the - * app enters the foreground. - * - * @param handler The handler to be invoked once the GCM connection has been established. - * If a connection cannot be established, this will be invoked with an - * error and the process will retry using an exponential backoff. - */ -- (void)connectToGCMWithHandler:(GCMServiceConnectCompletion)handler; - -/** - * Closes an existing connection to GCM, if present. Disables connection retries if the connection - * has not yet been established. - * - * This method should be called each time the app enters the background or terminates. - */ -- (void)disconnectFromGCM; - -/** - * Subscribe to a GCM pubsub topic. The topic name should match the regex - * "/topics/[a-zA-Z0-9-_.~%]{1,900}". - * - * @param topic The topic to subscribe to. - * @param handler The completion handler to invoke when the subscription request finishes. - */ -- (void)subscribeToTopic:(NSString *)topic withHandler:(GCMPubSubCompletion)handler; - -/** - * Unsubscribe the client from a GCM pubsub topic. The topic name should match the regex - * "/topics/[a-zA-Z0-9-_.~%]{1,900}". - * - * @param topic The topic to unsubscribe from. - * @param handler The completion handler to invoke when the unsubsribe request finishes. - */ -- (void)unsubscribeFromTopic:(NSString *)topic withHandler:(GCMPubSubCompletion)handler; - -@end diff --git a/src/ios/Google/Headers/GGLCore/Public/Core.h b/src/ios/Google/Headers/GGLCore/Public/Core.h deleted file mode 100755 index 98b3973ea..000000000 --- a/src/ios/Google/Headers/GGLCore/Public/Core.h +++ /dev/null @@ -1,6 +0,0 @@ -#import -#import - -#import "GGLConfiguration.h" -#import "GGLContext.h" -#import "GGLErrorCode.h" diff --git a/src/ios/Google/Headers/GGLCore/Public/GGLConfiguration.h b/src/ios/Google/Headers/GGLCore/Public/GGLConfiguration.h deleted file mode 100755 index bacd31ad2..000000000 --- a/src/ios/Google/Headers/GGLCore/Public/GGLConfiguration.h +++ /dev/null @@ -1,90 +0,0 @@ -#import - -/** - * This class provides configuration fields of Google APIs. - */ -@interface GGLConfiguration : NSObject - -/** - * A secret iOS API key used for authenticating requests from your app, e.g. - * @"AIzaSyDdVgKwhZl0sTTTLZ7iTmt1r3N2cJLnaDk", used to identify your app to Google servers. - */ -@property(nonatomic, readonly, copy) NSString *apiKey; - -/** - * The OAuth2 client ID for iOS application used to authenticate Google users, for example - * @"12345.apps.googleusercontent.com", used for signing in with Google. - */ -@property(nonatomic, readonly, copy) NSString *clientID; - -/** - * The tracking ID for Google Analytics, e.g. @"UA-12345678-1", used to configure Google Analytics. - */ -@property(nonatomic, readonly, copy) NSString *trackingID; - -/** - * Mobile Ads' Ad Unit ID for a banner view, for example @"ca-app-pub-1234567890", used for - * displaying ads view. - */ -@property(nonatomic, readonly, copy) NSString *bannerAdUnitID; - -/** - * Mobile Ads' Ad Unit ID for an interstitial view, for example @"ca-app-pub-1234567890", used for - * displaying ads view. - */ -@property(nonatomic, readonly, copy) NSString *interstitialAdUnitID; - -/** - * The Project Number from the Google Developer's console, for example @"012345678901", used to - * configure Google Cloud Messaging. - */ -@property(nonatomic, readonly, copy) NSString *gcmSenderID; - -/** - * The Android client ID used in Google AppInvite when an iOS app has its Android version, for - * example @"12345.apps.googleusercontent.com". - */ -@property(nonatomic, readonly, copy) NSString *androidClientID; - -/** - * The Google App ID that is used to uniquely identify an instance of an app. - */ -@property(nonatomic, readonly, copy) NSString *googleAppID; - -/** - * Whether or not Ads was enabled in the developer console. - */ -@property(nonatomic, readonly) BOOL isAdsEnabled; - -/** - * Whether or not Analytics was enabled in the developer console. - */ -@property(nonatomic, readonly) BOOL isAnalyticsEnabled; - -/** - * Whether or not AppInvite was enabled in the developer console. - */ -@property(nonatomic, readonly) BOOL isAppInviteEnabled; - -/** - * Whether or not GCM was enabled in the developer console. - */ -@property(nonatomic, readonly) BOOL isGCMEnabled; - -/** - * Whether or not Measurement was enabled. Measurement is enabled unless explicitly disabled in - * GoogleService-Info.plist. - */ -@property(nonatomic, readonly) BOOL isMeasurementEnabled; - -/** - * Whether or not SignIn was enabled in the developer console. - */ -@property(nonatomic, readonly) BOOL isSignInEnabled; - -/** - * The version ID of the client library, e.g. @"1100000". - */ -@property(nonatomic, readonly, copy) NSString *libraryVersionID; - -@end diff --git a/src/ios/Google/Headers/GGLCore/Public/GGLContext.h b/src/ios/Google/Headers/GGLCore/Public/GGLContext.h deleted file mode 100755 index 503f980f7..000000000 --- a/src/ios/Google/Headers/GGLCore/Public/GGLContext.h +++ /dev/null @@ -1,59 +0,0 @@ -#import - -@class GGLConfiguration; - -/** - * Main entry point for Google API core configuration. Google services such as AdMob, Analytics, - * AppInvite, CloudMessaging, SignIn, etc can be configured via this class and its categories. - * See GGLContext+ServiceName for details on the individual APIs. Generally, you will import those - * files directly rather than import the GGLContext.h header itself. - * - * Once the appropriate categories are imported, you can configure all services via the - * |configureWithError:| method, for example: - * - *
- * NSError* configureError;
- * [[GGLContext sharedInstance] configureWithError: &configureError];
- * if (configureError != nil) {
- *   NSLog(@"Error configuring the Google context: %@", configureError);
- * }
- * 
- * - * The method |configureWithError:| will read from the file GoogleServices-Info.plist bundled with - * your app target for the keys to configure each individual API. To generate your - * GoogleServices-Info.plist, please go to https://developers.google.com/mobile/add - * - * @see GGLContext (AdMob) - * @see GGLContext (Analytics) - * @see GGLContext (AppInvite) - * @see GGLContext (CloudMessaging) - * @see GGLContext (SignIn) - */ -@interface GGLContext : NSObject - -/** - * The configuration details for various Google APIs. - */ -@property(nonatomic, readonly, strong) GGLConfiguration *configuration; - -/** - * Get the shared instance of the GGLContext. - * @return the shared instance - */ -+ (instancetype)sharedInstance; - -/** - * Configures all the Google services integrated. This method should be called after the app is - * launched and before using other Google services. The services will be available in categories - * that extend this class, such as GGLContext+AdMob. - * - * @param error Pointer to an NSError that can be used an out param to report the status of this - * operation. After the call the error object will be nil if the operation is succesful, - * otherwise contains an appropriate NSError value. Parameter cannot be passed as nil - * - * @warning error must not be nil. - * - */ -- (void)configureWithError:(NSError **)error; - -@end diff --git a/src/ios/Google/Headers/GGLCore/Public/GGLErrorCode.h b/src/ios/Google/Headers/GGLCore/Public/GGLErrorCode.h deleted file mode 100755 index 492057fef..000000000 --- a/src/ios/Google/Headers/GGLCore/Public/GGLErrorCode.h +++ /dev/null @@ -1,56 +0,0 @@ -/** Error codes in Greenhouse error domain. */ -typedef enum { - /** - * Operation succeeded. - */ - kGGLErrorCodeSucceeded = 0, - /** - * Default failure error code. This is a catch all error and indicates something has gone very - * wrong. There is no remediation for this case. - **/ - kGGLErrorCodeUnknownFailure = -1, - - /** - * Indicates that the calling method did not do anything in response to the call. This occurs in - * situations where the caller asked state to be mutated into its current state or selector wasn't - * present but it isn't considered a critical failure.. - */ - kGGLErrorCodeNoOp = -2, - - // 100 series error codes are for GGLContext - /** - * Loading data from the GoogleService-Info.plist file failed. This is a fatal error and should - * not be ignored. Further calls to the API will fail and/or possibly cause crashes. - */ - kGGLErrorCodeInvalidPlistFile = -100, - - /** - * Configuration of AdMob subspec failed. Additional details on the reason for the failure - * appear in the related NSError. - */ - kGGLErrorCodeAdMobSubspecConfigFailed = -101, - - /** - * Configuration of Analytics subspec failed. Additional details on the reason for the failure - * appear in the related NSError. - */ - kGGLErrorCodeAnalyticsSubspecConfigFailed = -102, - - /** - * Configuration of AppInvite subspec failed. Additional details on the reason for the failure - * appear in the related NSError. - */ - kGGLErrorCodeAppInviteSubspecConfigFailed = -103, - - /** - * Configuration of CloudMessaging subspec failed. Additional details on the reason for the failure - * appear in the related NSError. - */ - kGGLErrorCodeCloudMessagingSubspecConfigFailed = -104, - - /** - * Configuration of SignIn subspec failed. Additional details on the reason for the failure appear - * in the related NSError. - */ - kGGLErrorCodeSignInSubspecConfigFailed = -105, -} GGLErrorCode; diff --git a/src/ios/Google/Headers/ModuleHeaders/AdMob-Module.h b/src/ios/Google/Headers/ModuleHeaders/AdMob-Module.h deleted file mode 100755 index c2e44951b..000000000 --- a/src/ios/Google/Headers/ModuleHeaders/AdMob-Module.h +++ /dev/null @@ -1,5 +0,0 @@ -#if defined(__has_include) -# if __has_include() -# include -# endif -#endif diff --git a/src/ios/Google/Headers/ModuleHeaders/Analytics-Module.h b/src/ios/Google/Headers/ModuleHeaders/Analytics-Module.h deleted file mode 100755 index 47108cca2..000000000 --- a/src/ios/Google/Headers/ModuleHeaders/Analytics-Module.h +++ /dev/null @@ -1,5 +0,0 @@ -#if defined(__has_include) -# if __has_include() -# include -# endif -#endif diff --git a/src/ios/Google/Headers/ModuleHeaders/AppInvite-Module.h b/src/ios/Google/Headers/ModuleHeaders/AppInvite-Module.h deleted file mode 100755 index e9196d055..000000000 --- a/src/ios/Google/Headers/ModuleHeaders/AppInvite-Module.h +++ /dev/null @@ -1,5 +0,0 @@ -#if defined(__has_include) -# if __has_include() -# include -# endif -#endif diff --git a/src/ios/Google/Headers/ModuleHeaders/CloudMessaging-Module.h b/src/ios/Google/Headers/ModuleHeaders/CloudMessaging-Module.h deleted file mode 100755 index a55b09a78..000000000 --- a/src/ios/Google/Headers/ModuleHeaders/CloudMessaging-Module.h +++ /dev/null @@ -1,5 +0,0 @@ -#if defined(__has_include) -# if __has_include() -# include -# endif -#endif diff --git a/src/ios/Google/Headers/ModuleHeaders/Core-Module.h b/src/ios/Google/Headers/ModuleHeaders/Core-Module.h deleted file mode 100755 index 9b9514557..000000000 --- a/src/ios/Google/Headers/ModuleHeaders/Core-Module.h +++ /dev/null @@ -1,5 +0,0 @@ -#if defined(__has_include) -# if __has_include() -# include -# endif -#endif diff --git a/src/ios/Google/Headers/ModuleHeaders/SignIn-Module.h b/src/ios/Google/Headers/ModuleHeaders/SignIn-Module.h deleted file mode 100755 index cdba6f8dd..000000000 --- a/src/ios/Google/Headers/ModuleHeaders/SignIn-Module.h +++ /dev/null @@ -1,5 +0,0 @@ -#if defined(__has_include) -# if __has_include() -# include -# endif -#endif diff --git a/src/ios/Google/Headers/module.modulemap b/src/ios/Google/Headers/module.modulemap deleted file mode 100755 index 3df592c91..000000000 --- a/src/ios/Google/Headers/module.modulemap +++ /dev/null @@ -1,27 +0,0 @@ -module Google { - export * - module AdMob { - header "ModuleHeaders/AdMob-Module.h" - export * - } - module Analytics { - header "ModuleHeaders/Analytics-Module.h" - export * - } - module AppInvite { - header "ModuleHeaders/AppInvite-Module.h" - export * - } - module CloudMessaging { - header "ModuleHeaders/CloudMessaging-Module.h" - export * - } - module Core { - header "ModuleHeaders/Core-Module.h" - export * - } - module SignIn { - header "ModuleHeaders/SignIn-Module.h" - export * - } -} diff --git a/src/ios/Google/Libraries/libGGLCloudMessaging.a b/src/ios/Google/Libraries/libGGLCloudMessaging.a deleted file mode 100644 index 1672c7b92..000000000 Binary files a/src/ios/Google/Libraries/libGGLCloudMessaging.a and /dev/null differ diff --git a/src/ios/Google/Libraries/libGGLCore.a b/src/ios/Google/Libraries/libGGLCore.a deleted file mode 100644 index f7aa8b85e..000000000 Binary files a/src/ios/Google/Libraries/libGGLCore.a and /dev/null differ diff --git a/src/ios/GoogleCloudMessaging/Headers/Public/GCMConfig.h b/src/ios/GoogleCloudMessaging/Headers/Public/GCMConfig.h deleted file mode 100644 index 4e65fb873..000000000 --- a/src/ios/GoogleCloudMessaging/Headers/Public/GCMConfig.h +++ /dev/null @@ -1,49 +0,0 @@ -@protocol GCMReceiverDelegate; - -typedef NS_ENUM(int8_t, GCMLogLevel) { - kGCMLogLevelDebug, - kGCMLogLevelInfo, - kGCMLogLevelError, - kGCMLogLevelAssert, -}; - -/** - * Config used to set different options in Google Cloud Messaging. - */ -@interface GCMConfig : NSObject - -/** - * Set the `GCMReceiverDelegate` to receive callbacks on upstream messages. - * - * @see GCMReceiverDelegate - */ -@property(nonatomic, readwrite, weak) id receiverDelegate; - -/** - * The log level for the GCM library. Valid values are `kGCMLogLevelDebug`, - * `kGCMLogLevelInfo`, `kGCMLogLevelError`, and `kGCMLogLevelAssert`. - */ -@property(nonatomic, readwrite, assign) GCMLogLevel logLevel; - -/** - * Specify which remote notification callback to invoke when a GCM message is - * received. - * - * If set to "YES" GCM uses the new remote notification callback i.e. - * application:didReceiveRemoteNotification:fetchCompletionHandler:. - * If set to "NO" GCM invokes application:didReceiveRemoteNotification: callback. - * - * Defaults to "NO". - */ -@property(nonatomic, readwrite, assign) BOOL useNewRemoteNotificationCallback; - -/** - * Get default configuration for GCM. The default config has logLevel set to - * `kGCMLogLevelError` and `receiverDelegate` is set to nil. - * - * @return GCMConfig sharedInstance. - */ -+ (instancetype)defaultConfig; - -@end - diff --git a/src/ios/GoogleCloudMessaging/Headers/Public/GCMPubSub.h b/src/ios/GoogleCloudMessaging/Headers/Public/GCMPubSub.h deleted file mode 100644 index 37e0a6b34..000000000 --- a/src/ios/GoogleCloudMessaging/Headers/Public/GCMPubSub.h +++ /dev/null @@ -1,82 +0,0 @@ -/** - * @related GCMPubSub - * - * The completion handler invoked when the GCM subscribe/unsubscribe returns. - * If the call fails we return the approprirate `error code` as documented in - * `GCMService`. - * - * @param error The error describing subscribe failure else nil. - */ -typedef void(^GCMPubSubCompletion)(NSError *error); - -/** - * GcmPubSub provides a publish-subscribe model for sending GCM topic messages. - * - * An app can subscribe to different topics defined by the - * developer. The app server can then send messages to the subscribed devices - * without having to maintain topic-subscribers mapping. Topics do not - * need to be explicitly created before subscribing or publishing—they - * are automatically created when publishing or subscribing. - * - * Messages published to the topic will be received as regular GCM messages - * with `"from"` set to `"/topics/myTopic"`. - * - * Only topic names that match the pattern `"/topics/[a-zA-Z0-9-_.~%]{1,900}"` - * are allowed for subscribing and publishing. - */ -@interface GCMPubSub : NSObject - -/** - * Returns an instance of GCMPubSub. Note you need to call - * `GCMService startWithConfig` to start using GCM. - * - * @return A shared instance of GCMPubSub. - */ -+ (instancetype)sharedInstance; - -/** - * Subscribes an app instance to a topic, enabling it to receive messages - * sent to that topic. - * - * This is an asynchronous call. If subscription fails, GCM - * invokes the completion callback with the appropriate error. - * - * Call this function from the main thread. GCM is not thread safe. - * - * @see GCMPubSub unsubscribeWithToken:topic:handler: - * - * @param token The registration token as received from the InstanceID - * library for a given `authorizedEntity` and "gcm" scope. - * @param topic The topic to subscribe to. Should be of the form - * `"/topics/"`. - * @param handler The callback handler invoked when the subscribe call - * ends. In case of success, a nil error is returned. Otherwise, - * an appropriate error object is returned. - */ -- (void)subscribeWithToken:(NSString *)token - topic:(NSString *)topic - options:(NSDictionary *)options - handler:(GCMPubSubCompletion)handler; - - -/** - * Unsubscribes an app instance from a topic, stopping it from receiving - * any further messages sent to that topic. - * - * This is an asynchronous call. If the attempt to unsubscribe fails, - * we invoke the `completion` callback passed in with an appropriate error. - * - * Call this function from the main thread. - * - * @param token The token used to subscribe to this topic. - * @param topic The topic to unsubscribe from. - * @param handler The handler that is invoked once the unsubscribe call ends. - * In case of success, nil error is returned. Otherwise, an - * appropriate error object is returned. - */ -- (void)unsubscribeWithToken:(NSString *)token - topic:(NSString *)topic - options:(NSDictionary *)options - handler:(GCMPubSubCompletion)handler; - -@end diff --git a/src/ios/GoogleCloudMessaging/Headers/Public/GCMReceiverDelegate.h b/src/ios/GoogleCloudMessaging/Headers/Public/GCMReceiverDelegate.h deleted file mode 100644 index 45433aede..000000000 --- a/src/ios/GoogleCloudMessaging/Headers/Public/GCMReceiverDelegate.h +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Delegate for receiving status of upstream messages sent via Google Cloud Messaging. - */ -@protocol GCMReceiverDelegate - -@optional -/** - * The callback is invoked once GCM processes the message. If processing fails, the - * callback is invoked with a valid error object representing the error. - * Otherwise, the message is ready to be sent. - * - * @param messageID The messageID for the message that failed to be sent upstream. - * @param error The error describing why the send operation failed. - */ -- (void)willSendDataMessageWithID:(NSString *)messageID error:(NSError *)error; - -/** - * This callback is invoked if GCM successfully sent the message upstream - * and the message was successfully received. - * - * @param messageID The messageID for the message sent. - */ -- (void)didSendDataMessageWithID:(NSString *)messageID; - -/** - * Called when the GCM server deletes pending messages due to exceeded - * storage limits. This may occur, for example, when the device cannot be - * reached for an extended period of time. - * - * It is recommended to retrieve any missing messages directly from the - * app server. - */ -- (void)didDeleteMessagesOnServer; - -@end diff --git a/src/ios/GoogleCloudMessaging/Headers/Public/GCMService.h b/src/ios/GoogleCloudMessaging/Headers/Public/GCMService.h deleted file mode 100644 index 4bf27eb59..000000000 --- a/src/ios/GoogleCloudMessaging/Headers/Public/GCMService.h +++ /dev/null @@ -1,244 +0,0 @@ -@class GCMConfig; - -/** - * The completion handler invoked once the data connection with GCM is - * established. The data connection is used to send a continous stream of - * data and all the GCM data notifications arrive through this connection. - * Once the connection is established we invoke the callback with `nil` error. - * Correspondingly if we get an error while trying to establish a connection - * we invoke the handler with an appropriate error object and do an - * exponential backoff to try and connect again unless successful. - - * - * @param error The error object if any describing why the data connection - * to GCM failed. - */ -typedef void(^GCMServiceConnectCompletion)(NSError *error); - - -/** - * @enum GCMServiceErrorCode - * Description of error codes - */ -typedef NS_ENUM(NSUInteger, GCMServiceErrorCode) { - /** - * HTTP errors. - */ - - // InvalidRequest -- Some parameters of the request were invalid. - kGCMServiceErrorCodeInvalidRequest = 0, - - // Auth Error -- GCM couldn't validate request from this client. - kGCMServiceErrorCodeAuthentication = 1, - - // NoAccess -- InstanceID service cannot be accessed. - kGCMServiceErrorCodeNoAccess = 2, - - // Timeout -- Request to InstanceID backend timed out. - kGCMServiceErrorCodeTimeout = 3, - - // Network -- No network available to reach the servers. - kGCMServiceErrorCodeNetwork = 4, - - // OperationInProgress -- Another similar operation in progress, - // bailing this one. - kGCMServiceErrorCodeOperationInProgress = 5, - - // Unknown error. - kGCMServiceErrorCodeUnknown = 7, - - /** - * Generic errors. - */ - - // Device seems to be missing a valid deviceID. Cannot authenticate - // device requests. - kGCMServiceErrorMissingDeviceID = 501, - - /** - * Upstream Send errors - */ - - // Upstream send not available (e.g. network issues) - kGCMServiceErrorCodeUpstreamServiceNotAvailable = 1001, - - // Invalid send parameters. - kGCMServiceErrorCodeInvalidParameters = 1002, - - // Invalid missing to. - kGCMServiceErrorCodeMissingTo = 1003, - - // GCM could not cache the message for sending. - kGCMServiceErrorSave = 1004, - - // Message size exceeded (size > 4KB). - kGCMServiceErrorSizeExceeded = 1005, - - /** - * GCM Connect errors. - */ - - // GCM already connected with the client. - kGCMServiceErrorCodeAlreadyConnected = 2001, - - /** - * PubSub errors. - */ - - // Topic already subscribed to. - kGCMServiceErrorCodePubSubAlreadySubscribed = 3001, - - // Topic already unsubscribed from. - kGCMServiceErrorCodePubSubAlreadyUnsubscribed = 3002, - - // Invalid topic name, does not match the topic regex "/topics/[a-zA-Z0-9-_.~%]+" - kGCMServiceErrorCodePubSubInvalidTopic = 3003, -}; - -/** - * GoogleCloudMessaging (GCM) enables apps to communicate with their app servers - * using simple messages. - * - * To send or receive messages, the app must get a - * registration token from GGLInstanceID, which authorizes an - * app server to send messages to an app instance. Pass your sender ID and - * `kGGLInstanceIDScopeGCM` as parameters to the method. - * - * A sender ID is a project number created when you configure your API project. - * It is labeled "Project Number" in the Google Developers Console. - * - * In order to receive GCM messages, declare application:didReceiveRemoteNotification: - * - * Client apps can send upstream messages back to the app server using the XMPP-based - * Cloud Connection Server, - * - */ -@interface GCMService : NSObject - -/** - * GCMService - * - * @return A shared instance of GCMService. - */ -+ (instancetype)sharedInstance; - -/** - * Start the `GCMService` with config. This starts the `GCMService` and - * allocates the required resources. - * - * @see GCMConfig - * - * @param config The `GCMConfig` used to build the service. - */ -- (void)startWithConfig:(GCMConfig *)config; - -/** - * Teardown the GCM connection and free all the resources owned by GCM. - * - * Call this when you don't need the GCM connection or to cancel all - * subscribe/unsubscribe requests. If GCM connection is alive before - * calling this, it would implicitly disconnect the connection. - * - * Calling `disconect` before invoking this method is useful but not required. - * Once you call this you won't be able to use `GCMService` for this session - * of your app. Therefore call this only when the app is going to exit. - * In case of background you should rather use `disconnect` and then - * if the app comes to the foreground again you can call `connect` again to - * establish a new connection. - */ -- (void)teardown; - -#pragma mark - Messages - -/** - * Call this to let GCM know that the app received a downstream message. Used - * to track message delivery for messages with different routes. - * - * @param message The downstream message received by the app. - * - * @return Only sync messages i.e. with `content-available : true` are sent - * both via APNS and GCM. For normal APNS messages this always returns - * YES. For sync messages return YES if the message was never delivered - * before else NO if the message was delivered before via MCS. - */ -- (BOOL)appDidReceiveMessage:(NSDictionary *)message; - - #pragma mark - Connect - -/** - * Create a GCM data connection which will be used to send the data notifications - * send by your server. It will also be used to send ACKS and other messages based - * on the GCM ACKS and other messages based on the GCM protocol. - * - * Use the `disconnect` method to disconnect the connection. - * - * @see GCMService disconnect - * - * @param handler The handler to be invoked once the connection is established. - * If the connection fails we invoke the handler with an - * appropriate error code letting you know why it failed. At - * the same time, GCM performs exponential backoff to retry - * establishing a connection and invoke the handler when successful. - */ -- (void)connectWithHandler:(GCMServiceConnectCompletion)handler; - -/** - * Disconnect the current GCM data connection. This stops any attempts to - * connect to GCM. Calling this on an already disconnected client is a no-op. - * - * Call this before `teardown` when your app is going to the background. - * Since the GCM connection won't be allowed to live when in background it is - * prudent to close the connection. - * - * @see GCMService teardown - */ -- (void)disconnect; - -#pragma mark - Send - -/** - * Send an upstream ("device to cloud") message. - * - * The message will be queued if we don't have an active connection for the max - * interval. - * - * @param message Key/Value pairs to be sent. Values must be String, any other - * type will be ignored. - * @param to String identifying the receiver of the message. For GCM - * project IDs the value is `SENDER_ID@gcm.googleapis.com`. - * @param msgId A unique ID of the message. This is generated by the - * application. It must be unique for each message. This allows - * error callbacks and debugging. - */ -- (void)sendMessage:(NSDictionary *)message - to:(NSString *)to - withId:(NSString *)msgId; - -/** - * Send an upstream ("device to cloud") message. - * - * The message will be queued if we don't have an active connection for the max - * interval. You can only use the upstream feature if your GCM implementation - * uses the XMPP-based Cloud Connection Server. - * - * @param message Key/Value pairs to be sent. Values must be String, any - * other type will be ignored. - * @param to A string identifying the receiver of the message. For GCM - * project IDs the value is `SENDER_ID@gcm.googleapis.com`. - * @param ttl The Time to live for the message. In case we aren't able to - * send the message before the ttl expires we will send you a - * callback. If 0, we'll attempt to send immediately and return - * an error if we're not connected. Otherwise, the message will - * be queued.As for server-side messages, we don't return an error - * if the message has been dropped because of TTL; this can happen - * on the server side, and it would require extra communication. - * @param msgId The ID of the message. This is generated by the application. It - * must be unique for each message. It allows error callbacks and - * debugging, to uniquely identify each message. - */ -- (void)sendMessage:(NSDictionary *)message - to:(NSString *)to - timeToLive:(int64_t)ttl - withId:(NSString *)msgId; - -@end diff --git a/src/ios/GoogleCloudMessaging/Headers/Public/GoogleCloudMessaging.h b/src/ios/GoogleCloudMessaging/Headers/Public/GoogleCloudMessaging.h deleted file mode 100644 index aab64fbe2..000000000 --- a/src/ios/GoogleCloudMessaging/Headers/Public/GoogleCloudMessaging.h +++ /dev/null @@ -1,5 +0,0 @@ -#import "GCMConfig.h" -#import "GCMPubSub.h" -#import "GCMReceiverDelegate.h" -#import "GCMService.h" - diff --git a/src/ios/GoogleCloudMessaging/Libraries/libGcmLib.a b/src/ios/GoogleCloudMessaging/Libraries/libGcmLib.a deleted file mode 100644 index 26c769638..000000000 Binary files a/src/ios/GoogleCloudMessaging/Libraries/libGcmLib.a and /dev/null differ diff --git a/src/ios/GoogleIPhoneUtilities/Libraries/libGIP_Reachability.a b/src/ios/GoogleIPhoneUtilities/Libraries/libGIP_Reachability.a deleted file mode 100755 index 9dd22022f..000000000 Binary files a/src/ios/GoogleIPhoneUtilities/Libraries/libGIP_Reachability.a and /dev/null differ diff --git a/src/ios/GoogleInterchangeUtilities/Libraries/libProtocolBuffers.a b/src/ios/GoogleInterchangeUtilities/Libraries/libProtocolBuffers.a deleted file mode 100644 index 94b8788a2..000000000 Binary files a/src/ios/GoogleInterchangeUtilities/Libraries/libProtocolBuffers.a and /dev/null differ diff --git a/src/ios/GoogleNetworkingUtilities/Libraries/libGTMSessionFetcher_core.a b/src/ios/GoogleNetworkingUtilities/Libraries/libGTMSessionFetcher_core.a deleted file mode 100644 index 1523f9afc..000000000 Binary files a/src/ios/GoogleNetworkingUtilities/Libraries/libGTMSessionFetcher_core.a and /dev/null differ diff --git a/src/ios/GoogleNetworkingUtilities/Libraries/libGTMSessionFetcher_full.a b/src/ios/GoogleNetworkingUtilities/Libraries/libGTMSessionFetcher_full.a deleted file mode 100644 index e029595c7..000000000 Binary files a/src/ios/GoogleNetworkingUtilities/Libraries/libGTMSessionFetcher_full.a and /dev/null differ diff --git a/src/ios/GoogleSymbolUtilities/Libraries/libGSDK_Overload.a b/src/ios/GoogleSymbolUtilities/Libraries/libGSDK_Overload.a deleted file mode 100644 index 351d2d0ec..000000000 Binary files a/src/ios/GoogleSymbolUtilities/Libraries/libGSDK_Overload.a and /dev/null differ diff --git a/src/ios/GoogleUtilities/Libraries/libGTMStackTrace.a b/src/ios/GoogleUtilities/Libraries/libGTMStackTrace.a deleted file mode 100644 index 26d03ba29..000000000 Binary files a/src/ios/GoogleUtilities/Libraries/libGTMStackTrace.a and /dev/null differ diff --git a/src/ios/GoogleUtilities/Libraries/libGTM_AddressBook.a b/src/ios/GoogleUtilities/Libraries/libGTM_AddressBook.a deleted file mode 100644 index 8b4b6b756..000000000 Binary files a/src/ios/GoogleUtilities/Libraries/libGTM_AddressBook.a and /dev/null differ diff --git a/src/ios/GoogleUtilities/Libraries/libGTM_DebugUtils.a b/src/ios/GoogleUtilities/Libraries/libGTM_DebugUtils.a deleted file mode 100644 index eda5d8f27..000000000 Binary files a/src/ios/GoogleUtilities/Libraries/libGTM_DebugUtils.a and /dev/null differ diff --git a/src/ios/GoogleUtilities/Libraries/libGTM_GTMURLBuilder.a b/src/ios/GoogleUtilities/Libraries/libGTM_GTMURLBuilder.a deleted file mode 100644 index d0b41d9e7..000000000 Binary files a/src/ios/GoogleUtilities/Libraries/libGTM_GTMURLBuilder.a and /dev/null differ diff --git a/src/ios/GoogleUtilities/Libraries/libGTM_KVO.a b/src/ios/GoogleUtilities/Libraries/libGTM_KVO.a deleted file mode 100644 index f6863c2fa..000000000 Binary files a/src/ios/GoogleUtilities/Libraries/libGTM_KVO.a and /dev/null differ diff --git a/src/ios/GoogleUtilities/Libraries/libGTM_NSData+zlib.a b/src/ios/GoogleUtilities/Libraries/libGTM_NSData+zlib.a deleted file mode 100644 index 8f9a85511..000000000 Binary files a/src/ios/GoogleUtilities/Libraries/libGTM_NSData+zlib.a and /dev/null differ diff --git a/src/ios/GoogleUtilities/Libraries/libGTM_NSDictionary+URLArguments.a b/src/ios/GoogleUtilities/Libraries/libGTM_NSDictionary+URLArguments.a deleted file mode 100644 index d5a5c7e4f..000000000 Binary files a/src/ios/GoogleUtilities/Libraries/libGTM_NSDictionary+URLArguments.a and /dev/null differ diff --git a/src/ios/GoogleUtilities/Libraries/libGTM_NSScannerJSON.a b/src/ios/GoogleUtilities/Libraries/libGTM_NSScannerJSON.a deleted file mode 100644 index 2e0a8198f..000000000 Binary files a/src/ios/GoogleUtilities/Libraries/libGTM_NSScannerJSON.a and /dev/null differ diff --git a/src/ios/GoogleUtilities/Libraries/libGTM_NSStringHTML.a b/src/ios/GoogleUtilities/Libraries/libGTM_NSStringHTML.a deleted file mode 100644 index d66a48bbe..000000000 Binary files a/src/ios/GoogleUtilities/Libraries/libGTM_NSStringHTML.a and /dev/null differ diff --git a/src/ios/GoogleUtilities/Libraries/libGTM_NSStringXML.a b/src/ios/GoogleUtilities/Libraries/libGTM_NSStringXML.a deleted file mode 100644 index b513b6ca2..000000000 Binary files a/src/ios/GoogleUtilities/Libraries/libGTM_NSStringXML.a and /dev/null differ diff --git a/src/ios/GoogleUtilities/Libraries/libGTM_Regex.a b/src/ios/GoogleUtilities/Libraries/libGTM_Regex.a deleted file mode 100644 index d42d09849..000000000 Binary files a/src/ios/GoogleUtilities/Libraries/libGTM_Regex.a and /dev/null differ diff --git a/src/ios/GoogleUtilities/Libraries/libGTM_RoundedRectPath.a b/src/ios/GoogleUtilities/Libraries/libGTM_RoundedRectPath.a deleted file mode 100644 index 80f1aeada..000000000 Binary files a/src/ios/GoogleUtilities/Libraries/libGTM_RoundedRectPath.a and /dev/null differ diff --git a/src/ios/GoogleUtilities/Libraries/libGTM_StringEncoding.a b/src/ios/GoogleUtilities/Libraries/libGTM_StringEncoding.a deleted file mode 100644 index 1e2923f5d..000000000 Binary files a/src/ios/GoogleUtilities/Libraries/libGTM_StringEncoding.a and /dev/null differ diff --git a/src/ios/GoogleUtilities/Libraries/libGTM_SystemVersion.a b/src/ios/GoogleUtilities/Libraries/libGTM_SystemVersion.a deleted file mode 100644 index aa5329a8f..000000000 Binary files a/src/ios/GoogleUtilities/Libraries/libGTM_SystemVersion.a and /dev/null differ diff --git a/src/ios/GoogleUtilities/Libraries/libGTM_UIFont+LineHeight.a b/src/ios/GoogleUtilities/Libraries/libGTM_UIFont+LineHeight.a deleted file mode 100644 index 108e78684..000000000 Binary files a/src/ios/GoogleUtilities/Libraries/libGTM_UIFont+LineHeight.a and /dev/null differ diff --git a/src/ios/GoogleUtilities/Libraries/libGTM_core.a b/src/ios/GoogleUtilities/Libraries/libGTM_core.a deleted file mode 100644 index fcd7259ef..000000000 Binary files a/src/ios/GoogleUtilities/Libraries/libGTM_core.a and /dev/null differ diff --git a/src/ios/GoogleUtilities/Libraries/libGTM_iPhone.a b/src/ios/GoogleUtilities/Libraries/libGTM_iPhone.a deleted file mode 100644 index e59224802..000000000 Binary files a/src/ios/GoogleUtilities/Libraries/libGTM_iPhone.a and /dev/null differ diff --git a/src/ios/PushPlugin.m b/src/ios/PushPlugin.m index 38d7d6acb..a176b9af5 100644 --- a/src/ios/PushPlugin.m +++ b/src/ios/PushPlugin.m @@ -27,7 +27,8 @@ #define GMP_NO_MODULES true #import "PushPlugin.h" -#import "CloudMessaging.h" +#import "GoogleCloudMessaging.h" +#import "GGLInstanceIDHeaders.h" @implementation PushPlugin : CDVPlugin