diff --git a/README.md b/README.md index be71c3f48..64667e505 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ v1.29.0 - in development | [Charts](charts/) | 4.1.0 | | [ClearAds](clearads/) | 2.9.3 | | [Facebook](facebook/) | 15.1.0 | -| [Firebase](firebase/) | 10.3.0 | +| [Firebase](firebase/) | 10.5.0 | | [Flurry](flurry/) | 11.2.1 | | [Fyber](fyber/) | 8.1.6 | | [HelpShift](helpshift/) | 7.11.2 | diff --git a/firebase/README.md b/firebase/README.md index 4991b525d..8f81c6716 100644 --- a/firebase/README.md +++ b/firebase/README.md @@ -6,27 +6,28 @@ Firebase gives you functionality like analytics, databases, messaging and crash | RoboPod | Description | Version | |----------------------------------------------------------------------------------|------------------------------------------------|----------| -| [ios-analytics](ios-analytics/) | Firebase iOS Analytics | 10.3.0 | -| [ios-auth](ios-auth/) | Firebase iOS Authentication | 10.3.0 | -| [ios-core](ios-core/) | Firebase iOS Core | 10.3.0 | -| [ios-crashlytics](ios-crashlytics/) | Firebase iOS Crashlytics | 10.3.0 | -| [ios-database](ios-database/) | Firebase iOS DataBase | 10.3.0 | -| [ios-dylinks](ios-dylinks/) | Firebase iOS Dynamic Links | 10.3.0 | -| [ios-firestore](ios-firestore/) | Firebase iOS Firestore | 10.3.0 | -| [ios-mobile ads](ios-google-mobile-ads/) | Firebase iOS Google Mobile Ads | 9.13.0 | +| [ios-analytics](ios-analytics/) | Firebase iOS Analytics | 10.5.0 | +| [ios-auth](ios-auth/) | Firebase iOS Authentication | 10.5.0 | +| [ios-core](ios-core/) | Firebase iOS Core | 10.5.0 | +| [ios-crashlytics](ios-crashlytics/) | Firebase iOS Crashlytics | 10.5.0 | +| [ios-database](ios-database/) | Firebase iOS DataBase | 10.5.0 | +| [ios-dylinks](ios-dylinks/) | Firebase iOS Dynamic Links | 10.5.0 | +| [ios-firestore](ios-firestore/) | Firebase iOS Firestore | 10.5.0 | +| [ios-mobile ads](ios-google-mobile-ads/) | Firebase iOS Google Mobile Ads | 10.0.0 | | [ios-mobile ads-adapters](ios-google-mobile-ads-adapters/) | Firebase iOS AdMob Adapters | | | [ios-mobile ads-mediation-testsuite](ios-google-mobile-ads-mediation-testsuite/) | Firebase iOS Google AdMob Mediation Test Suite | 2.0.0 | -| [ios-google-sign-in](ios-google-sign-in/) | Firebase iOS Google Sign In | 6.2.4 | +| [ios-google-sign-in](ios-google-sign-in/) | Firebase iOS Google Sign In | 7.0.0 | | [ios-google-ump](ios-google-ump/) | Firebase iOS Google UMP | 2.0.1 | -| [ios-messaging](ios-messaging/) | Firebase iOS Messaging | 10.3.0 | -| [ios-remoteconfig](ios-remoteconfig/) | Firebase iOS Remote Config | 10.3.0 | -| [ios-storage](ios-storage/) | Firebase iOS Storage | 10.3.0 | -| [ios-appcheck](ios-appcheck/) | Firebase iOS App Check | 10.3.0 | +| [ios-messaging](ios-messaging/) | Firebase iOS Messaging | 10.5.0 | +| [ios-remoteconfig](ios-remoteconfig/) | Firebase iOS Remote Config | 10.5.0 | +| [ios-storage](ios-storage/) | Firebase iOS Storage | 10.5.0 | +| [ios-appcheck](ios-appcheck/) | Firebase iOS App Check | 10.5.0 | ## Versions | RoboPods Version | Firebase Version | |------------------|------------------| +| 1.29.0 | 10.5.0 | | 1.28.0 | 10.3.0 | | 1.27.0 | 10.2.0 | | 1.26.0 | 10.0.0 | diff --git a/firebase/ios-analytics/pom.xml b/firebase/ios-analytics/pom.xml index eda4468b6..21ce815ba 100644 --- a/firebase/ios-analytics/pom.xml +++ b/firebase/ios-analytics/pom.xml @@ -7,7 +7,7 @@ robopods-firebase-analytics-ios - RoboPods FireBase Analytics iOS v10.3.0 + RoboPods FireBase Analytics iOS v10.5.0 jar diff --git a/firebase/ios-appcheck/pom.xml b/firebase/ios-appcheck/pom.xml index 2a71c0f86..b8886cefb 100644 --- a/firebase/ios-appcheck/pom.xml +++ b/firebase/ios-appcheck/pom.xml @@ -7,7 +7,7 @@ robopods-firebase-app-check-ios - RoboPods FireBase App Check iOS v10.3.0 + RoboPods FireBase App Check iOS v10.5.0 jar diff --git a/firebase/ios-auth/pom.xml b/firebase/ios-auth/pom.xml index c11cc5c8b..7bca83c83 100644 --- a/firebase/ios-auth/pom.xml +++ b/firebase/ios-auth/pom.xml @@ -7,7 +7,7 @@ robopods-firebase-auth-ios - RoboPods FireBase Auth iOS v10.3.0 + RoboPods FireBase Auth iOS v10.5.0 jar diff --git a/firebase/ios-auth/src/main/bro-gen/FirebaseAuth.framework/Headers/FIRAuthErrors.h b/firebase/ios-auth/src/main/bro-gen/FirebaseAuth.framework/Headers/FIRAuthErrors.h index 950478135..adef87cd5 100644 --- a/firebase/ios-auth/src/main/bro-gen/FirebaseAuth.framework/Headers/FIRAuthErrors.h +++ b/firebase/ios-auth/src/main/bro-gen/FirebaseAuth.framework/Headers/FIRAuthErrors.h @@ -413,6 +413,11 @@ typedef NS_ERROR_ENUM(FIRAuthErrorDomain, FIRAuthErrorCode){ */ FIRAuthErrorCodeMissingOrInvalidNonce = 17094, + /** Raised when an Cloud Function returns a blocking error. Will include a message returned from + * the function. + */ + FIRAuthErrorCodeBlockingCloudFunctionError = 17105, + /** Indicates an error for when the client identifier is missing. */ FIRAuthErrorCodeMissingClientIdentifier = 17993, diff --git a/firebase/ios-auth/src/main/bro-gen/FirebaseAuth.framework/Headers/FIRFederatedAuthProvider.h b/firebase/ios-auth/src/main/bro-gen/FirebaseAuth.framework/Headers/FIRFederatedAuthProvider.h index abab9ad37..ff81ed44c 100644 --- a/firebase/ios-auth/src/main/bro-gen/FirebaseAuth.framework/Headers/FIRFederatedAuthProvider.h +++ b/firebase/ios-auth/src/main/bro-gen/FirebaseAuth.framework/Headers/FIRFederatedAuthProvider.h @@ -40,7 +40,7 @@ typedef void (^FIRAuthCredentialCallback)(FIRAuthCredential *_Nullable credentia /** @fn getCredentialWithUIDelegate:completion: @brief Used to obtain an auth credential via a mobile web flow. This method is available on iOS only. - @param UIDelegate An optional UI delegate used to presenet the mobile web flow. + @param UIDelegate An optional UI delegate used to present the mobile web flow. @param completion Optionally; a block which is invoked asynchronously on the main thread when the mobile web flow is completed. */ diff --git a/firebase/ios-auth/src/main/java/org/robovm/pods/firebase/auth/FIRAuthErrorCode.java b/firebase/ios-auth/src/main/java/org/robovm/pods/firebase/auth/FIRAuthErrorCode.java index c0477638f..8248285b8 100644 --- a/firebase/ios-auth/src/main/java/org/robovm/pods/firebase/auth/FIRAuthErrorCode.java +++ b/firebase/ios-auth/src/main/java/org/robovm/pods/firebase/auth/FIRAuthErrorCode.java @@ -112,6 +112,7 @@ public enum /**/FIRAuthErrorCode/**/ implements NSErrorCode { UnsupportedFirstFactor(17089L), EmailChangeNeedsVerification(17090L), MissingOrInvalidNonce(17094L), + BlockingCloudFunctionError(17105L), MissingClientIdentifier(17993L), KeychainError(17995L), InternalError(17999L), diff --git a/firebase/ios-core/pom.xml b/firebase/ios-core/pom.xml index 4574d8d7b..e0844d50f 100644 --- a/firebase/ios-core/pom.xml +++ b/firebase/ios-core/pom.xml @@ -7,7 +7,7 @@ robopods-firebase-core-ios - RoboPods FireBase Core iOS v10.3.0 + RoboPods FireBase Core iOS v10.5.0 jar diff --git a/firebase/ios-core/src/main/bro-gen/FirebaseCore.framework/Headers/FIROptions.h b/firebase/ios-core/src/main/bro-gen/FirebaseCore.framework/Headers/FIROptions.h index 33f992e9e..8f8d945d7 100644 --- a/firebase/ios-core/src/main/bro-gen/FirebaseCore.framework/Headers/FIROptions.h +++ b/firebase/ios-core/src/main/bro-gen/FirebaseCore.framework/Headers/FIROptions.h @@ -52,7 +52,7 @@ NS_SWIFT_NAME(FirebaseOptions) /** * Unused. */ -@property(nonatomic, copy, nullable) NSString *trackingID; +@property(nonatomic, copy, nullable) NSString *trackingID DEPRECATED_ATTRIBUTE; /** * The Project Number from the Google Developer's console, for example @"012345678901", used to @@ -68,7 +68,7 @@ NS_SWIFT_NAME(FirebaseOptions) /** * Unused. */ -@property(nonatomic, copy, nullable) NSString *androidClientID; +@property(nonatomic, copy, nullable) NSString *androidClientID DEPRECATED_ATTRIBUTE; /** * The Google App ID that is used to uniquely identify an instance of an app. diff --git a/firebase/ios-core/src/main/java/org/robovm/pods/firebase/core/FIROptions.java b/firebase/ios-core/src/main/java/org/robovm/pods/firebase/core/FIROptions.java index 4066ef736..9486be9f0 100644 --- a/firebase/ios-core/src/main/java/org/robovm/pods/firebase/core/FIROptions.java +++ b/firebase/ios-core/src/main/java/org/robovm/pods/firebase/core/FIROptions.java @@ -63,8 +63,10 @@ protected FIROptions() {} public native String getClientID(); @Property(selector = "setClientID:") public native void setClientID(String v); + @Deprecated @Property(selector = "trackingID") public native String getTrackingID(); + @Deprecated @Property(selector = "setTrackingID:") public native void setTrackingID(String v); @Property(selector = "GCMSenderID") @@ -75,8 +77,10 @@ protected FIROptions() {} public native String getProjectID(); @Property(selector = "setProjectID:") public native void setProjectID(String v); + @Deprecated @Property(selector = "androidClientID") public native String getAndroidClientID(); + @Deprecated @Property(selector = "setAndroidClientID:") public native void setAndroidClientID(String v); @Property(selector = "googleAppID") diff --git a/firebase/ios-crashlytics/pom.xml b/firebase/ios-crashlytics/pom.xml index 44ac8a331..095115538 100644 --- a/firebase/ios-crashlytics/pom.xml +++ b/firebase/ios-crashlytics/pom.xml @@ -7,7 +7,7 @@ robopods-firebase-crashlytics-ios - RoboPods FireBase Crashlytics iOS v10.3.0 + RoboPods FireBase Crashlytics iOS v10.5.0 jar diff --git a/firebase/ios-database/pom.xml b/firebase/ios-database/pom.xml index 54cec5924..bf40538c1 100644 --- a/firebase/ios-database/pom.xml +++ b/firebase/ios-database/pom.xml @@ -7,7 +7,7 @@ robopods-firebase-database-ios - RoboPods FireBase Realtime Database iOS v10.3.0 + RoboPods FireBase Realtime Database iOS v10.5.0 jar diff --git a/firebase/ios-dylinks/pom.xml b/firebase/ios-dylinks/pom.xml index 3f950f783..fc92f6436 100644 --- a/firebase/ios-dylinks/pom.xml +++ b/firebase/ios-dylinks/pom.xml @@ -7,7 +7,7 @@ robopods-firebase-dynamic-links-ios - RoboPods FireBase Dynamic Links iOS v10.3.0 + RoboPods FireBase Dynamic Links iOS v10.5.0 jar diff --git a/firebase/ios-firestore/pom.xml b/firebase/ios-firestore/pom.xml index b012e8ed5..9db719fd1 100644 --- a/firebase/ios-firestore/pom.xml +++ b/firebase/ios-firestore/pom.xml @@ -7,7 +7,7 @@ robopods-firebase-firestore-ios - RoboPods Cloud Firestore flexible, scalable NoSQL cloud database iOS v10.3.0 + RoboPods Cloud Firestore flexible, scalable NoSQL cloud database iOS v10.5.0 jar diff --git a/firebase/ios-google-mobile-ads/pom.xml b/firebase/ios-google-mobile-ads/pom.xml index 0b88e17df..3ef31fe5e 100644 --- a/firebase/ios-google-mobile-ads/pom.xml +++ b/firebase/ios-google-mobile-ads/pom.xml @@ -7,7 +7,7 @@ robopods-firebase-google-mobile-ads-ios - RoboPods Google Mobile Ads iOS v9.13.0 + RoboPods Google Mobile Ads iOS v10.0.0 jar diff --git a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADAdFormat.h b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADAdFormat.h index 0588bc7c4..c3d65bcbd 100644 --- a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADAdFormat.h +++ b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADAdFormat.h @@ -2,7 +2,7 @@ // GADAdFormat.h // Google Mobile Ads SDK // -// Copyright 2018-2021 Google LLC. All rights reserved. +// Copyright 2018-2022 Google LLC. All rights reserved. // #import @@ -15,4 +15,5 @@ typedef NS_ENUM(NSInteger, GADAdFormat) { GADAdFormatNative, ///< Native. GADAdFormatRewardedInterstitial, ///< Rewarded interstitial. GADAdFormatUnknown, ///< Unknown. + GADAdFormatAppOpen, ///< App open. }; diff --git a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADAdLoaderAdTypes.h b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADAdLoaderAdTypes.h index f0d4b7a77..f31dfb0f9 100644 --- a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADAdLoaderAdTypes.h +++ b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADAdLoaderAdTypes.h @@ -8,7 +8,7 @@ #import #import -typedef NSString *GADAdLoaderAdType NS_STRING_ENUM; +typedef NSString *GADAdLoaderAdType NS_TYPED_ENUM; /// Use with GADAdLoader to request native custom template ads. To receive ads, the ad loader's /// delegate must conform to the GADCustomNativeAdLoaderDelegate protocol. See GADCustomNativeAd.h. diff --git a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADAdMetadata.h b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADAdMetadata.h index 167fde460..3634413e9 100644 --- a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADAdMetadata.h +++ b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADAdMetadata.h @@ -8,7 +8,7 @@ #import /// Ad metadata key type. -typedef NSString *GADAdMetadataKey NS_STRING_ENUM; +typedef NSString *GADAdMetadataKey NS_TYPED_ENUM; @protocol GADAdMetadataDelegate; diff --git a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADAppOpenAd.h b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADAppOpenAd.h index 28e2c78c2..28e81b8c6 100644 --- a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADAppOpenAd.h +++ b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADAppOpenAd.h @@ -28,11 +28,9 @@ typedef void (^GADAppOpenAdLoadCompletionHandler)(GADAppOpenAd *_Nullable appOpe /// /// @param adUnitID An ad unit ID created in the AdMob or Ad Manager UI. /// @param request An ad request object. If nil, a default ad request object is used. -/// @param orientation The interface orientation that the ad will be presented in. /// @param completionHandler A handler to execute when the load operation finishes or times out. + (void)loadWithAdUnitID:(nonnull NSString *)adUnitID request:(nullable GADRequest *)request - orientation:(UIInterfaceOrientation)orientation completionHandler:(nonnull GADAppOpenAdLoadCompletionHandler)completionHandler; /// Optional delegate object that receives notifications about presentation and dismissal of full @@ -56,4 +54,11 @@ typedef void (^GADAppOpenAdLoadCompletionHandler)(GADAppOpenAd *_Nullable appOpe /// Presents the app open ad with the provided view controller. Must be called on the main thread. - (void)presentFromRootViewController:(nonnull UIViewController *)rootViewController; +#pragma mark - Deprecated +/// Deprecated. Use +loadWithAdUnitID:request:completionHandler instead. ++ (void)loadWithAdUnitID:(nonnull NSString *)adUnitID + request:(nullable GADRequest *)request + orientation:(UIInterfaceOrientation)orientation + completionHandler:(nonnull GADAppOpenAdLoadCompletionHandler)completionHandler; + @end diff --git a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADCustomEventRequest.h b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADCustomEventRequest.h index 0bc2dc34f..c7630a86a 100644 --- a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADCustomEventRequest.h +++ b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADCustomEventRequest.h @@ -27,28 +27,4 @@ /// Indicates whether the testing property has been set in GADRequest. @property(nonatomic, readonly, assign) BOOL isTesting; -#pragma mark - Deprecated - -/// Deprecated and unsupported. Always NO. -@property(nonatomic, readonly, assign) - BOOL userHasLocation GAD_DEPRECATED_MSG_ATTRIBUTE("Deprecated and unsupported. Always NO."); - -/// Deprecated and unsupported. Always 0. -@property(nonatomic, readonly, assign) - CGFloat userLatitude GAD_DEPRECATED_MSG_ATTRIBUTE("Deprecated and unsupported. Always 0."); - -/// Deprecated and unsupported. Always 0. -@property(nonatomic, readonly, assign) - CGFloat userLongitude GAD_DEPRECATED_MSG_ATTRIBUTE("Deprecated and unsupported. Always 0."); - -/// Deprecated and unsupported. Always 0. -@property(nonatomic, readonly, assign) - CGFloat userLocationAccuracyInMeters GAD_DEPRECATED_MSG_ATTRIBUTE( - "Deprecated and unsupported. Always 0."); - -/// Deprecated and unsupported. Always nil. -@property(nonatomic, readonly, copy, nullable) - NSString *userLocationDescription GAD_DEPRECATED_MSG_ATTRIBUTE( - "Deprecated and unsupported. Always nil."); - @end diff --git a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADNativeAdAssetIdentifiers.h b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADNativeAdAssetIdentifiers.h index 8de488334..8a0aa1f3b 100644 --- a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADNativeAdAssetIdentifiers.h +++ b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADNativeAdAssetIdentifiers.h @@ -8,7 +8,7 @@ #import #import -typedef NSString *GADNativeAssetIdentifier NS_STRING_ENUM; +typedef NSString *GADNativeAssetIdentifier NS_TYPED_ENUM; FOUNDATION_EXPORT GADNativeAssetIdentifier _Nonnull const GADNativeHeadlineAsset; FOUNDATION_EXPORT GADNativeAssetIdentifier _Nonnull const GADNativeCallToActionAsset; diff --git a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADRequest.h b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADRequest.h index 20713d538..564ed6685 100644 --- a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADRequest.h +++ b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADRequest.h @@ -11,13 +11,6 @@ #import #import -/// Deprecated gender constants. -typedef NS_ENUM(NSInteger, GADGender) { - kGADGenderUnknown, ///< Deprecated. - kGADGenderMale, ///< Deprecated. - kGADGenderFemale ///< Deprecated. -}; - /// Specifies optional parameters for ad requests. @interface GADRequest : NSObject diff --git a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADRequestConfiguration.h b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADRequestConfiguration.h index b9484b76a..951d045dd 100644 --- a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADRequestConfiguration.h +++ b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADRequestConfiguration.h @@ -9,7 +9,7 @@ #import /// Maximum ad content rating. -typedef NSString *GADMaxAdContentRating NS_STRING_ENUM; +typedef NSString *GADMaxAdContentRating NS_TYPED_ENUM; /// Rating for content suitable for general audiences, including families. FOUNDATION_EXPORT GADMaxAdContentRating _Nonnull const GADMaxAdContentRatingGeneral; diff --git a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADResponseInfo.h b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADResponseInfo.h index 9a4d040a3..783293917 100644 --- a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADResponseInfo.h +++ b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GADResponseInfo.h @@ -61,9 +61,6 @@ FOUNDATION_EXPORT NSString *_Nonnull GADErrorUserInfoKeyResponseInfo; /// Unique identifier of the ad response. @property(nonatomic, readonly, nullable) NSString *responseIdentifier; -/// A class name that identifies the ad network that returned the ad. Nil if no ad was returned. -@property(nonatomic, readonly, nullable) NSString *adNetworkClassName; - /// Dictionary of extra parameters that may be returned in an ad response. @property(nonatomic, readonly, nonnull) NSDictionary *extrasDictionary; @@ -77,4 +74,10 @@ FOUNDATION_EXPORT NSString *_Nonnull GADErrorUserInfoKeyResponseInfo; /// JSON-safe dictionary representation of the response info. @property(nonatomic, readonly, nonnull) NSDictionary *dictionaryRepresentation; +#pragma mark - Deprecated + +/// Deprecated. Use loadedAdNetworkResponseInfo.adNetworkClassName instead. +@property(nonatomic, readonly, nullable) NSString *adNetworkClassName GAD_DEPRECATED_MSG_ATTRIBUTE( + "Deprecated. Use loadedAdNetworkResponseInfo.adNetworkClassName instead."); + @end diff --git a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GoogleMobileAds.h b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GoogleMobileAds.h index ac306907f..cb4fa9b74 100644 --- a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GoogleMobileAds.h +++ b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/GoogleMobileAds.h @@ -86,8 +86,6 @@ FOUNDATION_EXPORT const unsigned char GoogleMobileAdsVersionString[]; #import #import #import -#import -#import #import #import #import @@ -96,6 +94,7 @@ FOUNDATION_EXPORT const unsigned char GoogleMobileAdsVersionString[]; #import #import #import +#import #import #import #import diff --git a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMRewardBasedVideoAdNetworkAdapterProtocol.h b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMRewardBasedVideoAdNetworkAdapterProtocol.h deleted file mode 100644 index 995fa55e2..000000000 --- a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMRewardBasedVideoAdNetworkAdapterProtocol.h +++ /dev/null @@ -1,67 +0,0 @@ -// -// GADMRewardBasedVideoAdNetworkAdapter.h -// Google Mobile Ads SDK -// -// Copyright 2015 Google. All rights reserved. -// - -#import -#import -#import - -/// Your adapter must conform to this protocol to provide reward based video ads. -@protocol GADMRewardBasedVideoAdNetworkAdapter - -/// Returns a version string for the adapter. It can be any string that uniquely identifies the -/// version of your adapter. For example, "1.0", or simply a date such as "20110915". -+ (NSString *)adapterVersion; - -/// The extras class that is used to specify additional parameters for a request to this ad network. -/// Returns Nil if the network does not have extra settings for publishers to send. -+ (Class)networkExtrasClass; - -/// Returns an initialized instance of the adapter when mediation ad requests come in. The adapter -/// must only maintain a weak reference to the provided connector. -- (instancetype)initWithRewardBasedVideoAdNetworkConnector: - (id)connector; - -/// Tells the adapter to set up reward based video ads. The adapter should notify the Google Mobile -/// Ads SDK whether set up has succeeded or failed using callbacks provided in the connector. When -/// set up fails, the Google Mobile Ads SDK may try to set up the adapter again. -- (void)setUp; - -/// Tells the adapter to request a reward based video ad. This method is called after the adapter -/// has been set up. The adapter should notify the Google Mobile Ads SDK if the request succeeds or -/// fails using callbacks provided in the connector. -- (void)requestRewardBasedVideoAd; - -/// Tells the adapter to present the reward based video ad with the provided view controller. This -/// method is only called after the adapter successfully requested an ad. -- (void)presentRewardBasedVideoAdWithRootViewController:(UIViewController *)viewController; - -/// Tells the adapter to remove itself as a delegate or notification observer from the underlying ad -/// network SDK. -- (void)stopBeingDelegate; - -@optional - -/// Adapters that want to be initialized as early as possible should implement this method to -/// opt-into initialization when the publisher initializes the Google Mobile Ads SDK. If not -/// implemented, initWithRewardBasedVideoAdNetworkConnector: gets called the first time the -/// publisher loads a rewarded video ad. -- (instancetype)initWithRewardBasedVideoAdNetworkConnector: - (id)connector - credentials:(NSArray *)credentials; - -/// Returns an initialized instance of the adapter. The adapter must only maintain a weak reference -/// to the provided connector. -- (instancetype)initWithGADMAdNetworkConnector:(id)connector - GAD_DEPRECATED_MSG_ATTRIBUTE("Use initWithRewardBasedVideoAdNetworkConnector:."); - -/// Tells the adapter to set up reward based video ads with the provided user ID. The adapter should -/// notify the Google Mobile Ads SDK whether set up has succeeded or failed using callbacks provided -/// in the connector. When set up fails, the Google Mobile Ads SDK may try to set up the adapter -/// again. -- (void)setUpWithUserID:(NSString *)userID GAD_DEPRECATED_MSG_ATTRIBUTE("Use setUp."); - -@end diff --git a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMRewardBasedVideoAdNetworkConnectorProtocol.h b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMRewardBasedVideoAdNetworkConnectorProtocol.h deleted file mode 100644 index f88e67886..000000000 --- a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMRewardBasedVideoAdNetworkConnectorProtocol.h +++ /dev/null @@ -1,65 +0,0 @@ -// -// GADMRewardBasedVideoAdNetworkConnectorProtocol.h -// Google Mobile Ads SDK -// -// Copyright 2015 Google. All rights reserved. -// - -#import -#import - -@protocol GADMRewardBasedVideoAdNetworkAdapter; - -/// Reward based video ad network adapters interact with the mediation SDK using an object that -/// conforms to the GADMRewardBasedVideoAdNetworkConnector protocol. The connector object can be -/// used to obtain information for ad requests and to call back to the mediation SDK on ad responses -/// and user interactions. -@protocol GADMRewardBasedVideoAdNetworkConnector - -/// Tells the delegate that the adapter successfully set up a reward based video ad. -- (void)adapterDidSetUpRewardBasedVideoAd: - (id)rewardBasedVideoAdAdapter; - -/// Tells the delegate that the adapter failed to set up a reward based video ad. -- (void)adapter:(id)rewardBasedVideoAdAdapter - didFailToSetUpRewardBasedVideoAdWithError:(NSError *)error; - -/// Tells the delegate that a reward based video ad was clicked. -- (void)adapterDidGetAdClick:(id)adapter; - -/// Tells the delegate that a reward based video ad has loaded. -- (void)adapterDidReceiveRewardBasedVideoAd: - (id)rewardBasedVideoAdAdapter; - -/// Tells the delegate that a reward based video ad has opened. -- (void)adapterDidOpenRewardBasedVideoAd: - (id)rewardBasedVideoAdAdapter; - -/// Tells the delegate that a reward based video ad has started playing. -- (void)adapterDidStartPlayingRewardBasedVideoAd: - (id)rewardBasedVideoAdAdapter; - -/// Tells the delegate that a reward based video ad has completed playing. -- (void)adapterDidCompletePlayingRewardBasedVideoAd: - (id)rewardBasedVideoAdAdapter; - -/// Tells the delegate that a reward based video ad has closed. -- (void)adapterDidCloseRewardBasedVideoAd: - (id)rewardBasedVideoAdAdapter; - -/// Tells the delegate that the adapter has rewarded the user. -- (void)adapter:(id)rewardBasedVideoAd - didRewardUserWithReward:(GADAdReward *)reward; - -/// Tells the delegate that a reward based video ad failed to load. -- (void)adapter:(id)rewardBasedVideoAdAdapter - didFailToLoadRewardBasedVideoAdwithError:(NSError *)error; - -#pragma mark Deprecated - -/// Deprecated. No replacement. -- (void)adapterWillLeaveApplication: - (id)rewardBasedVideoAdAdapter - GAD_DEPRECATED_MSG_ATTRIBUTE("Deprecated. No replacement."); - -@end diff --git a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdConfiguration.h b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdConfiguration.h index 8aa34245f..8f64dae05 100644 --- a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdConfiguration.h +++ b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdConfiguration.h @@ -6,6 +6,7 @@ // #import +#import #import #import @@ -36,16 +37,22 @@ /// Indicates whether the publisher is requesting test ads. @property(nonatomic, readonly) BOOL isTestRequest; -/// Indicates whether the publisher has specified latitude and longitude location. -@property(nonatomic, readonly) BOOL hasUserLocation; +#pragma mark - Deprecated -/// The user's latitude or 0 if location isn't specified. -@property(nonatomic, readonly) CGFloat userLatitude; +/// Deprecated and unsupported. Always returns NO. +@property(nonatomic, readonly) BOOL hasUserLocation GAD_DEPRECATED_MSG_ATTRIBUTE( + "Deprecated and unsupported. Always returns NO."); -/// The user's longitude or 0 if location isn't specified. -@property(nonatomic, readonly) CGFloat userLongitude; +/// Deprecated and unsupported. Always returns 0. +@property(nonatomic, readonly) CGFloat userLatitude GAD_DEPRECATED_MSG_ATTRIBUTE( + "Deprecated and unsupported. Always returns 0."); -/// The user's location accuracy or 0 if location isn't specified. -@property(nonatomic, readonly) CGFloat userLocationAccuracyInMeters; +/// Deprecated and unsupported. Always returns 0. +@property(nonatomic, readonly) CGFloat userLongitude GAD_DEPRECATED_MSG_ATTRIBUTE( + "Deprecated and unsupported. Always returns 0."); + +/// Deprecated and unsupported. Always returns 0. +@property(nonatomic, readonly) CGFloat userLocationAccuracyInMeters GAD_DEPRECATED_MSG_ATTRIBUTE( + "Deprecated and unsupported. Always returns 0."); @end diff --git a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdEventDelegate.h b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdEventDelegate.h index 8acab6339..a318e3702 100644 --- a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdEventDelegate.h +++ b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdEventDelegate.h @@ -93,3 +93,8 @@ GAD_DEPRECATED_MSG_ATTRIBUTE("Deprecated. Use -didRewardUser."); @end + +/// Reports app open related information to the Google Mobile Ads SDK from the adapter. +@protocol GADMediationAppOpenAdEventDelegate + +@end diff --git a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdRequest.h b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdRequest.h index 89b71fc0f..8f29d3dc8 100644 --- a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdRequest.h +++ b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdRequest.h @@ -44,34 +44,4 @@ /// Keywords describing the user's current activity. Example: @"Sport Scores". - (nullable NSArray *)userKeywords; -#pragma mark Deprecated - -/// Deprecated. The end user's gender set by the publisher in GADRequest. Returns kGADGenderUnknown -/// if it has not been specified. -- (GADGender)userGender GAD_DEPRECATED_MSG_ATTRIBUTE("Deprecated. No replacement."); - -/// Deprecated. The end user's birthday set by the publisher. Returns nil if it has not been -/// specified. -- (nullable NSDate *)userBirthday GAD_DEPRECATED_MSG_ATTRIBUTE("Deprecated. No replacement."); - -/// Deprecated and unsupported. Always returns NO. -- (BOOL) - userHasLocation GAD_DEPRECATED_MSG_ATTRIBUTE("Deprecated and unsupported. Always returns NO."); - -/// Deprecated and unsupported. Always returns 0. -- (CGFloat) - userLatitude GAD_DEPRECATED_MSG_ATTRIBUTE("Deprecated and unsupported. Always returns 0."); - -/// Deprecated and unsupported. Always returns 0. -- (CGFloat) - userLongitude GAD_DEPRECATED_MSG_ATTRIBUTE("Deprecated and unsupported. Always returns 0."); - -/// Deprecated and unsupported. Always returns 0. -- (CGFloat)userLocationAccuracyInMeters GAD_DEPRECATED_MSG_ATTRIBUTE( - "Deprecated and unsupported. Always returns 0."); - -/// Deprecated and unsupported. Always returns nil. -- (nullable NSString *)userLocationDescription GAD_DEPRECATED_MSG_ATTRIBUTE( - "Deprecated and unsupported. Always returns nil."); - @end diff --git a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdapter.h b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdapter.h index d91357874..42dcd8914 100644 --- a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdapter.h +++ b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAdapter.h @@ -6,6 +6,7 @@ // #import +#import #import #import #import @@ -47,6 +48,12 @@ typedef id _Nullable ( ^GADMediationRewardedLoadCompletionHandler)(_Nullable id ad, NSError *_Nullable error); +/// Called by the adapter after loading the app open ad or encountering an error. Returns an ad +/// event delegate to send ad events to the Google Mobile Ads SDK. The block returns nil if a +/// delegate couldn't be created or if the block has already been called. +typedef id _Nullable ( + ^GADMediationAppOpenLoadCompletionHandler)(_Nullable id ad, + NSError *_Nullable error); /// Executes when adapter set up completes. typedef void (^GADMediationAdapterSetUpCompletionBlock)(NSError *_Nullable error); @@ -130,4 +137,12 @@ typedef void (^GADMediationAdapterSetUpCompletionBlock)(NSError *_Nullable error (nonnull GADMediationRewardedLoadCompletionHandler) completionHandler; +/// Asks the adapter to load an app open ad with the provided ad configuration. The +/// adapter must call back completionHandler with the loaded ad, or it may call back with an error. +/// This method is called on the main thread, and completionHandler must be called back on the main +/// thread. +- (void)loadAppOpenAdForAdConfiguration: + (nonnull GADMediationAppOpenAdConfiguration *)adConfiguration + completionHandler: + (nonnull GADMediationAppOpenLoadCompletionHandler)completionHandler; @end diff --git a/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAppOpenAd.h b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAppOpenAd.h new file mode 100644 index 000000000..d3942056e --- /dev/null +++ b/firebase/ios-google-mobile-ads/src/main/bro-gen/GoogleMobileAds.framework/Headers/Mediation/GADMediationAppOpenAd.h @@ -0,0 +1,22 @@ +// +// GADMediationAppOpenAd.h +// Google Mobile Ads SDK +// +// Copyright 2022 Google LLC. All rights reserved. +// + +#import +#import +#import +#import + +/// Rendered app open ad. +@protocol GADMediationAppOpenAd + +/// Presents the receiver from the view controller. +- (void)presentFromViewController:(nonnull UIViewController *)viewController; +@end + +/// App open ad configuration. +@interface GADMediationAppOpenAdConfiguration : GADMediationAdConfiguration +@end diff --git a/firebase/ios-google-mobile-ads/src/main/bro-gen/gad.yaml b/firebase/ios-google-mobile-ads/src/main/bro-gen/gad.yaml index 3d0abcfe0..b8351c48b 100644 --- a/firebase/ios-google-mobile-ads/src/main/bro-gen/gad.yaml +++ b/firebase/ios-google-mobile-ads/src/main/bro-gen/gad.yaml @@ -57,6 +57,8 @@ classes: methods: '+loadWithAdUnitID:request:orientation:completionHandler:': name: load + '+loadWithAdUnitID:request:completionHandler:': + name: load '-canPresentFromRootViewController:error:': name: canPresentFromRootViewController GADAppOpenAdView: {} @@ -198,6 +200,7 @@ classes: methods: '+createQueryInfoWithRequest:adFormat:completionHandler:': name: createQueryInfo + GADMediationAppOpenAdConfiguration: { } protocols: GADAdLoaderDelegate: methods: @@ -410,6 +413,8 @@ protocols: name: loadRewardedInterstitialAd '-loadInterscrollerAdForAdConfiguration:completionHandler:': name: loadInterscrollerAd + '-loadAppOpenAdForAdConfiguration:completionHandler:': + name: loadAppOpenAd GADMediationBannerAd: {} GADMediationBannerAdEventDelegate: skip_adapter: true @@ -490,6 +495,8 @@ protocols: name: getValidBannerSizes '-adLoader:didReceiveGAMBannerView:': name: didReceiveGAMBannerView + GADMediationAppOpenAd: { } + GADMediationAppOpenAdEventDelegate: { } functions: # GADAdSize GADPortraitAnchoredAdaptiveBannerAdSizeWithWidth: diff --git a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADAdFormat.java b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADAdFormat.java index 689738631..e3d8c6bda 100644 --- a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADAdFormat.java +++ b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADAdFormat.java @@ -46,7 +46,8 @@ public enum /**/GADAdFormat/**/ implements ValuedEnum { Rewarded(2L), Native(3L), RewardedInterstitial(4L), - Unknown(5L); + Unknown(5L), + AppOpen(6L); /**/ /**/ diff --git a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADAppOpenAd.java b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADAppOpenAd.java index 6cf5bca95..563297080 100644 --- a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADAppOpenAd.java +++ b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADAppOpenAd.java @@ -69,6 +69,8 @@ public GADAppOpenAd() {} public native boolean canPresentFromRootViewController(UIViewController rootViewController, NSError.NSErrorPtr error); @Method(selector = "presentFromRootViewController:") public native void presentFromRootViewController(UIViewController rootViewController); + @Method(selector = "loadWithAdUnitID:request:completionHandler:") + public static native void load(String adUnitID, GADRequest request, @Block VoidBlock2 completionHandler); @Method(selector = "loadWithAdUnitID:request:orientation:completionHandler:") public static native void load(String adUnitID, GADRequest request, UIInterfaceOrientation orientation, @Block VoidBlock2 completionHandler); /**/ diff --git a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADCustomEventRequest.java b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADCustomEventRequest.java index 36ccb84d0..1575ae2cf 100644 --- a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADCustomEventRequest.java +++ b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADCustomEventRequest.java @@ -58,36 +58,6 @@ public GADCustomEventRequest() {} public native NSDictionary getAdditionalParameters(); @Property(selector = "isTesting") public native boolean isTesting(); - /** - * @deprecated Deprecated and unsupported. Always NO. - */ - @Deprecated - @Property(selector = "userHasLocation") - public native boolean isUserHasLocation(); - /** - * @deprecated Deprecated and unsupported. Always 0. - */ - @Deprecated - @Property(selector = "userLatitude") - public native @MachineSizedFloat double getUserLatitude(); - /** - * @deprecated Deprecated and unsupported. Always 0. - */ - @Deprecated - @Property(selector = "userLongitude") - public native @MachineSizedFloat double getUserLongitude(); - /** - * @deprecated Deprecated and unsupported. Always 0. - */ - @Deprecated - @Property(selector = "userLocationAccuracyInMeters") - public native @MachineSizedFloat double getUserLocationAccuracyInMeters(); - /** - * @deprecated Deprecated and unsupported. Always nil. - */ - @Deprecated - @Property(selector = "userLocationDescription") - public native String getUserLocationDescription(); /**/ /**//**/ /**/ diff --git a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMRewardBasedVideoAdNetworkConnector.java b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMRewardBasedVideoAdNetworkConnector.java deleted file mode 100644 index d55764c1b..000000000 --- a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMRewardBasedVideoAdNetworkConnector.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (C) 2013-2015 RoboVM AB - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.robovm.pods.google.mobileads; - -/**/ -import java.io.*; -import java.nio.*; -import java.util.*; -import org.robovm.objc.*; -import org.robovm.objc.annotation.*; -import org.robovm.objc.block.*; -import org.robovm.rt.*; -import org.robovm.rt.annotation.*; -import org.robovm.rt.bro.*; -import org.robovm.rt.bro.annotation.*; -import org.robovm.rt.bro.ptr.*; -import org.robovm.apple.foundation.*; -import org.robovm.apple.coregraphics.*; -import org.robovm.apple.storekit.*; -import org.robovm.apple.uikit.*; -import org.robovm.apple.coreanimation.*; -import org.robovm.apple.webkit.*; -/**/ - -/**/ - -/**/ -/**//**/ -/**/public/**/ interface /**/GADMRewardBasedVideoAdNetworkConnector/**/ - /**/extends GADMediationAdRequest/**/ { - - /**/ - /**/ - /**/ - /**/ - /**//**/ - /**/ - - /**/ - /**/ - @Method(selector = "adapterDidSetUpRewardBasedVideoAd:") - void didSetUpRewardBasedVideoAd(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter); - @Method(selector = "adapter:didFailToSetUpRewardBasedVideoAdWithError:") - void didFailToSetUpRewardBasedVideoAd(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter, NSError error); - @Method(selector = "adapterDidGetAdClick:") - void didGetAdClick(GADMRewardBasedVideoAdNetworkAdapter adapter); - @Method(selector = "adapterDidReceiveRewardBasedVideoAd:") - void didReceiveRewardBasedVideoAd(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter); - @Method(selector = "adapterDidOpenRewardBasedVideoAd:") - void didOpenRewardBasedVideoAd(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter); - @Method(selector = "adapterDidStartPlayingRewardBasedVideoAd:") - void didStartPlayingRewardBasedVideoAd(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter); - @Method(selector = "adapterDidCompletePlayingRewardBasedVideoAd:") - void didCompletePlayingRewardBasedVideoAd(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter); - @Method(selector = "adapterDidCloseRewardBasedVideoAd:") - void didCloseRewardBasedVideoAd(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter); - @Method(selector = "adapter:didRewardUserWithReward:") - void didRewardUser(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAd, GADAdReward reward); - @Method(selector = "adapter:didFailToLoadRewardBasedVideoAdwithError:") - void didFailToLoadRewardBasedVideoAd(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter, NSError error); - /** - * @deprecated Deprecated. No replacement. - */ - @Deprecated - @Method(selector = "adapterWillLeaveApplication:") - void willLeaveApplication(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter); - /**/ - /**/ - /**/ -} diff --git a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMRewardBasedVideoAdNetworkConnectorAdapter.java b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMRewardBasedVideoAdNetworkConnectorAdapter.java deleted file mode 100644 index 245bbd34f..000000000 --- a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMRewardBasedVideoAdNetworkConnectorAdapter.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (C) 2013-2015 RoboVM AB - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.robovm.pods.google.mobileads; - -/**/ -import java.io.*; -import java.nio.*; -import java.util.*; -import org.robovm.objc.*; -import org.robovm.objc.annotation.*; -import org.robovm.objc.block.*; -import org.robovm.rt.*; -import org.robovm.rt.annotation.*; -import org.robovm.rt.bro.*; -import org.robovm.rt.bro.annotation.*; -import org.robovm.rt.bro.ptr.*; -import org.robovm.apple.foundation.*; -import org.robovm.apple.coregraphics.*; -import org.robovm.apple.storekit.*; -import org.robovm.apple.uikit.*; -import org.robovm.apple.coreanimation.*; -import org.robovm.apple.webkit.*; -/**/ - -/**/ -/**/ -/**//**/ -/**/public/**/ class /**/GADMRewardBasedVideoAdNetworkConnectorAdapter/**/ - extends /**/GADMediationAdRequestAdapter/**/ - /**/implements GADMRewardBasedVideoAdNetworkConnector/**/ { - - /**/ - /**/ - /**/ - /**/ - /**//**/ - /**//**/ - /**/ - - /**/ - /**//**/ - /**/ - @NotImplemented("adapterDidSetUpRewardBasedVideoAd:") - public void didSetUpRewardBasedVideoAd(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter) {} - @NotImplemented("adapter:didFailToSetUpRewardBasedVideoAdWithError:") - public void didFailToSetUpRewardBasedVideoAd(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter, NSError error) {} - @NotImplemented("adapterDidGetAdClick:") - public void didGetAdClick(GADMRewardBasedVideoAdNetworkAdapter adapter) {} - @NotImplemented("adapterDidReceiveRewardBasedVideoAd:") - public void didReceiveRewardBasedVideoAd(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter) {} - @NotImplemented("adapterDidOpenRewardBasedVideoAd:") - public void didOpenRewardBasedVideoAd(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter) {} - @NotImplemented("adapterDidStartPlayingRewardBasedVideoAd:") - public void didStartPlayingRewardBasedVideoAd(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter) {} - @NotImplemented("adapterDidCompletePlayingRewardBasedVideoAd:") - public void didCompletePlayingRewardBasedVideoAd(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter) {} - @NotImplemented("adapterDidCloseRewardBasedVideoAd:") - public void didCloseRewardBasedVideoAd(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter) {} - @NotImplemented("adapter:didRewardUserWithReward:") - public void didRewardUser(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAd, GADAdReward reward) {} - @NotImplemented("adapter:didFailToLoadRewardBasedVideoAdwithError:") - public void didFailToLoadRewardBasedVideoAd(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter, NSError error) {} - /** - * @deprecated Deprecated. No replacement. - */ - @Deprecated - @NotImplemented("adapterWillLeaveApplication:") - public void willLeaveApplication(GADMRewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter) {} - /**/ -} diff --git a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdConfiguration.java b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdConfiguration.java index a84bd829e..a5420531a 100644 --- a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdConfiguration.java +++ b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdConfiguration.java @@ -66,12 +66,28 @@ public GADMediationAdConfiguration() {} public native NSNumber getChildDirectedTreatment(); @Property(selector = "isTestRequest") public native boolean isTestRequest(); + /** + * @deprecated Deprecated and unsupported. Always returns NO. + */ + @Deprecated @Property(selector = "hasUserLocation") public native boolean hasUserLocation(); + /** + * @deprecated Deprecated and unsupported. Always returns 0. + */ + @Deprecated @Property(selector = "userLatitude") public native @MachineSizedFloat double getUserLatitude(); + /** + * @deprecated Deprecated and unsupported. Always returns 0. + */ + @Deprecated @Property(selector = "userLongitude") public native @MachineSizedFloat double getUserLongitude(); + /** + * @deprecated Deprecated and unsupported. Always returns 0. + */ + @Deprecated @Property(selector = "userLocationAccuracyInMeters") public native @MachineSizedFloat double getUserLocationAccuracyInMeters(); /**/ diff --git a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdRequest.java b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdRequest.java index e5299d122..22a6151be 100644 --- a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdRequest.java +++ b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdRequest.java @@ -67,48 +67,6 @@ NSNumber underAgeOfConsent(); @Method(selector = "userKeywords") NSArray userKeywords(); - /** - * @deprecated Deprecated. No replacement. - */ - @Deprecated - @Method(selector = "userGender") - GADGender userGender(); - /** - * @deprecated Deprecated. No replacement. - */ - @Deprecated - @Method(selector = "userBirthday") - NSDate userBirthday(); - /** - * @deprecated Deprecated and unsupported. Always returns NO. - */ - @Deprecated - @Method(selector = "userHasLocation") - boolean userHasLocation(); - /** - * @deprecated Deprecated and unsupported. Always returns 0. - */ - @Deprecated - @Method(selector = "userLatitude") - @MachineSizedFloat double userLatitude(); - /** - * @deprecated Deprecated and unsupported. Always returns 0. - */ - @Deprecated - @Method(selector = "userLongitude") - @MachineSizedFloat double userLongitude(); - /** - * @deprecated Deprecated and unsupported. Always returns 0. - */ - @Deprecated - @Method(selector = "userLocationAccuracyInMeters") - @MachineSizedFloat double userLocationAccuracyInMeters(); - /** - * @deprecated Deprecated and unsupported. Always returns nil. - */ - @Deprecated - @Method(selector = "userLocationDescription") - String userLocationDescription(); /**/ /**/ /**/ diff --git a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdRequestAdapter.java b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdRequestAdapter.java index ab820c191..bbcaa85e5 100644 --- a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdRequestAdapter.java +++ b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdRequestAdapter.java @@ -69,47 +69,5 @@ public NSNumber underAgeOfConsent() { return null; } @NotImplemented("userKeywords") public NSArray userKeywords() { return null; } - /** - * @deprecated Deprecated. No replacement. - */ - @Deprecated - @NotImplemented("userGender") - public GADGender userGender() { return null; } - /** - * @deprecated Deprecated. No replacement. - */ - @Deprecated - @NotImplemented("userBirthday") - public NSDate userBirthday() { return null; } - /** - * @deprecated Deprecated and unsupported. Always returns NO. - */ - @Deprecated - @NotImplemented("userHasLocation") - public boolean userHasLocation() { return false; } - /** - * @deprecated Deprecated and unsupported. Always returns 0. - */ - @Deprecated - @NotImplemented("userLatitude") - public @MachineSizedFloat double userLatitude() { return 0; } - /** - * @deprecated Deprecated and unsupported. Always returns 0. - */ - @Deprecated - @NotImplemented("userLongitude") - public @MachineSizedFloat double userLongitude() { return 0; } - /** - * @deprecated Deprecated and unsupported. Always returns 0. - */ - @Deprecated - @NotImplemented("userLocationAccuracyInMeters") - public @MachineSizedFloat double userLocationAccuracyInMeters() { return 0; } - /** - * @deprecated Deprecated and unsupported. Always returns nil. - */ - @Deprecated - @NotImplemented("userLocationDescription") - public String userLocationDescription() { return null; } /**/ } diff --git a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdapter.java b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdapter.java index add0dcd04..8bd7e0231 100644 --- a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdapter.java +++ b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdapter.java @@ -63,6 +63,8 @@ void loadRewardedAd(GADMediationRewardedAdConfiguration adConfiguration, @Block Block2 completionHandler); @Method(selector = "loadRewardedInterstitialAdForAdConfiguration:completionHandler:") void loadRewardedInterstitialAd(GADMediationRewardedAdConfiguration adConfiguration, @Block Block2 completionHandler); + @Method(selector = "loadAppOpenAdForAdConfiguration:completionHandler:") + void loadAppOpenAd(GADMediationAppOpenAdConfiguration adConfiguration, @Block Block2 completionHandler); /**/ /**/ /**/ diff --git a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdapterAdapter.java b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdapterAdapter.java index 07f5b7156..c7fb8598a 100644 --- a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdapterAdapter.java +++ b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAdapterAdapter.java @@ -65,5 +65,7 @@ public void loadNativeAd(GADMediationNativeAdConfiguration adConfiguration, @Blo public void loadRewardedAd(GADMediationRewardedAdConfiguration adConfiguration, @Block Block2 completionHandler) {} @NotImplemented("loadRewardedInterstitialAdForAdConfiguration:completionHandler:") public void loadRewardedInterstitialAd(GADMediationRewardedAdConfiguration adConfiguration, @Block Block2 completionHandler) {} + @NotImplemented("loadAppOpenAdForAdConfiguration:completionHandler:") + public void loadAppOpenAd(GADMediationAppOpenAdConfiguration adConfiguration, @Block Block2 completionHandler) {} /**/ } diff --git a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMRewardBasedVideoAdNetworkAdapter.java b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAppOpenAd.java similarity index 72% rename from firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMRewardBasedVideoAdNetworkAdapter.java rename to firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAppOpenAd.java index 9c09eb82f..70cae31f1 100644 --- a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMRewardBasedVideoAdNetworkAdapter.java +++ b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAppOpenAd.java @@ -39,8 +39,8 @@ /**/ /**//**/ -/**/public/**/ interface /**/GADMRewardBasedVideoAdNetworkAdapter/**/ - /**/extends NSObjectProtocol/**/ { +/**/public/**/ interface /**/GADMediationAppOpenAd/**/ + /**/extends GADMediationAd/**/ { /**/ /**/ @@ -51,20 +51,8 @@ /**/ /**/ - @Method(selector = "setUp") - void setUp(); - @Method(selector = "requestRewardBasedVideoAd") - void requestRewardBasedVideoAd(); - @Method(selector = "presentRewardBasedVideoAdWithRootViewController:") - void presentRewardBasedVideoAd(UIViewController viewController); - @Method(selector = "stopBeingDelegate") - void stopBeingDelegate(); - /** - * @deprecated Use setUp. - */ - @Deprecated - @Method(selector = "setUpWithUserID:") - void setUp(String userID); + @Method(selector = "presentFromViewController:") + void presentFromViewController(UIViewController viewController); /**/ /**/ /**/ diff --git a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMRewardBasedVideoAdNetworkAdapterAdapter.java b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAppOpenAdAdapter.java similarity index 69% rename from firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMRewardBasedVideoAdNetworkAdapterAdapter.java rename to firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAppOpenAdAdapter.java index 208c109f9..851fc91a1 100644 --- a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMRewardBasedVideoAdNetworkAdapterAdapter.java +++ b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAppOpenAdAdapter.java @@ -38,9 +38,9 @@ /**/ /**/ /**//**/ -/**/public/**/ class /**/GADMRewardBasedVideoAdNetworkAdapterAdapter/**/ +/**/public/**/ class /**/GADMediationAppOpenAdAdapter/**/ extends /**/NSObject/**/ - /**/implements GADMRewardBasedVideoAdNetworkAdapter/**/ { + /**/implements GADMediationAppOpenAd/**/ { /**/ /**/ @@ -53,19 +53,7 @@ /**/ /**//**/ /**/ - @NotImplemented("setUp") - public void setUp() {} - @NotImplemented("requestRewardBasedVideoAd") - public void requestRewardBasedVideoAd() {} - @NotImplemented("presentRewardBasedVideoAdWithRootViewController:") - public void presentRewardBasedVideoAd(UIViewController viewController) {} - @NotImplemented("stopBeingDelegate") - public void stopBeingDelegate() {} - /** - * @deprecated Use setUp. - */ - @Deprecated - @NotImplemented("setUpWithUserID:") - public void setUp(String userID) {} + @NotImplemented("presentFromViewController:") + public void presentFromViewController(UIViewController viewController) {} /**/ } diff --git a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAppOpenAdConfiguration.java b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAppOpenAdConfiguration.java new file mode 100644 index 000000000..d27fc1132 --- /dev/null +++ b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAppOpenAdConfiguration.java @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2013-2015 RoboVM AB + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.robovm.pods.google.mobileads; + +/**/ +import java.io.*; +import java.nio.*; +import java.util.*; +import org.robovm.objc.*; +import org.robovm.objc.annotation.*; +import org.robovm.objc.block.*; +import org.robovm.rt.*; +import org.robovm.rt.annotation.*; +import org.robovm.rt.bro.*; +import org.robovm.rt.bro.annotation.*; +import org.robovm.rt.bro.ptr.*; +import org.robovm.apple.foundation.*; +import org.robovm.apple.coregraphics.*; +import org.robovm.apple.storekit.*; +import org.robovm.apple.uikit.*; +import org.robovm.apple.coreanimation.*; +import org.robovm.apple.webkit.*; +/**/ + +/**/ + +/**/ +/**/@Library(Library.INTERNAL) @NativeClass/**/ +/**/public/**/ class /**/GADMediationAppOpenAdConfiguration/**/ + extends /**/GADMediationAdConfiguration/**/ + /**//**/ { + + /**/public static class GADMediationAppOpenAdConfigurationPtr extends Ptr {}/**/ + /**/static { ObjCRuntime.bind(GADMediationAppOpenAdConfiguration.class); }/**/ + /**//**/ + /**/ + public GADMediationAppOpenAdConfiguration() {} + protected GADMediationAppOpenAdConfiguration(Handle h, long handle) { super(h, handle); } + protected GADMediationAppOpenAdConfiguration(SkipInit skipInit) { super(skipInit); } + /**/ + /**/ + + /**/ + /**//**/ + /**/ + + /**/ +} diff --git a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADGender.java b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAppOpenAdEventDelegate.java similarity index 63% rename from firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADGender.java rename to firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAppOpenAdEventDelegate.java index 0c37add3e..cfbbdd911 100644 --- a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADGender.java +++ b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAppOpenAdEventDelegate.java @@ -38,30 +38,21 @@ /**/ /**/ -/**/@Marshaler(ValuedEnum.AsMachineSizedSIntMarshaler.class)/**/ -public enum /**/GADGender/**/ implements ValuedEnum { - /**/ - Unknown(0L), - Male(1L), - Female(2L); - /**/ +/**//**/ +/**/public/**/ interface /**/GADMediationAppOpenAdEventDelegate/**/ + /**/extends GADMediationAdEventDelegate/**/ { + /**/ + /**/ /**/ /**/ /**//**/ - /**//**/ - - private final long n; - - private /**/GADGender/**/(long n) { this.n = n; } - public long value() { return n; } - public static /**/GADGender/**/ valueOf(long n) { - for (/**/GADGender/**/ v : values()) { - if (v.n == n) { - return v; - } - } - throw new IllegalArgumentException("No constant with value " + n + " found in " - + /**/GADGender/**/.class.getName()); - } + /**/ + + /**/ + /**/ + + /**/ + /**/ + /**/ } diff --git a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAppOpenAdEventDelegateAdapter.java b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAppOpenAdEventDelegateAdapter.java new file mode 100644 index 000000000..de76f66e9 --- /dev/null +++ b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADMediationAppOpenAdEventDelegateAdapter.java @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2013-2015 RoboVM AB + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.robovm.pods.google.mobileads; + +/**/ +import java.io.*; +import java.nio.*; +import java.util.*; +import org.robovm.objc.*; +import org.robovm.objc.annotation.*; +import org.robovm.objc.block.*; +import org.robovm.rt.*; +import org.robovm.rt.annotation.*; +import org.robovm.rt.bro.*; +import org.robovm.rt.bro.annotation.*; +import org.robovm.rt.bro.ptr.*; +import org.robovm.apple.foundation.*; +import org.robovm.apple.coregraphics.*; +import org.robovm.apple.storekit.*; +import org.robovm.apple.uikit.*; +import org.robovm.apple.coreanimation.*; +import org.robovm.apple.webkit.*; +/**/ + +/**/ +/**/ +/**//**/ +/**/public/**/ class /**/GADMediationAppOpenAdEventDelegateAdapter/**/ + extends /**/GADMediationAdEventDelegateAdapter/**/ + /**/implements GADMediationAppOpenAdEventDelegate/**/ { + + /**/ + /**/ + /**/ + /**/ + /**//**/ + /**//**/ + /**/ + + /**/ + /**//**/ + /**/ + + /**/ +} diff --git a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADResponseInfo.java b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADResponseInfo.java index 9e0584a5f..e5429790f 100644 --- a/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADResponseInfo.java +++ b/firebase/ios-google-mobile-ads/src/main/java/org/robovm/pods/google/mobileads/GADResponseInfo.java @@ -54,8 +54,6 @@ public GADResponseInfo() {} /**/ @Property(selector = "responseIdentifier") public native String getResponseIdentifier(); - @Property(selector = "adNetworkClassName") - public native String getAdNetworkClassName(); @Property(selector = "extrasDictionary") public native NSDictionary getExtrasDictionary(); @Property(selector = "loadedAdNetworkResponseInfo") @@ -64,6 +62,12 @@ public GADResponseInfo() {} public native NSArray getAdNetworkInfoArray(); @Property(selector = "dictionaryRepresentation") public native NSDictionary getDictionaryRepresentation(); + /** + * @deprecated Deprecated. Use loadedAdNetworkResponseInfo.adNetworkClassName instead. + */ + @Deprecated + @Property(selector = "adNetworkClassName") + public native String getAdNetworkClassName(); /**/ /**//**/ /**/ diff --git a/firebase/ios-google-sign-in/pom.xml b/firebase/ios-google-sign-in/pom.xml index 5381dd012..dfcfd865c 100644 --- a/firebase/ios-google-sign-in/pom.xml +++ b/firebase/ios-google-sign-in/pom.xml @@ -7,7 +7,7 @@ robopods-firebase-google-signin-ios - RoboPods FireBase Google Sign iOS v6.2.4 + RoboPods FireBase Google Sign iOS v7.0.0 jar diff --git a/firebase/ios-google-sign-in/src/main/bro-gen/GTMSessionFetcher.framework/Headers/GTMSessionFetcher.h b/firebase/ios-google-sign-in/src/main/bro-gen/GTMSessionFetcher.framework/Headers/GTMSessionFetcher.h index 9686b3551..c5a9fdd27 100644 --- a/firebase/ios-google-sign-in/src/main/bro-gen/GTMSessionFetcher.framework/Headers/GTMSessionFetcher.h +++ b/firebase/ios-google-sign-in/src/main/bro-gen/GTMSessionFetcher.framework/Headers/GTMSessionFetcher.h @@ -434,6 +434,10 @@ typedef NS_ENUM(NSInteger, GTMSessionFetcherError) { GTMSessionFetcherErrorBackgroundFetchFailed = -4, GTMSessionFetcherErrorInsecureRequest = -5, GTMSessionFetcherErrorTaskCreationFailed = -6, + + // This error is only used if `stopFetchingTriggersCompletionHandler` is + // enabled and `-stopFetching` is called on that fetcher. + GTMSessionFetcherErrorUserCancelled = -7, }; typedef NS_ENUM(NSInteger, GTMSessionFetcherStatus) { @@ -451,6 +455,7 @@ extern "C" { @class GTMSessionCookieStorage; @class GTMSessionFetcher; +@class GTMSessionFetcherService; // The configuration block is for modifying the NSURLSessionConfiguration only. // DO NOT change any fetcher properties in the configuration block. @@ -459,6 +464,8 @@ typedef void (^GTMSessionFetcherConfigurationBlock)(GTMSessionFetcher *fetcher, typedef void (^GTMSessionFetcherSystemCompletionHandler)(void); typedef void (^GTMSessionFetcherCompletionHandler)(NSData *_Nullable data, NSError *_Nullable error); +typedef NSURLSession *_Nullable (^GTMSessionFetcherSessionCreationBlock)( + id _Nullable sessionDelegate); typedef void (^GTMSessionFetcherBodyStreamProviderResponse)(NSInputStream *bodyStream); typedef void (^GTMSessionFetcherBodyStreamProvider)( GTMSessionFetcherBodyStreamProviderResponse response); @@ -608,37 +615,20 @@ typedef void (^GTMFetcherDecoratorFetcherWillStartCompletionHandler)(NSURLReques @end -// This protocol allows abstract references to the fetcher service, primarily for -// fetchers (which may be compiled without the fetcher service class present.) +// This protocol allows abstract references to the fetcher service. // // Apps should not need to use this protocol. @protocol GTMSessionFetcherServiceProtocol -// This protocol allows us to call into the service without requiring -// GTMSessionFetcherService sources in this project - -@property(atomic, strong) dispatch_queue_t callbackQueue; - -- (BOOL)fetcherShouldBeginFetching:(GTMSessionFetcher *)fetcher; -- (void)fetcherDidCreateSession:(GTMSessionFetcher *)fetcher; -- (void)fetcherDidBeginFetching:(GTMSessionFetcher *)fetcher; -- (void)fetcherDidStop:(GTMSessionFetcher *)fetcher; - (GTMSessionFetcher *)fetcherWithRequest:(NSURLRequest *)request; -- (BOOL)isDelayingFetcher:(GTMSessionFetcher *)fetcher; -@property(atomic, assign) BOOL reuseSession; -- (nullable NSURLSession *)session; -- (nullable NSURLSession *)sessionForFetcherCreation; -- (nullable id)sessionDelegate; -- (nullable NSDate *)stoppedAllFetchersDate; +@property(atomic, strong, null_resettable, readonly) dispatch_queue_t callbackQueue; +// These properties are being removed from the protocol; clients should not attempt new +// accesses to them. +@property(atomic, assign) BOOL reuseSession; @property(atomic, readonly, strong, nullable) NSOperationQueue *delegateQueue; -@optional -// This property is optional, for now, to enable releasing the feature without breaking existing -// code that fakes the service but doesn't implement this. -@property(atomic, readonly, strong, nullable) NSArray> *decorators; - @end // @protocol GTMSessionFetcherServiceProtocol __deprecated_msg("implement GTMSessionFetcherAuthorizer instead") @@ -651,7 +641,7 @@ __deprecated_msg("implement GTMSessionFetcherAuthorizer instead") // This method is being phased out. While implementing it is necessary to satisfy // the protocol's @required restrictions, conforming implementations that implement -// authorizeRequest:completionHandler: will have that called instead. +// authorizeRequest:completionHandler: will have that called instead. // be removed in a future version when GTMFetcherAuthorizationProtocol is // also removed. - (void)authorizeRequest:(nullable NSMutableURLRequest *)request @@ -951,7 +941,7 @@ __deprecated_msg("implement GTMSessionFetcherAuthorizer instead") #pragma clang diagnostic pop // The service object that created and monitors this fetcher, if any. -@property(atomic, strong) id service; +@property(atomic, strong) GTMSessionFetcherService *service; // The host, if any, used to classify this fetcher in the fetcher service. @property(atomic, copy, nullable) NSString *serviceHost; @@ -1098,9 +1088,16 @@ __deprecated_msg("implement GTMSessionFetcherAuthorizer instead") @property(atomic, readonly, getter=isFetching) BOOL fetching; // Cancel the fetch of the request that's currently in progress. The completion handler -// will not be called. +// will be called with `GTMSessionFetcherErrorUserCancelled` if the property +// `stopFetchingTriggersCompletionHandler` is `YES`. - (void)stopFetching; +// Call callbacks with `GTMSessionFetcherErrorUserCancelled` after a `stopFetching`. +// It cannot be changed once the fetcher starts. This should be set to `YES` from +// Swift clients before `beginFetch` with `async/await` since the Swift runtime +// requires the completion handler to be called. +@property(atomic, assign) BOOL stopFetchingTriggersCompletionHandler; + // A block to be called when the fetch completes. @property(atomic, copy, nullable) GTMSessionFetcherCompletionHandler completionHandler; diff --git a/firebase/ios-google-sign-in/src/main/bro-gen/GTMSessionFetcher.framework/Headers/GTMSessionFetcherService.h b/firebase/ios-google-sign-in/src/main/bro-gen/GTMSessionFetcher.framework/Headers/GTMSessionFetcherService.h index 510daa0d0..e1e457ba8 100644 --- a/firebase/ios-google-sign-in/src/main/bro-gen/GTMSessionFetcher.framework/Headers/GTMSessionFetcherService.h +++ b/firebase/ios-google-sign-in/src/main/bro-gen/GTMSessionFetcher.framework/Headers/GTMSessionFetcherService.h @@ -88,6 +88,8 @@ extern NSString *const kGTMSessionFetcherServiceSessionKey; @property(atomic, strong, nullable) id authorizer; #pragma clang diagnostic pop +@property(atomic, readonly, strong, nullable) NSOperationQueue *delegateQueue; + // Delegate queue used by the session when calling back to the fetcher. The default // is the main queue. Changing this does not affect the queue used to call back to the // application; that is specified by the callbackQueue property above. @@ -157,6 +159,9 @@ extern NSString *const kGTMSessionFetcherServiceSessionKey; - (void)stopAllFetchers; +// All decorators added to the service. +@property(atomic, readonly, strong, nullable) NSArray> *decorators; + // Holds a weak reference to `decorator`. When creating a fetcher via // `-fetcherWithRequest:fetcherClass:`, each registered `decorator` can inspect and potentially // change the fetcher's request before it starts. Decorators are invoked in the order in which @@ -166,18 +171,23 @@ extern NSString *const kGTMSessionFetcherServiceSessionKey; // Removes a `decorator` previously passed to `-removeDecorator:`. - (void)removeDecorator:(id)decorator; -// Methods for use by the fetcher class only. -- (nullable NSURLSession *)session; -- (nullable NSURLSession *)sessionForFetcherCreation; -- (nullable id)sessionDelegate; -- (nullable NSDate *)stoppedAllFetchersDate; - // The testBlock can inspect its fetcher parameter's request property to // determine which fetcher is being faked. @property(atomic, copy, nullable) GTMSessionFetcherTestBlock testBlock; @end +@interface GTMSessionFetcherService (FetcherCallbacks) +// Checks whether the fetcher should delay starting to avoid overloading the host. +- (BOOL)fetcherShouldBeginFetching:(nonnull GTMSessionFetcher *)fetcher; + +// Notifies the service that the fetcher did begin fetching. +- (void)fetcherDidBeginFetching:(nonnull GTMSessionFetcher *)fetcher; + +// Notifies the service that the fetcher has stopped fetching. +- (void)fetcherDidStop:(nonnull GTMSessionFetcher *)fetcher; +@end + @interface GTMSessionFetcherService (TestingSupport) // Convenience methods to create a fetcher service for testing. diff --git a/firebase/ios-google-sign-in/src/main/bro-gen/GTMSessionFetcher.framework/Headers/GTMSessionUploadFetcher.h b/firebase/ios-google-sign-in/src/main/bro-gen/GTMSessionFetcher.framework/Headers/GTMSessionUploadFetcher.h index 8557ad407..3537ccc9e 100644 --- a/firebase/ios-google-sign-in/src/main/bro-gen/GTMSessionFetcher.framework/Headers/GTMSessionUploadFetcher.h +++ b/firebase/ios-google-sign-in/src/main/bro-gen/GTMSessionFetcher.framework/Headers/GTMSessionUploadFetcher.h @@ -57,6 +57,8 @@ extern int64_t const kGTMSessionUploadFetcherMaximumDemandBufferSize; // Notification that the upload location URL was provided by the server. extern NSString *const kGTMSessionFetcherUploadLocationObtainedNotification; +// Notification that the exponential backoff for upload has started. +extern NSString *const kGTMSessionFetcherUploadInitialBackoffStartedNotification; // Block to provide data during uploads. // @@ -133,6 +135,10 @@ typedef void (^GTMSessionUploadFetcherCancellationHandler)(GTMSessionFetcher *_N @property(atomic, copy) NSString *uploadMIMEType; @property(atomic, readonly, assign) int64_t chunkSize; @property(atomic, readonly, assign) int64_t currentOffset; +@property(atomic, assign) double uploadRetryFactor; +@property(atomic, assign) NSTimeInterval maxUploadRetryInterval; +@property(atomic, assign) NSTimeInterval minUploadRetryInterval; + // Reflects the original NSURLRequest's @c allowCellularAccess property. @property(atomic, readonly, assign) BOOL allowsCellularAccess; diff --git a/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDAuthentication.h b/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDAuthentication.h deleted file mode 100644 index b2c75b4eb..000000000 --- a/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDAuthentication.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright 2021 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import - -// We have to import GTMAppAuth because forward declaring the protocol does -// not generate the `fetcherAuthorizer` method below for Swift. -#ifdef SWIFT_PACKAGE -@import GTMAppAuth; -#else -#import -#endif - -@class GIDAuthentication; - -NS_ASSUME_NONNULL_BEGIN - -/// A callback block that takes a `GIDAuthentication` or an error if the attempt to refresh tokens -/// was unsuccessful. -typedef void (^GIDAuthenticationAction)(GIDAuthentication *_Nullable authentication, - NSError *_Nullable error); - -/// This class represents the OAuth 2.0 entities needed for sign-in. -@interface GIDAuthentication : NSObject - -/// The client ID associated with the authentication. -@property(nonatomic, readonly) NSString *clientID; - -/// The OAuth2 access token to access Google services. -@property(nonatomic, readonly) NSString *accessToken; - -/// The estimated expiration date of the access token. -@property(nonatomic, readonly) NSDate *accessTokenExpirationDate; - -/// The OAuth2 refresh token to exchange for new access tokens. -@property(nonatomic, readonly) NSString *refreshToken; - -/// An OpenID Connect ID token that identifies the user. Send this token to your server to -/// authenticate the user there. For more information on this topic, see -/// https://developers.google.com/identity/sign-in/ios/backend-auth -@property(nonatomic, readonly, nullable) NSString *idToken; - -/// The estimated expiration date of the ID token. -@property(nonatomic, readonly, nullable) NSDate *idTokenExpirationDate; - -/// Gets a new authorizer for `GTLService`, `GTMSessionFetcher`, or `GTMHTTPFetcher`. -/// -/// @return A new authorizer -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -- (id)fetcherAuthorizer; -#pragma clang diagnostic pop - -/// Get a valid access token and a valid ID token, refreshing them first if they have expired or are -/// about to expire. -/// -/// @param action A callback block that takes a `GIDAuthentication` or an error if the attempt to -/// refresh tokens was unsuccessful. The block will be called asynchronously on the main queue. -- (void)doWithFreshTokens:(GIDAuthenticationAction)action; - -@end - - -NS_ASSUME_NONNULL_END diff --git a/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDConfiguration.h b/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDConfiguration.h index 2ef1ba7ca..4902fa37a 100644 --- a/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDConfiguration.h +++ b/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDConfiguration.h @@ -48,14 +48,14 @@ NS_ASSUME_NONNULL_BEGIN /// Initialize a `GIDConfiguration` object with a client ID. /// /// @param clientID The client ID of the app. -/// @return An initilized `GIDConfiguration` instance. +/// @return An initialized `GIDConfiguration` instance. - (instancetype)initWithClientID:(NSString *)clientID; /// Initialize a `GIDConfiguration` object with a client ID and server client ID. /// /// @param clientID The client ID of the app. /// @param serverClientID The server's client ID. -/// @return An initilized `GIDConfiguration` instance. +/// @return An initialized `GIDConfiguration` instance. - (instancetype)initWithClientID:(NSString *)clientID serverClientID:(nullable NSString *)serverClientID; @@ -65,7 +65,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param serverClientID The server's client ID. /// @param hostedDomain The Google Apps domain to be used. /// @param openIDRealm The OpenID realm to be used. -/// @return An initilized `GIDConfiguration` instance. +/// @return An initialized `GIDConfiguration` instance. - (instancetype)initWithClientID:(NSString *)clientID serverClientID:(nullable NSString *)serverClientID hostedDomain:(nullable NSString *)hostedDomain diff --git a/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDGoogleUser.h b/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDGoogleUser.h index f5f130df1..8cc0bdff3 100644 --- a/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDGoogleUser.h +++ b/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDGoogleUser.h @@ -1,5 +1,5 @@ /* - * Copyright 2021 Google LLC + * Copyright 2022 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,39 +15,106 @@ */ #import +#import -NS_ASSUME_NONNULL_BEGIN +#if __has_include() +#import +#elif __has_include() +#import +#endif + +// We have to import GTMAppAuth because forward declaring the protocol does +// not generate the `fetcherAuthorizer` property below for Swift. +#ifdef SWIFT_PACKAGE +@import GTMAppAuth; +#else +#import +#endif -@class GIDAuthentication; +@class GIDConfiguration; +@class GIDSignInResult; +@class GIDToken; @class GIDProfileData; -/// This class represents a user account. +NS_ASSUME_NONNULL_BEGIN + +/// This class represents a signed-in user. @interface GIDGoogleUser : NSObject /// The Google user ID. @property(nonatomic, readonly, nullable) NSString *userID; -/// Representation of basic profile data for the user. +/// The basic profile data for the user. @property(nonatomic, readonly, nullable) GIDProfileData *profile; -/// The authentication object for the user. -@property(nonatomic, readonly) GIDAuthentication *authentication; - -/// The API scopes granted to the app in an array of `NSString`. +/// The OAuth2 scopes granted to the app in an array of `NSString`. @property(nonatomic, readonly, nullable) NSArray *grantedScopes; -/// For Google Apps hosted accounts, the domain of the user. -@property(nonatomic, readonly, nullable) NSString *hostedDomain; +/// The configuration that was used to sign in this user. +@property(nonatomic, readonly) GIDConfiguration *configuration; + +/// The OAuth2 access token to access Google services. +@property(nonatomic, readonly) GIDToken *accessToken; + +/// The OAuth2 refresh token to exchange for new access tokens. +@property(nonatomic, readonly) GIDToken *refreshToken; + +/// The OpenID Connect ID token that identifies the user. +/// +/// Send this token to your server to authenticate the user there. For more information on this topic, +/// see https://developers.google.com/identity/sign-in/ios/backend-auth. +@property(nonatomic, readonly, nullable) GIDToken *idToken; + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +/// The authorizer for use with `GTLRService`, `GTMSessionFetcher`, or `GTMHTTPFetcher`. +@property(nonatomic, readonly) id fetcherAuthorizer; +#pragma clang diagnostic pop + +/// Refresh the user's access and ID tokens if they have expired or are about to expire. +/// +/// @param completion A completion block that takes a `GIDGoogleUser` or an error if the attempt to +/// refresh tokens was unsuccessful. The block will be called asynchronously on the main queue. +- (void)refreshTokensIfNeededWithCompletion:(void (^)(GIDGoogleUser *_Nullable user, + NSError *_Nullable error))completion; + +#if TARGET_OS_IOS || TARGET_OS_MACCATALYST -/// The client ID of the home server. -@property(nonatomic, readonly, nullable) NSString *serverClientID; +/// Starts an interactive consent flow on iOS to add new scopes to the user's `grantedScopes`. +/// +/// The completion will be called at the end of this process. If successful, a `GIDSignInResult` +/// instance will be returned reflecting the new scopes and saved sign-in state will be updated. +/// +/// @param scopes The scopes to ask the user to consent to. +/// @param presentingViewController The view controller used to present `SFSafariViewContoller` on +/// iOS 9 and 10 and to supply `presentationContextProvider` for `ASWebAuthenticationSession` on +/// iOS 13+. +/// @param completion The optional block that is called on completion. This block will be called +/// asynchronously on the main queue. +- (void)addScopes:(NSArray *)scopes + presentingViewController:(UIViewController *)presentingViewController + completion:(nullable void (^)(GIDSignInResult *_Nullable signInResult, + NSError *_Nullable error))completion + NS_EXTENSION_UNAVAILABLE("The add scopes flow is not supported in App Extensions."); -/// An OAuth2 authorization code for the home server. -@property(nonatomic, readonly, nullable) NSString *serverAuthCode; +#elif TARGET_OS_OSX -/// The OpenID2 realm of the home server. -@property(nonatomic, readonly, nullable) NSString *openIDRealm; +/// Starts an interactive consent flow on macOS to add new scopes to the user's `grantedScopes`. +/// +/// The completion will be called at the end of this process. If successful, a `GIDSignInResult` +/// instance will be returned reflecting the new scopes and saved sign-in state will be updated. +/// +/// @param scopes An array of scopes to ask the user to consent to. +/// @param presentingWindow The window used to supply `presentationContextProvider` for +/// `ASWebAuthenticationSession`. +/// @param completion The optional block that is called on completion. This block will be called +/// asynchronously on the main queue. +- (void)addScopes:(NSArray *)scopes + presentingWindow:(NSWindow *)presentingWindow + completion:(nullable void (^)(GIDSignInResult *_Nullable signInResult, + NSError *_Nullable error))completion; +#endif @end diff --git a/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDSignIn.h b/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDSignIn.h index 094dffb13..9ea598120 100644 --- a/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDSignIn.h +++ b/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDSignIn.h @@ -25,6 +25,7 @@ @class GIDConfiguration; @class GIDGoogleUser; +@class GIDSignInResult; NS_ASSUME_NONNULL_BEGIN @@ -44,31 +45,27 @@ typedef NS_ERROR_ENUM(kGIDSignInErrorDomain, GIDSignInErrorCode) { kGIDSignInErrorCodeCanceled = -5, /// Indicates an Enterprise Mobility Management related error has occurred. kGIDSignInErrorCodeEMM = -6, - /// Indicates there is no `currentUser`. - kGIDSignInErrorCodeNoCurrentUser = -7, /// Indicates the requested scopes have already been granted to the `currentUser`. kGIDSignInErrorCodeScopesAlreadyGranted = -8, + /// Indicates there is an operation on a previous user. + kGIDSignInErrorCodeMismatchWithCurrentUser = -9, }; -/// Represents a callback block that takes a `GIDGoogleUser` on success or an error if the operation -/// was unsuccessful. -typedef void (^GIDSignInCallback)(GIDGoogleUser *_Nullable user, NSError *_Nullable error); - -/// Represents a callback block that takes an error if the operation was unsuccessful. -typedef void (^GIDDisconnectCallback)(NSError *_Nullable error); - -/// This class signs the user in with Google. +/// This class is used to sign in users with their Google account and manage their session. /// -/// For reference, please see "Google Sign-In for iOS" at +/// For reference, please see "Google Sign-In for iOS and macOS" at /// https://developers.google.com/identity/sign-in/ios @interface GIDSignIn : NSObject -/// A shared `GIDSignIn` instance. +/// The shared `GIDSignIn` instance. @property(class, nonatomic, readonly) GIDSignIn *sharedInstance; /// The `GIDGoogleUser` object representing the current user or `nil` if there is no signed-in user. @property(nonatomic, readonly, nullable) GIDGoogleUser *currentUser; +/// The active configuration for this instance of `GIDSignIn`. +@property(nonatomic, nullable) GIDConfiguration *configuration; + /// Unavailable. Use the `sharedInstance` property to instantiate `GIDSignIn`. /// :nodoc: + (instancetype)new NS_UNAVAILABLE; @@ -84,172 +81,141 @@ typedef void (^GIDDisconnectCallback)(NSError *_Nullable error); /// @return `YES` if `GIDSignIn` handled this URL. - (BOOL)handleURL:(NSURL *)url; -/// Checks if there is a previously authenticated user saved in keychain. +/// Checks if there is a previous user sign-in saved in keychain. /// -/// @return `YES` if there is a previously authenticated user saved in keychain. +/// @return `YES` if there is a previous user sign-in saved in keychain. - (BOOL)hasPreviousSignIn; -/// Attempts to restore a previously authenticated user without interaction. +/// Attempts to restore a previous user sign-in without interaction. /// -/// @param callback The `GIDSignInCallback` block that is called on completion. This block will be -/// called asynchronously on the main queue. -- (void)restorePreviousSignInWithCallback:(nullable GIDSignInCallback)callback; +/// @param completion The block that is called on completion. This block will be called asynchronously +/// on the main queue. +- (void)restorePreviousSignInWithCompletion:(nullable void (^)(GIDGoogleUser *_Nullable user, + NSError *_Nullable error))completion; -/// Marks current user as being in the signed out state. +/// Signs out the `currentUser`, removing it from the keychain. - (void)signOut; -/// Disconnects the current user from the app and revokes previous authentication. If the operation -/// succeeds, the OAuth 2.0 token is also removed from keychain. +/// Disconnects the `currentUser` by signing them out and revoking all OAuth2 scope grants made to the app. /// -/// @param callback The optional `GIDDisconnectCallback` block that is called on completion. This -/// block will be called asynchronously on the main queue. -- (void)disconnectWithCallback:(nullable GIDDisconnectCallback)callback; +/// @param completion The optional block that is called on completion. +/// This block will be called asynchronously on the main queue. +- (void)disconnectWithCompletion:(nullable void (^)(NSError *_Nullable error))completion; #if TARGET_OS_IOS || TARGET_OS_MACCATALYST -/// Starts an interactive sign-in flow on iOS using the provided configuration. + +/// Starts an interactive sign-in flow on iOS. /// -/// The callback will be called at the end of this process. Any saved sign-in state will be +/// The completion will be called at the end of this process. Any saved sign-in state will be /// replaced by the result of this flow. Note that this method should not be called when the app is /// starting up, (e.g in `application:didFinishLaunchingWithOptions:`); instead use the -/// `restorePreviousSignInWithCallback:` method to restore a previous sign-in. +/// `restorePreviousSignInWithCompletion:` method to restore a previous sign-in. /// -/// @param configuration The configuration properties to be used for this flow. /// @param presentingViewController The view controller used to present `SFSafariViewContoller` on /// iOS 9 and 10 and to supply `presentationContextProvider` for `ASWebAuthenticationSession` on /// iOS 13+. -/// @param callback The `GIDSignInCallback` block that is called on completion. This block will be -/// called asynchronously on the main queue. -- (void)signInWithConfiguration:(GIDConfiguration *)configuration - presentingViewController:(UIViewController *)presentingViewController - callback:(nullable GIDSignInCallback)callback +/// @param completion The optional block that is called on completion. This block will +/// be called asynchronously on the main queue. +- (void)signInWithPresentingViewController:(UIViewController *)presentingViewController + completion: + (nullable void (^)(GIDSignInResult *_Nullable signInResult, + NSError *_Nullable error))completion NS_EXTENSION_UNAVAILABLE("The sign-in flow is not supported in App Extensions."); -/// Starts an interactive sign-in flow on iOS using the provided configuration and a login hint. +/// Starts an interactive sign-in flow on iOS using the provided hint. /// -/// The callback will be called at the end of this process. Any saved sign-in state will be +/// The completion will be called at the end of this process. Any saved sign-in state will be /// replaced by the result of this flow. Note that this method should not be called when the app is /// starting up, (e.g in `application:didFinishLaunchingWithOptions:`); instead use the -/// `restorePreviousSignInWithCallback:` method to restore a previous sign-in. +/// `restorePreviousSignInWithCompletion:` method to restore a previous sign-in. /// -/// @param configuration The configuration properties to be used for this flow. /// @param presentingViewController The view controller used to present `SFSafariViewContoller` on /// iOS 9 and 10 and to supply `presentationContextProvider` for `ASWebAuthenticationSession` on /// iOS 13+. /// @param hint An optional hint for the authorization server, for example the user's ID or email /// address, to be prefilled if possible. -/// @param callback The `GIDSignInCallback` block that is called on completion. This block will be -/// called asynchronously on the main queue. -- (void)signInWithConfiguration:(GIDConfiguration *)configuration - presentingViewController:(UIViewController *)presentingViewController - hint:(nullable NSString *)hint - callback:(nullable GIDSignInCallback)callback +/// @param completion The optional block that is called on completion. This block will +/// be called asynchronously on the main queue. +- (void)signInWithPresentingViewController:(UIViewController *)presentingViewController + hint:(nullable NSString *)hint + completion: + (nullable void (^)(GIDSignInResult *_Nullable signInResult, + NSError *_Nullable error))completion NS_EXTENSION_UNAVAILABLE("The sign-in flow is not supported in App Extensions."); -/// Starts an interactive sign-in flow on iOS using the provided configuration and a login hint. +/// Starts an interactive sign-in flow on iOS using the provided hint and additional scopes. /// -/// The callback will be called at the end of this process. Any saved sign-in state will be +/// The completion will be called at the end of this process. Any saved sign-in state will be /// replaced by the result of this flow. Note that this method should not be called when the app is /// starting up, (e.g in `application:didFinishLaunchingWithOptions:`); instead use the -/// `restorePreviousSignInWithCallback:` method to restore a previous sign-in. +/// `restorePreviousSignInWithCompletion:` method to restore a previous sign-in. /// -/// @param configuration The configuration properties to be used for this flow. /// @param presentingViewController The view controller used to present `SFSafariViewContoller` on /// iOS 9 and 10. /// @param hint An optional hint for the authorization server, for example the user's ID or email /// address, to be prefilled if possible. /// @param additionalScopes An optional array of scopes to request in addition to the basic profile scopes. -/// @param callback The `GIDSignInCallback` block that is called on completion. This block will be -/// called asynchronously on the main queue. - -- (void)signInWithConfiguration:(GIDConfiguration *)configuration - presentingViewController:(UIViewController *)presentingViewController - hint:(nullable NSString *)hint - additionalScopes:(nullable NSArray *)additionalScopes - callback:(nullable GIDSignInCallback)callback; - -/// Starts an interactive consent flow on iOS to add scopes to the current user's grants. -/// -/// The callback will be called at the end of this process. If successful, a new `GIDGoogleUser` -/// instance will be returned reflecting the new scopes and saved sign-in state will be updated. -/// -/// @param scopes The scopes to ask the user to consent to. -/// @param presentingViewController The view controller used to present `SFSafariViewContoller` on -/// iOS 9 and 10 and to supply `presentationContextProvider` for `ASWebAuthenticationSession` on -/// iOS 13+. -/// @param callback The `GIDSignInCallback` block that is called on completion. This block will be -/// called asynchronously on the main queue. -- (void)addScopes:(NSArray *)scopes - presentingViewController:(UIViewController *)presentingViewController - callback:(nullable GIDSignInCallback)callback - NS_EXTENSION_UNAVAILABLE("The add scopes flow is not supported in App Extensions."); +/// @param completion The optional block that is called on completion. This block will +/// be called asynchronously on the main queue. +- (void)signInWithPresentingViewController:(UIViewController *)presentingViewController + hint:(nullable NSString *)hint + additionalScopes:(nullable NSArray *)additionalScopes + completion: + (nullable void (^)(GIDSignInResult *_Nullable signInResult, + NSError *_Nullable error))completion + NS_EXTENSION_UNAVAILABLE("The sign-in flow is not supported in App Extensions."); #elif TARGET_OS_OSX -/// Starts an interactive sign-in flow on macOS using the provided configuration. + +/// Starts an interactive sign-in flow on macOS. /// -/// The callback will be called at the end of this process. Any saved sign-in state will be +/// The completion will be called at the end of this process. Any saved sign-in state will be /// replaced by the result of this flow. Note that this method should not be called when the app is /// starting up, (e.g in `application:didFinishLaunchingWithOptions:`); instead use the -/// `restorePreviousSignInWithCallback:` method to restore a previous sign-in. +/// `restorePreviousSignInWithCompletion:` method to restore a previous sign-in. /// -/// @param configuration The configuration properties to be used for this flow. /// @param presentingWindow The window used to supply `presentationContextProvider` for `ASWebAuthenticationSession`. -/// @param callback The `GIDSignInCallback` block that is called on completion. This block will be -/// called asynchronously on the main queue. -- (void)signInWithConfiguration:(GIDConfiguration *)configuration - presentingWindow:(NSWindow *)presentingWindow - callback:(nullable GIDSignInCallback)callback; +/// @param completion The optional block that is called on completion. This block will +/// be called asynchronously on the main queue. +- (void)signInWithPresentingWindow:(NSWindow *)presentingWindow + completion:(nullable void (^)(GIDSignInResult *_Nullable signInResult, + NSError *_Nullable error))completion; -/// Starts an interactive sign-in flow on macOS using the provided configuration and a login hint. +/// Starts an interactive sign-in flow on macOS using the provided hint. /// -/// The callback will be called at the end of this process. Any saved sign-in state will be +/// The completion will be called at the end of this process. Any saved sign-in state will be /// replaced by the result of this flow. Note that this method should not be called when the app is /// starting up, (e.g in `application:didFinishLaunchingWithOptions:`); instead use the -/// `restorePreviousSignInWithCallback:` method to restore a previous sign-in. +/// `restorePreviousSignInWithCompletion:` method to restore a previous sign-in. /// -/// @param configuration The configuration properties to be used for this flow. /// @param presentingWindow The window used to supply `presentationContextProvider` for `ASWebAuthenticationSession`. /// @param hint An optional hint for the authorization server, for example the user's ID or email /// address, to be prefilled if possible. -/// @param callback The `GIDSignInCallback` block that is called on completion. This block will be -/// called asynchronously on the main queue. -- (void)signInWithConfiguration:(GIDConfiguration *)configuration - presentingWindow:(NSWindow *)presentingWindow - hint:(nullable NSString *)hint - callback:(nullable GIDSignInCallback)callback; +/// @param completion The optional block that is called on completion. This block will +/// be called asynchronously on the main queue. +- (void)signInWithPresentingWindow:(NSWindow *)presentingWindow + hint:(nullable NSString *)hint + completion:(nullable void (^)(GIDSignInResult *_Nullable signInResult, + NSError *_Nullable error))completion; -/// Starts an interactive sign-in flow on macOS using the provided configuration and a login hint. +/// Starts an interactive sign-in flow on macOS using the provided hint. /// -/// The callback will be called at the end of this process. Any saved sign-in state will be +/// The completion will be called at the end of this process. Any saved sign-in state will be /// replaced by the result of this flow. Note that this method should not be called when the app is /// starting up, (e.g in `application:didFinishLaunchingWithOptions:`); instead use the -/// `restorePreviousSignInWithCallback:` method to restore a previous sign-in. +/// `restorePreviousSignInWithCompletion:` method to restore a previous sign-in. /// -/// @param configuration The configuration properties to be used for this flow. /// @param presentingWindow The window used to supply `presentationContextProvider` for `ASWebAuthenticationSession`. /// @param hint An optional hint for the authorization server, for example the user's ID or email /// address, to be prefilled if possible. /// @param additionalScopes An optional array of scopes to request in addition to the basic profile scopes. -/// @param callback The `GIDSignInCallback` block that is called on completion. This block will be -/// called asynchronously on the main queue. - -- (void)signInWithConfiguration:(GIDConfiguration *)configuration - presentingWindow:(NSWindow *)presentingWindow - hint:(nullable NSString *)hint - additionalScopes:(nullable NSArray *)additionalScopes - callback:(nullable GIDSignInCallback)callback; - -/// Starts an interactive consent flow on macOS to add scopes to the current user's grants. -/// -/// The callback will be called at the end of this process. If successful, a new `GIDGoogleUser` -/// instance will be returned reflecting the new scopes and saved sign-in state will be updated. -/// -/// @param scopes An array of scopes to ask the user to consent to. -/// @param presentingWindow The window used to supply `presentationContextProvider` for `ASWebAuthenticationSession`. -/// @param callback The `GIDSignInCallback` block that is called on completion. This block will be -/// called asynchronously on the main queue. -- (void)addScopes:(NSArray *)scopes - presentingWindow:(NSWindow *)presentingWindow - callback:(nullable GIDSignInCallback)callback; +/// @param completion The optional block that is called on completion. This block will +/// be called asynchronously on the main queue. +- (void)signInWithPresentingWindow:(NSWindow *)presentingWindow + hint:(nullable NSString *)hint + additionalScopes:(nullable NSArray *)additionalScopes + completion:(nullable void (^)(GIDSignInResult *_Nullable signInResult, + NSError *_Nullable error))completion; #endif diff --git a/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDSignInButton.h b/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDSignInButton.h index ce17204f5..f27488fb0 100644 --- a/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDSignInButton.h +++ b/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDSignInButton.h @@ -42,10 +42,10 @@ typedef NS_ENUM(NSInteger, GIDSignInButtonColorScheme) { /// This class provides the "Sign in with Google" button. /// -/// You can instantiate this class programmatically or from a NIB file. You -/// should connect this control to an `IBAction`, or something similar, that -/// calls signInWithConfiguration:presentingViewController:callback: on -/// `GIDSignIn` and add it to your view hierarchy. +/// You can instantiate this class programmatically or from a NIB file. You should connect this +/// control to an `IBAction`, or something similar, that calls +/// signInWithPresentingViewController:completion: on `GIDSignIn` and add it to your view +/// hierarchy. @interface GIDSignInButton : UIControl /// The layout style for the sign-in button. diff --git a/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDSignInResult.h b/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDSignInResult.h new file mode 100644 index 000000000..3da9158be --- /dev/null +++ b/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDSignInResult.h @@ -0,0 +1,40 @@ +/* +* Copyright 2022 Google LLC +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +#import + +@class GIDGoogleUser; + +NS_ASSUME_NONNULL_BEGIN + +/// A helper object that contains the result of a successful signIn or addScopes flow. +@interface GIDSignInResult : NSObject + +/// The updated `GIDGoogleUser` instance for the user who just completed the flow. +@property(nonatomic, readonly) GIDGoogleUser *user; + +/// An OAuth2 authorization code for the home server. +@property(nonatomic, readonly, nullable) NSString *serverAuthCode; + +/// Unsupported. ++ (instancetype)new NS_UNAVAILABLE; + +/// Unsupported. +- (instancetype)init NS_UNAVAILABLE; + +@end + +NS_ASSUME_NONNULL_END diff --git a/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDToken.h b/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDToken.h new file mode 100644 index 000000000..024f0539d --- /dev/null +++ b/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GIDToken.h @@ -0,0 +1,45 @@ +/* + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#import + +NS_ASSUME_NONNULL_BEGIN + +/// This class represents an OAuth2 or OpenID Connect token. +@interface GIDToken : NSObject + +/// The token string. +@property(nonatomic, copy, readonly) NSString *tokenString; + +/// The estimated expiration date of the token. +@property(nonatomic, readonly, nullable) NSDate *expirationDate; + +/// Check if current token is equal to another one. +/// +/// @param otherToken Another token to compare. +- (BOOL)isEqualToToken:(GIDToken *)otherToken; + +/// Unavailable. +/// :nodoc: ++ (instancetype)new NS_UNAVAILABLE; + +/// Unavailable. +/// :nodoc: +- (instancetype)init NS_UNAVAILABLE; + +@end + +NS_ASSUME_NONNULL_END diff --git a/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GoogleSignIn-umbrella.h b/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GoogleSignIn-umbrella.h index e37964aea..f4222061c 100644 --- a/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GoogleSignIn-umbrella.h +++ b/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GoogleSignIn-umbrella.h @@ -10,12 +10,13 @@ #endif #endif -#import "GIDAuthentication.h" #import "GIDConfiguration.h" #import "GIDGoogleUser.h" #import "GIDProfileData.h" #import "GIDSignIn.h" #import "GIDSignInButton.h" +#import "GIDSignInResult.h" +#import "GIDToken.h" #import "GoogleSignIn.h" FOUNDATION_EXPORT double GoogleSignInVersionNumber; diff --git a/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GoogleSignIn.h b/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GoogleSignIn.h index 091f2c1a4..5923329da 100644 --- a/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GoogleSignIn.h +++ b/firebase/ios-google-sign-in/src/main/bro-gen/GoogleSignIn.framework/Headers/GoogleSignIn.h @@ -15,11 +15,12 @@ */ #import -#import "GIDAuthentication.h" #import "GIDConfiguration.h" #import "GIDGoogleUser.h" #import "GIDProfileData.h" #import "GIDSignIn.h" +#import "GIDToken.h" +#import "GIDSignInResult.h" #if TARGET_OS_IOS || TARGET_OS_MACCATALYST #import "GIDSignInButton.h" #endif diff --git a/firebase/ios-google-sign-in/src/main/bro-gen/firebase-google-sign-in.yaml b/firebase/ios-google-sign-in/src/main/bro-gen/firebase-google-sign-in.yaml index 300d1f106..76cae99df 100644 --- a/firebase/ios-google-sign-in/src/main/bro-gen/firebase-google-sign-in.yaml +++ b/firebase/ios-google-sign-in/src/main/bro-gen/firebase-google-sign-in.yaml @@ -5,7 +5,7 @@ header_root: '.' include: [foundation, uikit, coregraphics, dispatch, coreanimation] clang_args: ['-x', 'objective-c'] headers: - - "#include " + - "#include " - "#include " enums: @@ -27,7 +27,12 @@ classes: exclude: true # for now, as requires GTMSessionFetcher '-doWithFreshTokens:': name: doWithFreshTokens - GIDGoogleUser: {} + GIDGoogleUser: + methods: + '-refreshTokensIfNeededWithCompletion:': + name: refreshTokensIfNeeded + '-addScopes:presentingViewController:completion:': + name: addScopes GIDProfileData: methods: '-imageURLWithDimension:': @@ -49,7 +54,27 @@ classes: name: addScopes '-disconnectWithCallback:': name: disconnect + '-restorePreviousSignInWithCompletion:': + name: restorePreviousSignIn + '-disconnectWithCompletion:': + name: disconnect + '-signInWithPresentingViewController:completion:': + name: signIn + '-signInWithPresentingViewController:hint:completion:': + name: signIn + '-signInWithPresentingViewController:hint:additionalScopes:completion:': + name: signIn GIDSignInButton: {} + GIDConfiguration: + methods: + '-initWithClientID:': + name: init + '-initWithClientID:serverClientID:': + name: init + '-initWithClientID:serverClientID:hostedDomain:openIDRealm:': + name: init + GIDSignInResult: { } + GIDToken: { } # GTMSessionFetcher GTMSessionCookieStorage: {} @@ -86,14 +111,32 @@ classes: '+application:handleEventsForBackgroundURLSession:completionHandler:': name: handleEventsForBackgroundURLSession GTMSessionFetcherUserDefaultsFactory: {} - GIDConfiguration: + GTMSessionFetcherService: methods: - '-initWithClientID:': - name: init - '-initWithClientID:serverClientID:': - name: init - '-initWithClientID:serverClientID:hostedDomain:openIDRealm:': - name: init + '-fetcherWithURL:': + name: getFetcher + '-fetcherWithURLString:': + name: getFetcher + '-fetcherWithRequest:fetcherClass:': + name: getFetcher + '-issuedFetchersWithRequestURL:': + name: issuedFetchers + '-waitForCompletionOfAllFetchersWithTimeout:': + name: waitForCompletionOfAllFetchers + '+mockFetcherServiceWithFakedData:fakedError:': + name: mockFetcherService + '+mockFetcherServiceWithFakedData:fakedResponse:fakedError:': + name: mockFetcherService + GTMSessionUploadFetcher: + methods: + '-setUploadDataLength:provider:': + name: setUploadDataLength + '+uploadFetcherWithRequest:uploadMIMEType:chunkSize:fetcherService:': + name: uploadFetcher + '+uploadFetcherWithLocation:uploadMIMEType:chunkSize:fetcherService:': + name: uploadFetcher + '+uploadFetcherWithLocation:uploadMIMEType:chunkSize:allowsCellularAccess:fetcherService:': + name: uploadFetcher protocols: GIDSignInDelegate: methods: @@ -130,8 +173,6 @@ protocols: '-authorizeRequest:delegate:didFinishSelector:': name: authorizeRequest functions: - - # GTMSessionFetcher GTMFetcherStandardUserAgentString: class: GTMSessionFetcher @@ -169,10 +210,14 @@ values: static_class: Notifications name: '#{g[0]}' - kGTMSessionFetcher(.*): + k?GTMSessionFetcher(.*): class: GTMSessionFetcher static_class: Consts name: '#{g[0]}' + k?GTMSessionUploadFetcher(.*): + class: GTMSessionUploadFetcher + static_class: Consts + name: '#{g[0]}' # Make sure we don't miss any values if new ones are introduced in a later version (.*): diff --git a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDGoogleUser.java b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDGoogleUser.java index 993f07560..010321400 100644 --- a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDGoogleUser.java +++ b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDGoogleUser.java @@ -57,23 +57,27 @@ public GIDGoogleUser() {} public native String getUserID(); @Property(selector = "profile") public native GIDProfileData getProfile(); - @Property(selector = "authentication") - public native GIDAuthentication getAuthentication(); @Property(selector = "grantedScopes") public native NSArray getGrantedScopes(); - @Property(selector = "hostedDomain") - public native String getHostedDomain(); - @Property(selector = "serverClientID") - public native String getServerClientID(); - @Property(selector = "serverAuthCode") - public native String getServerAuthCode(); - @Property(selector = "openIDRealm") - public native String getOpenIDRealm(); + @Property(selector = "configuration") + public native GIDConfiguration getConfiguration(); + @Property(selector = "accessToken") + public native GIDToken getAccessToken(); + @Property(selector = "refreshToken") + public native GIDToken getRefreshToken(); + @Property(selector = "idToken") + public native GIDToken getIdToken(); + @Property(selector = "fetcherAuthorizer") + public native GTMFetcherAuthorizationProtocol getFetcherAuthorizer(); @Property(selector = "supportsSecureCoding") public static native boolean supportsSecureCoding(); /**/ /**//**/ /**/ + @Method(selector = "refreshTokensIfNeededWithCompletion:") + public native void refreshTokensIfNeeded(@Block VoidBlock2 completion); + @Method(selector = "addScopes:presentingViewController:completion:") + public native void addScopes(NSArray scopes, UIViewController presentingViewController, @Block VoidBlock2 completion); @Method(selector = "encodeWithCoder:") public native void encode(NSCoder coder); @Method(selector = "initWithCoder:") diff --git a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDSignIn.java b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDSignIn.java index 508aa01fd..3a9f62a80 100644 --- a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDSignIn.java +++ b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDSignIn.java @@ -55,6 +55,10 @@ protected GIDSignIn() {} public static native GIDSignIn sharedInstance(); @Property(selector = "currentUser") public native GIDGoogleUser getCurrentUser(); + @Property(selector = "configuration") + public native GIDConfiguration getConfiguration(); + @Property(selector = "setConfiguration:") + public native void setConfiguration(GIDConfiguration v); /**/ /**//**/ /**/ @@ -62,19 +66,17 @@ protected GIDSignIn() {} public native boolean handleURL(NSURL url); @Method(selector = "hasPreviousSignIn") public native boolean hasPreviousSignIn(); - @Method(selector = "restorePreviousSignInWithCallback:") - public native void restorePreviousSignIn(@Block VoidBlock2 callback); + @Method(selector = "restorePreviousSignInWithCompletion:") + public native void restorePreviousSignIn(@Block VoidBlock2 completion); @Method(selector = "signOut") public native void signOut(); - @Method(selector = "disconnectWithCallback:") - public native void disconnect(@Block VoidBlock1 callback); - @Method(selector = "signInWithConfiguration:presentingViewController:callback:") - public native void signIn(GIDConfiguration configuration, UIViewController presentingViewController, @Block VoidBlock2 callback); - @Method(selector = "signInWithConfiguration:presentingViewController:hint:callback:") - public native void signIn(GIDConfiguration configuration, UIViewController presentingViewController, String hint, @Block VoidBlock2 callback); - @Method(selector = "signInWithConfiguration:presentingViewController:hint:additionalScopes:callback:") - public native void signIn(GIDConfiguration configuration, UIViewController presentingViewController, String hint, NSArray additionalScopes, @Block VoidBlock2 callback); - @Method(selector = "addScopes:presentingViewController:callback:") - public native void addScopes(NSArray scopes, UIViewController presentingViewController, @Block VoidBlock2 callback); + @Method(selector = "disconnectWithCompletion:") + public native void disconnect(@Block VoidBlock1 completion); + @Method(selector = "signInWithPresentingViewController:completion:") + public native void signIn(UIViewController presentingViewController, @Block VoidBlock2 completion); + @Method(selector = "signInWithPresentingViewController:hint:completion:") + public native void signIn(UIViewController presentingViewController, String hint, @Block VoidBlock2 completion); + @Method(selector = "signInWithPresentingViewController:hint:additionalScopes:completion:") + public native void signIn(UIViewController presentingViewController, String hint, NSArray additionalScopes, @Block VoidBlock2 completion); /**/ } diff --git a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDSignInErrorCode.java b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDSignInErrorCode.java index 252758b42..6ef6adc2d 100644 --- a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDSignInErrorCode.java +++ b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDSignInErrorCode.java @@ -45,8 +45,8 @@ public enum /**/GIDSignInErrorCode/**/ implements NSErrorCode { HasNoAuthInKeychain(-4L), Canceled(-5L), EMM(-6L), - NoCurrentUser(-7L), - ScopesAlreadyGranted(-8L); + ScopesAlreadyGranted(-8L), + MismatchWithCurrentUser(-9L); /**/ /**/static { Bro.bind(GIDSignInErrorCode.class); }/**/ diff --git a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDSignInResult.java b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDSignInResult.java new file mode 100644 index 000000000..31fd72070 --- /dev/null +++ b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDSignInResult.java @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2013-2015 RoboVM AB + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.robovm.pods.firebase.googlesignin; + +/**/ +import java.io.*; +import java.nio.*; +import java.util.*; +import org.robovm.objc.*; +import org.robovm.objc.annotation.*; +import org.robovm.objc.block.*; +import org.robovm.rt.*; +import org.robovm.rt.annotation.*; +import org.robovm.rt.bro.*; +import org.robovm.rt.bro.annotation.*; +import org.robovm.rt.bro.ptr.*; +import org.robovm.apple.foundation.*; +import org.robovm.apple.uikit.*; +import org.robovm.apple.coregraphics.*; +import org.robovm.apple.dispatch.*; +import org.robovm.apple.coreanimation.*; +/**/ + +/**/ + +/**/ +/**/@Library(Library.INTERNAL) @NativeClass/**/ +/**/public/**/ class /**/GIDSignInResult/**/ + extends /**/NSObject/**/ + /**//**/ { + + /**/public static class GIDSignInResultPtr extends Ptr {}/**/ + /**/static { ObjCRuntime.bind(GIDSignInResult.class); }/**/ + /**//**/ + /**/ + protected GIDSignInResult() {} + protected GIDSignInResult(Handle h, long handle) { super(h, handle); } + protected GIDSignInResult(SkipInit skipInit) { super(skipInit); } + /**/ + /**/ + @Property(selector = "user") + public native GIDGoogleUser getUser(); + @Property(selector = "serverAuthCode") + public native String getServerAuthCode(); + /**/ + /**//**/ + /**/ + + /**/ +} diff --git a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDAuthentication.java b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDToken.java similarity index 60% rename from firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDAuthentication.java rename to firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDToken.java index b49abdf14..2c8172d56 100644 --- a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDAuthentication.java +++ b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GIDToken.java @@ -38,40 +38,32 @@ /**/ /**/@Library(Library.INTERNAL) @NativeClass/**/ -/**/public/**/ class /**/GIDAuthentication/**/ +/**/public/**/ class /**/GIDToken/**/ extends /**/NSObject/**/ /**/implements NSSecureCoding/**/ { - /**/public static class GIDAuthenticationPtr extends Ptr {}/**/ - /**/static { ObjCRuntime.bind(GIDAuthentication.class); }/**/ + /**/public static class GIDTokenPtr extends Ptr {}/**/ + /**/static { ObjCRuntime.bind(GIDToken.class); }/**/ /**//**/ /**/ - public GIDAuthentication() {} - protected GIDAuthentication(Handle h, long handle) { super(h, handle); } - protected GIDAuthentication(SkipInit skipInit) { super(skipInit); } + protected GIDToken() {} + protected GIDToken(Handle h, long handle) { super(h, handle); } + protected GIDToken(SkipInit skipInit) { super(skipInit); } @Method(selector = "initWithCoder:") - public GIDAuthentication(NSCoder coder) { super((SkipInit) null); initObject(init(coder)); } + public GIDToken(NSCoder coder) { super((SkipInit) null); initObject(init(coder)); } /**/ /**/ - @Property(selector = "clientID") - public native String getClientID(); - @Property(selector = "accessToken") - public native String getAccessToken(); - @Property(selector = "accessTokenExpirationDate") - public native NSDate getAccessTokenExpirationDate(); - @Property(selector = "refreshToken") - public native String getRefreshToken(); - @Property(selector = "idToken") - public native String getIdToken(); - @Property(selector = "idTokenExpirationDate") - public native NSDate getIdTokenExpirationDate(); + @Property(selector = "tokenString") + public native String getTokenString(); + @Property(selector = "expirationDate") + public native NSDate getExpirationDate(); @Property(selector = "supportsSecureCoding") public static native boolean supportsSecureCoding(); /**/ /**//**/ /**/ - @Method(selector = "doWithFreshTokens:") - public native void doWithFreshTokens(@Block VoidBlock2 action); + @Method(selector = "isEqualToToken:") + public native boolean isEqualToToken(GIDToken otherToken); @Method(selector = "encodeWithCoder:") public native void encode(NSCoder coder); @Method(selector = "initWithCoder:") diff --git a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcher.java b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcher.java index 21fd047b7..8aa3c2b72 100644 --- a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcher.java +++ b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcher.java @@ -152,9 +152,9 @@ public GTMSessionFetcher() {} @Property(selector = "setAuthorizer:") public native void setAuthorizer(GTMFetcherAuthorizationProtocol v); @Property(selector = "service") - public native GTMSessionFetcherServiceProtocol getService(); + public native GTMSessionFetcherService getService(); @Property(selector = "setService:") - public native void setService(GTMSessionFetcherServiceProtocol v); + public native void setService(GTMSessionFetcherService v); @Property(selector = "serviceHost") public native String getServiceHost(); @Property(selector = "setServiceHost:") @@ -235,6 +235,10 @@ public GTMSessionFetcher() {} public native void setSkipBackgroundTask(boolean v); @Property(selector = "isFetching") public native boolean isFetching(); + @Property(selector = "stopFetchingTriggersCompletionHandler") + public native boolean isStopFetchingTriggersCompletionHandler(); + @Property(selector = "setStopFetchingTriggersCompletionHandler:") + public native void setStopFetchingTriggersCompletionHandler(boolean v); @Property(selector = "completionHandler") public native @Block VoidBlock2 getCompletionHandler(); @Property(selector = "setCompletionHandler:") @@ -291,6 +295,8 @@ public GTMSessionFetcher() {} public native @MachineSizedUInt long getTestBlockAccumulateDataChunkCount(); @Property(selector = "setTestBlockAccumulateDataChunkCount:") public native void setTestBlockAccumulateDataChunkCount(@MachineSizedUInt long v); + @Property(selector = "parentUploadFetcher") + public native GTMSessionUploadFetcher getParentUploadFetcher(); /**/ /**//**/ /**/ @@ -312,6 +318,14 @@ public static class Consts { public static native String NumberOfRetriesDoneKey(); @GlobalValue(symbol="kGTMSessionFetcherElapsedIntervalWithRetriesKey", optional=true) public static native String ElapsedIntervalWithRetriesKey(); + @GlobalValue(symbol="kGTMSessionFetcherServiceSessionKey", optional=true) + public static native String ServiceSessionKey(); + @GlobalValue(symbol="GTMSessionFetcherVersionNumber", optional=true) + public static native double VersionNumber(); + @GlobalValue(symbol="GTMSessionFetcherVersionNumber", optional=true) + public static native void VersionNumber(double v); + @GlobalValue(symbol="GTMSessionFetcherVersionString", optional=true) + public static native BytePtr VersionString(); } @Library(Library.INTERNAL) @@ -328,6 +342,12 @@ public static class Notifications { public static native String RetryDelayStopped(); @GlobalValue(symbol="kGTMSessionFetcherCompletionInvokedNotification", optional=true) public static native String CompletionInvoked(); + @GlobalValue(symbol="kGTMSessionFetcherServiceSessionBecameInvalidNotification", optional=true) + public static native String ServiceSessionBecameInvalid(); + @GlobalValue(symbol="kGTMSessionFetcherUploadLocationObtainedNotification", optional=true) + public static native String UploadLocationObtained(); + @GlobalValue(symbol="kGTMSessionFetcherUploadInitialBackoffStartedNotification", optional=true) + public static native String UploadInitialBackoffStarted(); } @Bridge(symbol="GTMFetcherStandardUserAgentString", optional=true) diff --git a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcherError.java b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcherError.java index 92034012c..47816b738 100644 --- a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcherError.java +++ b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcherError.java @@ -45,7 +45,8 @@ public enum /**/GTMSessionFetcherError/**/ implements NSErrorCode { BackgroundExpiration(-3L), BackgroundFetchFailed(-4L), InsecureRequest(-5L), - TaskCreationFailed(-6L); + TaskCreationFailed(-6L), + UserCancelled(-7L); /**/ /**/static { Bro.bind(GTMSessionFetcherError.class); }/**/ diff --git a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcherService.java b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcherService.java new file mode 100644 index 000000000..3e84038e0 --- /dev/null +++ b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcherService.java @@ -0,0 +1,214 @@ +/* + * Copyright (C) 2013-2015 RoboVM AB + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.robovm.pods.firebase.googlesignin; + +/**/ +import java.io.*; +import java.nio.*; +import java.util.*; +import org.robovm.objc.*; +import org.robovm.objc.annotation.*; +import org.robovm.objc.block.*; +import org.robovm.rt.*; +import org.robovm.rt.annotation.*; +import org.robovm.rt.bro.*; +import org.robovm.rt.bro.annotation.*; +import org.robovm.rt.bro.ptr.*; +import org.robovm.apple.foundation.*; +import org.robovm.apple.uikit.*; +import org.robovm.apple.coregraphics.*; +import org.robovm.apple.dispatch.*; +import org.robovm.apple.coreanimation.*; +/**/ + +/**/ + +/**/ +/**/@Library(Library.INTERNAL) @NativeClass/**/ +/**/public/**/ class /**/GTMSessionFetcherService/**/ + extends /**/NSObject/**/ + /**/implements GTMSessionFetcherServiceProtocol/**/ { + + /**/public static class GTMSessionFetcherServicePtr extends Ptr {}/**/ + /**/static { ObjCRuntime.bind(GTMSessionFetcherService.class); }/**/ + /**//**/ + /**/ + public GTMSessionFetcherService() {} + protected GTMSessionFetcherService(Handle h, long handle) { super(h, handle); } + protected GTMSessionFetcherService(SkipInit skipInit) { super(skipInit); } + /**/ + /**/ + @Property(selector = "delayedFetchersByHost") + public native NSDictionary getDelayedFetchersByHost(); + @Property(selector = "runningFetchersByHost") + public native NSDictionary getRunningFetchersByHost(); + @Property(selector = "maxRunningFetchersPerHost") + public native @MachineSizedUInt long getMaxRunningFetchersPerHost(); + @Property(selector = "setMaxRunningFetchersPerHost:") + public native void setMaxRunningFetchersPerHost(@MachineSizedUInt long v); + @Property(selector = "configuration") + public native NSURLSessionConfiguration getConfiguration(); + @Property(selector = "setConfiguration:") + public native void setConfiguration(NSURLSessionConfiguration v); + @Property(selector = "configurationBlock") + public native @Block VoidBlock2 getConfigurationBlock(); + @Property(selector = "setConfigurationBlock:") + public native void setConfigurationBlock(@Block VoidBlock2 v); + @Property(selector = "cookieStorage") + public native NSHTTPCookieStorage getCookieStorage(); + @Property(selector = "setCookieStorage:") + public native void setCookieStorage(NSHTTPCookieStorage v); + @Property(selector = "callbackQueue") + public native DispatchQueue getCallbackQueue(); + @Property(selector = "setCallbackQueue:") + public native void setCallbackQueue(DispatchQueue v); + @Property(selector = "challengeBlock") + public native @Block("(,,@Block)") VoidBlock3> getChallengeBlock(); + @Property(selector = "setChallengeBlock:") + public native void setChallengeBlock(@Block("(,,@Block)") VoidBlock3> v); + @Property(selector = "credential") + public native NSURLCredential getCredential(); + @Property(selector = "setCredential:") + public native void setCredential(NSURLCredential v); + @Property(selector = "proxyCredential") + public native NSURLCredential getProxyCredential(); + @Property(selector = "setProxyCredential:") + public native void setProxyCredential(NSURLCredential v); + @Property(selector = "allowedInsecureSchemes") + public native NSArray getAllowedInsecureSchemes(); + @Property(selector = "setAllowedInsecureSchemes:") + public native void setAllowedInsecureSchemes(NSArray v); + @Property(selector = "allowLocalhostRequest") + public native boolean isAllowLocalhostRequest(); + @Property(selector = "setAllowLocalhostRequest:") + public native void setAllowLocalhostRequest(boolean v); + @Property(selector = "allowInvalidServerCertificates") + public native boolean isAllowInvalidServerCertificates(); + @Property(selector = "setAllowInvalidServerCertificates:") + public native void setAllowInvalidServerCertificates(boolean v); + @Property(selector = "isRetryEnabled") + public native boolean isRetryEnabled(); + @Property(selector = "setRetryEnabled:") + public native void setRetryEnabled(boolean v); + @Property(selector = "retryBlock") + public native @Block("(,,@Block)") VoidBlock3 getRetryBlock(); + @Property(selector = "setRetryBlock:") + public native void setRetryBlock(@Block("(,,@Block)") VoidBlock3 v); + @Property(selector = "maxRetryInterval") + public native double getMaxRetryInterval(); + @Property(selector = "setMaxRetryInterval:") + public native void setMaxRetryInterval(double v); + @Property(selector = "minRetryInterval") + public native double getMinRetryInterval(); + @Property(selector = "setMinRetryInterval:") + public native void setMinRetryInterval(double v); + @Property(selector = "properties") + public native NSDictionary getProperties(); + @Property(selector = "setProperties:") + public native void setProperties(NSDictionary v); + /** + * @since Available in iOS 10.0 and later. + */ + @Property(selector = "metricsCollectionBlock") + public native @Block VoidBlock1 getMetricsCollectionBlock(); + /** + * @since Available in iOS 10.0 and later. + */ + @Property(selector = "setMetricsCollectionBlock:") + public native void setMetricsCollectionBlock(@Block VoidBlock1 v); + @Property(selector = "skipBackgroundTask") + public native boolean isSkipBackgroundTask(); + @Property(selector = "setSkipBackgroundTask:") + public native void setSkipBackgroundTask(boolean v); + @Property(selector = "userAgent") + public native String getUserAgent(); + @Property(selector = "setUserAgent:") + public native void setUserAgent(String v); + @Property(selector = "authorizer") + public native GTMFetcherAuthorizationProtocol getAuthorizer(); + @Property(selector = "setAuthorizer:") + public native void setAuthorizer(GTMFetcherAuthorizationProtocol v); + @Property(selector = "delegateQueue") + public native NSOperationQueue getDelegateQueue(); + @Property(selector = "sessionDelegateQueue") + public native NSOperationQueue getSessionDelegateQueue(); + @Property(selector = "setSessionDelegateQueue:") + public native void setSessionDelegateQueue(NSOperationQueue v); + @Property(selector = "reuseSession") + public native boolean isReuseSession(); + @Property(selector = "setReuseSession:") + public native void setReuseSession(boolean v); + @Property(selector = "unusedSessionTimeout") + public native double getUnusedSessionTimeout(); + @Property(selector = "setUnusedSessionTimeout:") + public native void setUnusedSessionTimeout(double v); + @Property(selector = "decorators") + public native NSArray getDecorators(); + @Property(selector = "testBlock") + public native @Block("(,@Block)") VoidBlock2> getTestBlock(); + @Property(selector = "setTestBlock:") + public native void setTestBlock(@Block("(,@Block)") VoidBlock2> v); + /**/ + /**//**/ + /**/ + @Method(selector = "resetSession") + public native void resetSession(); + @Method(selector = "setConcurrentCallbackQueue:") + public native void setConcurrentCallbackQueue(DispatchQueue queue); + @Method(selector = "fetcherWithRequest:") + public native GTMSessionFetcher getFetcher(NSURLRequest request); + @Method(selector = "fetcherWithURL:") + public native GTMSessionFetcher getFetcher(NSURL requestURL); + @Method(selector = "fetcherWithURLString:") + public native GTMSessionFetcher getFetcher(String requestURLString); + @Method(selector = "fetcherWithRequest:fetcherClass:") + public native NSObject getFetcher(NSURLRequest request, Class fetcherClass); + @Method(selector = "isDelayingFetcher:") + public native boolean isDelayingFetcher(GTMSessionFetcher fetcher); + @Method(selector = "numberOfFetchers") + public native @MachineSizedUInt long numberOfFetchers(); + @Method(selector = "numberOfRunningFetchers") + public native @MachineSizedUInt long numberOfRunningFetchers(); + @Method(selector = "numberOfDelayedFetchers") + public native @MachineSizedUInt long numberOfDelayedFetchers(); + @Method(selector = "issuedFetchers") + public native NSArray issuedFetchers(); + @Method(selector = "issuedFetchersWithRequestURL:") + public native NSArray issuedFetchers(NSURL requestURL); + @Method(selector = "stopAllFetchers") + public native void stopAllFetchers(); + @Method(selector = "addDecorator:") + public native void addDecorator(GTMFetcherDecoratorProtocol decorator); + @Method(selector = "removeDecorator:") + public native void removeDecorator(GTMFetcherDecoratorProtocol decorator); + @Method(selector = "fetcherShouldBeginFetching:") + public native boolean fetcherShouldBeginFetching(GTMSessionFetcher fetcher); + @Method(selector = "fetcherDidBeginFetching:") + public native void fetcherDidBeginFetching(GTMSessionFetcher fetcher); + @Method(selector = "fetcherDidStop:") + public native void fetcherDidStop(GTMSessionFetcher fetcher); + /** + * @deprecated Use XCTestExpectation instead + */ + @Deprecated + @Method(selector = "waitForCompletionOfAllFetchersWithTimeout:") + public native boolean waitForCompletionOfAllFetchers(double timeoutInSeconds); + @Method(selector = "mockFetcherServiceWithFakedData:fakedError:") + public static native GTMSessionFetcherService mockFetcherService(NSData fakedDataOrNil, NSError fakedErrorOrNil); + @Method(selector = "mockFetcherServiceWithFakedData:fakedResponse:fakedError:") + public static native GTMSessionFetcherService mockFetcherService(NSData fakedDataOrNil, NSHTTPURLResponse fakedResponse, NSError fakedErrorOrNil); + /**/ +} diff --git a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcherServiceProtocol.java b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcherServiceProtocol.java index e8f68c3e8..0770209f3 100644 --- a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcherServiceProtocol.java +++ b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcherServiceProtocol.java @@ -49,38 +49,16 @@ /**/ @Property(selector = "callbackQueue") DispatchQueue getCallbackQueue(); - @Property(selector = "setCallbackQueue:") - void setCallbackQueue(DispatchQueue v); @Property(selector = "reuseSession") boolean isReuseSession(); @Property(selector = "setReuseSession:") void setReuseSession(boolean v); @Property(selector = "delegateQueue") NSOperationQueue getDelegateQueue(); - @Property(selector = "decorators") - NSArray getDecorators(); /**/ /**/ - @Method(selector = "fetcherShouldBeginFetching:") - boolean fetcherShouldBeginFetching(GTMSessionFetcher fetcher); - @Method(selector = "fetcherDidCreateSession:") - void fetcherDidCreateSession(GTMSessionFetcher fetcher); - @Method(selector = "fetcherDidBeginFetching:") - void fetcherDidBeginFetching(GTMSessionFetcher fetcher); - @Method(selector = "fetcherDidStop:") - void fetcherDidStop(GTMSessionFetcher fetcher); @Method(selector = "fetcherWithRequest:") GTMSessionFetcher getFetcher(NSURLRequest request); - @Method(selector = "isDelayingFetcher:") - boolean isDelayingFetcher(GTMSessionFetcher fetcher); - @Method(selector = "session") - NSURLSession session(); - @Method(selector = "sessionForFetcherCreation") - NSURLSession sessionForFetcherCreation(); - @Method(selector = "sessionDelegate") - NSURLSessionDelegate sessionDelegate(); - @Method(selector = "stoppedAllFetchersDate") - NSDate stoppedAllFetchersDate(); /**/ /**/ /**/ diff --git a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcherServiceProtocolAdapter.java b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcherServiceProtocolAdapter.java index 563d547cc..f0cb8cb39 100644 --- a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcherServiceProtocolAdapter.java +++ b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionFetcherServiceProtocolAdapter.java @@ -50,38 +50,16 @@ /**/ @NotImplemented("callbackQueue") public DispatchQueue getCallbackQueue() { return null; } - @NotImplemented("setCallbackQueue:") - public void setCallbackQueue(DispatchQueue v) {} @NotImplemented("reuseSession") public boolean isReuseSession() { return false; } @NotImplemented("setReuseSession:") public void setReuseSession(boolean v) {} @NotImplemented("delegateQueue") public NSOperationQueue getDelegateQueue() { return null; } - @NotImplemented("decorators") - public NSArray getDecorators() { return null; } /**/ /**//**/ /**/ - @NotImplemented("fetcherShouldBeginFetching:") - public boolean fetcherShouldBeginFetching(GTMSessionFetcher fetcher) { return false; } - @NotImplemented("fetcherDidCreateSession:") - public void fetcherDidCreateSession(GTMSessionFetcher fetcher) {} - @NotImplemented("fetcherDidBeginFetching:") - public void fetcherDidBeginFetching(GTMSessionFetcher fetcher) {} - @NotImplemented("fetcherDidStop:") - public void fetcherDidStop(GTMSessionFetcher fetcher) {} @NotImplemented("fetcherWithRequest:") public GTMSessionFetcher getFetcher(NSURLRequest request) { return null; } - @NotImplemented("isDelayingFetcher:") - public boolean isDelayingFetcher(GTMSessionFetcher fetcher) { return false; } - @NotImplemented("session") - public NSURLSession session() { return null; } - @NotImplemented("sessionForFetcherCreation") - public NSURLSession sessionForFetcherCreation() { return null; } - @NotImplemented("sessionDelegate") - public NSURLSessionDelegate sessionDelegate() { return null; } - @NotImplemented("stoppedAllFetchersDate") - public NSDate stoppedAllFetchersDate() { return null; } /**/ } diff --git a/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionUploadFetcher.java b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionUploadFetcher.java new file mode 100644 index 000000000..daa718d87 --- /dev/null +++ b/firebase/ios-google-sign-in/src/main/java/org/robovm/pods/firebase/googlesignin/GTMSessionUploadFetcher.java @@ -0,0 +1,170 @@ +/* + * Copyright (C) 2013-2015 RoboVM AB + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.robovm.pods.firebase.googlesignin; + +/**/ +import java.io.*; +import java.nio.*; +import java.util.*; +import org.robovm.objc.*; +import org.robovm.objc.annotation.*; +import org.robovm.objc.block.*; +import org.robovm.rt.*; +import org.robovm.rt.annotation.*; +import org.robovm.rt.bro.*; +import org.robovm.rt.bro.annotation.*; +import org.robovm.rt.bro.ptr.*; +import org.robovm.apple.foundation.*; +import org.robovm.apple.uikit.*; +import org.robovm.apple.coregraphics.*; +import org.robovm.apple.dispatch.*; +import org.robovm.apple.coreanimation.*; +/**/ + +/**/ + +/**/ +/**/@Library(Library.INTERNAL) @NativeClass/**/ +/**/public/**/ class /**/GTMSessionUploadFetcher/**/ + extends /**/GTMSessionFetcher/**/ + /**//**/ { + + /**/public static class GTMSessionUploadFetcherPtr extends Ptr {}/**/ + /**/static { ObjCRuntime.bind(GTMSessionUploadFetcher.class); }/**/ + /**//**/ + /**/ + public GTMSessionUploadFetcher() {} + protected GTMSessionUploadFetcher(Handle h, long handle) { super(h, handle); } + protected GTMSessionUploadFetcher(SkipInit skipInit) { super(skipInit); } + @Method(selector = "initWithRequest:configuration:") + public GTMSessionUploadFetcher(NSURLRequest request, NSURLSessionConfiguration configuration) { super(request, configuration); } + /**/ + /**/ + @Property(selector = "uploadLocationURL") + public native NSURL getUploadLocationURL(); + @Property(selector = "setUploadLocationURL:") + public native void setUploadLocationURL(NSURL v); + @Property(selector = "uploadData") + public native NSData getUploadData(); + @Property(selector = "setUploadData:") + public native void setUploadData(NSData v); + @Property(selector = "uploadFileURL") + public native NSURL getUploadFileURL(); + @Property(selector = "setUploadFileURL:") + public native void setUploadFileURL(NSURL v); + @Property(selector = "uploadFileHandle") + public native NSFileHandle getUploadFileHandle(); + @Property(selector = "setUploadFileHandle:") + public native void setUploadFileHandle(NSFileHandle v); + @Property(selector = "uploadDataProvider") + public native @Block("(,,@Block)") VoidBlock3> getUploadDataProvider(); + @Property(selector = "uploadMIMEType") + public native String getUploadMIMEType(); + @Property(selector = "setUploadMIMEType:") + public native void setUploadMIMEType(String v); + @Property(selector = "chunkSize") + public native long getChunkSize(); + @Property(selector = "currentOffset") + public native long getCurrentOffset(); + @Property(selector = "uploadRetryFactor") + public native double getUploadRetryFactor(); + @Property(selector = "setUploadRetryFactor:") + public native void setUploadRetryFactor(double v); + @Property(selector = "maxUploadRetryInterval") + public native double getMaxUploadRetryInterval(); + @Property(selector = "setMaxUploadRetryInterval:") + public native void setMaxUploadRetryInterval(double v); + @Property(selector = "minUploadRetryInterval") + public native double getMinUploadRetryInterval(); + @Property(selector = "setMinUploadRetryInterval:") + public native void setMinUploadRetryInterval(double v); + @Property(selector = "allowsCellularAccess") + public native boolean allowsCellularAccess(); + @Property(selector = "chunkFetcher") + public native GTMSessionFetcher getChunkFetcher(); + @Property(selector = "setChunkFetcher:") + public native void setChunkFetcher(GTMSessionFetcher v); + @Property(selector = "activeFetcher") + public native GTMSessionFetcher getActiveFetcher(); + @Property(selector = "lastChunkRequest") + public native NSURLRequest getLastChunkRequest(); + @Property(selector = "statusCode") + public native @MachineSizedSInt long getStatusCode(); + @Property(selector = "setStatusCode:") + public native void setStatusCode(@MachineSizedSInt long v); + @Property(selector = "cancellationHandler") + public native @Block VoidBlock3 getCancellationHandler(); + @Property(selector = "setCancellationHandler:") + public native void setCancellationHandler(@Block VoidBlock3 v); + @Property(selector = "delegateCallbackQueue") + public native DispatchQueue getDelegateCallbackQueue(); + @Property(selector = "delegateCompletionHandler") + public native @Block VoidBlock2 getDelegateCompletionHandler(); + /**/ + /**//**/ + /**/ + @Library(Library.INTERNAL) + public static class Consts { + static { Bro.bind(Consts.class); } + + @GlobalValue(symbol="kGTMSessionUploadFetcherUnknownFileSize", optional=true) + public static native long UnknownFileSize(); + @GlobalValue(symbol="kGTMSessionUploadFetcherStandardChunkSize", optional=true) + public static native long StandardChunkSize(); + @GlobalValue(symbol="kGTMSessionUploadFetcherMaximumDemandBufferSize", optional=true) + public static native long MaximumDemandBufferSize(); + } + + @Method(selector = "setUploadDataLength:provider:") + public native void setUploadDataLength(long fullLength, @Block("(,,@Block)") VoidBlock3> block); + @Method(selector = "pauseFetching") + public native void pauseFetching(); + @Method(selector = "resumeFetching") + public native void resumeFetching(); + @Method(selector = "isPaused") + public native boolean isPaused(); + @Method(selector = "uploadFetcherWithRequest:uploadMIMEType:chunkSize:fetcherService:") + public static native GTMSessionUploadFetcher uploadFetcher(NSURLRequest request, String uploadMIMEType, long chunkSize, GTMSessionFetcherService fetcherServiceOrNil); + @Method(selector = "uploadFetcherWithLocation:uploadMIMEType:chunkSize:fetcherService:") + public static native GTMSessionUploadFetcher uploadFetcher(NSURL uploadLocationURL, String uploadMIMEType, long chunkSize, GTMSessionFetcherService fetcherServiceOrNil); + @Method(selector = "uploadFetcherWithLocation:uploadMIMEType:chunkSize:allowsCellularAccess:fetcherService:") + public static native GTMSessionUploadFetcher uploadFetcher(NSURL uploadLocationURL, String uploadMIMEType, long chunkSize, boolean allowsCellularAccess, GTMSessionFetcherService fetcherServiceOrNil); + @Method(selector = "uploadFetchersForBackgroundSessions") + public static native NSArray uploadFetchersForBackgroundSessions(); + @Method(selector = "uploadFetcherForSessionIdentifier:") + public static native GTMSessionUploadFetcher uploadFetcherForSessionIdentifier(String sessionIdentifier); + @Method(selector = "fetcherWithURLString:") + public static native GTMSessionUploadFetcher createFetcherUsingURLString(String requestURLString); + @Method(selector = "fetchersForBackgroundSessions") + public static native NSArray fetchersForBackgroundSessions(); + @Method(selector = "application:handleEventsForBackgroundURLSession:completionHandler:") + public static native void handleEventsForBackgroundURLSession(UIApplication application, String identifier, @Block Runnable completionHandler); + @Method(selector = "setGlobalTestBlock:") + public static native void setGlobalTestBlock(@Block("(,@Block)") VoidBlock2> block); + @Method(selector = "setSubstituteUIApplication:") + public static native void setSubstituteUIApplication(GTMUIApplicationProtocol substituteUIApplication); + @Method(selector = "substituteUIApplication") + public static native GTMUIApplicationProtocol substituteUIApplication(); + @Method(selector = "staticCookieStorage") + public static native GTMSessionCookieStorage staticCookieStorage(); + @Method(selector = "appAllowsInsecureRequests") + public static native boolean appAllowsInsecureRequests(); + @Method(selector = "setLoggingEnabled:") + public static native void setLoggingEnabled(boolean flag); + @Method(selector = "isLoggingEnabled") + public static native boolean isLoggingEnabled(); + /**/ +} diff --git a/firebase/ios-messaging/pom.xml b/firebase/ios-messaging/pom.xml index 6760e788b..a02a398cc 100644 --- a/firebase/ios-messaging/pom.xml +++ b/firebase/ios-messaging/pom.xml @@ -7,7 +7,7 @@ robopods-firebase-messaging-ios - RoboPods FireBase Messaging iOS v10.3.0 + RoboPods FireBase Messaging iOS v10.5.0 jar diff --git a/firebase/ios-remoteconfig/pom.xml b/firebase/ios-remoteconfig/pom.xml index 82d73ad29..068c3f41d 100644 --- a/firebase/ios-remoteconfig/pom.xml +++ b/firebase/ios-remoteconfig/pom.xml @@ -7,7 +7,7 @@ robopods-firebase-remote-config-ios - RoboPods FireBase RemoteConfig iOS v10.3.0 + RoboPods FireBase RemoteConfig iOS v10.5.0 jar diff --git a/firebase/ios-storage/pom.xml b/firebase/ios-storage/pom.xml index e3154f1f2..f4dbfb80e 100644 --- a/firebase/ios-storage/pom.xml +++ b/firebase/ios-storage/pom.xml @@ -7,7 +7,7 @@ robopods-firebase-storage-ios - RoboPods Cloud Storage iOS v10.3.0 + RoboPods Cloud Storage iOS v10.5.0 jar diff --git a/firebase/ios-storage/src/main/bro-gen/FirebaseStorage.framework/Headers/FirebaseStorage-Swift.h b/firebase/ios-storage/src/main/bro-gen/FirebaseStorage.framework/Headers/FirebaseStorage-Swift.h index 9d3911365..216ad0abe 100644 --- a/firebase/ios-storage/src/main/bro-gen/FirebaseStorage.framework/Headers/FirebaseStorage-Swift.h +++ b/firebase/ios-storage/src/main/bro-gen/FirebaseStorage.framework/Headers/FirebaseStorage-Swift.h @@ -273,6 +273,9 @@ SWIFT_CLASS_NAMED("Storage") /// The maximum time in seconds to retry operations other than upload and download if a failure occurs. /// Defaults to 2 minutes (120 seconds). @property (nonatomic) NSTimeInterval maxOperationRetryTime; +/// Specify the maximum upload chunk size. Values less than 256K (262144) will be rounded up to 256K. Values +/// above 256K will be rounded down to the nearest 256K multiple. The default is no maximum. +@property (nonatomic) int64_t uploadChunkSizeBytes; /// A DispatchQueue that all developer callbacks are fired on. Defaults to the main queue. @property (nonatomic, strong) dispatch_queue_t _Nonnull callbackQueue; /// Creates a StorageReference initialized at the root Firebase Storage location. @@ -385,7 +388,7 @@ SWIFT_CLASS_NAMED("StorageObservableTask") /// Downloads can currently be returned as Data in memory, or as a URL to a file on disk. /// Downloads are performed on a background queue, and callbacks are raised on the developer /// specified callbackQueue in Storage, or the main queue if left unspecified. -/// Currently all uploads must be initiated and managed on the main queue. +/// Currently all downloads must be initiated and managed on the main queue. SWIFT_CLASS_NAMED("StorageDownloadTask") @interface FIRStorageDownloadTask : FIRStorageObservableTask /// Prepares a task and begins execution. diff --git a/firebase/ios-storage/src/main/java/org/robovm/pods/firebase/storage/FIRStorage.java b/firebase/ios-storage/src/main/java/org/robovm/pods/firebase/storage/FIRStorage.java index f74b49c3e..b3b07ad9e 100644 --- a/firebase/ios-storage/src/main/java/org/robovm/pods/firebase/storage/FIRStorage.java +++ b/firebase/ios-storage/src/main/java/org/robovm/pods/firebase/storage/FIRStorage.java @@ -64,6 +64,10 @@ protected FIRStorage() {} public native double getMaxOperationRetryTime(); @Property(selector = "setMaxOperationRetryTime:") public native void setMaxOperationRetryTime(double v); + @Property(selector = "uploadChunkSizeBytes") + public native long getUploadChunkSizeBytes(); + @Property(selector = "setUploadChunkSizeBytes:") + public native void setUploadChunkSizeBytes(long v); @Property(selector = "callbackQueue") public native DispatchQueue getCallbackQueue(); @Property(selector = "setCallbackQueue:")