Merge pull request #6 from soheilbm/firebaseUpdate

Update Firebase to 3.14.0

README.md

@@ -1,12 +1,10 @@
-# WARNING
+# Firebase-Carthage
+[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 
-Unofficial Firebase for Carthage.
+#### Unofficial Firebase support for Carthage.
 
 ----
 
-# Firebase
-[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
-
 ## Usage
 The iOS Example file is a sample of using core firebase (analytics). 
 
@@ -28,7 +26,7 @@ $ brew install carthage
 To integrate Firebase into your Xcode project using Carthage, specify it in your `Cartfile`:
 
 ```ogdl
-github "soheilbm/Firebase" ~> 3.6.0
+github "soheilbm/Firebase" 
 ```
 
 Run `carthage update` to build the framework and drag the built `Firebase.framework` into your Xcode project.
@@ -48,85 +46,92 @@ should make sure to include all of the frameworks from X when including the SDK.
 
 #### Analytics
   - FirebaseAnalytics.framework
+  - FirebaseCore.framework
   - FirebaseInstanceID.framework
-  - GoogleInterchangeUtilities.framework
-  - GoogleSymbolUtilities.framework
-  - GoogleUtilities.framework
-
+  - GoogleToolboxForMac.framework
+
+
 #### AdMob (~> Analytics)
   - GoogleMobileAds.framework
-
+
+
 #### AppIndexing (~> Analytics)
   - FirebaseAppIndexing.framework
-
+
+
 #### Auth (~> Analytics)
   - FirebaseAuth.framework
-  - GoogleNetworkingUtilities.framework
-
+  - GTMSessionFetcher.framework
+
+
 #### Crash (~> Analytics)
   - FirebaseCrash.framework
-
+  - Protobuf.framework
+
+
 #### Database (~> Analytics)
   - FirebaseDatabase.framework
-
+
+
 #### DynamicLinks (~> Analytics)
   - FirebaseDynamicLinks.framework
-
+
+
 #### Invites (~> Analytics)
   - FirebaseDynamicLinks.framework
   - FirebaseInvites.framework
-  - GoogleAppUtilities.framework
-  - GoogleAuthUtilities.framework
-  - GoogleNetworkingUtilities.framework
-  - GoogleParsingUtilities.framework
-  - GooglePlusUtilities.framework
+  - GTMOAuth2.framework
+  - GTMSessionFetcher.framework
+  - GoogleAPIClientForREST.framework
   - GoogleSignIn.framework
+  - Protobuf.framework
 
   You'll also need to add the resources in the
   Resources directory into your target's main
   bundle.
 
+
 #### Messaging (~> Analytics)
   - FirebaseMessaging.framework
-  - GoogleIPhoneUtilities.framework
-
+  - Protobuf.framework
+
+
 #### RemoteConfig (~> Analytics)
   - FirebaseRemoteConfig.framework
-  - GoogleIPhoneUtilities.framework
-
+  - Protobuf.framework
+
+
 #### Storage (~> Analytics)
   - FirebaseStorage.framework
-  - GoogleNetworkingUtilities.framework
-  
+  - GTMSessionFetcher.framework
+
 
 
 ### Current Version of Firebase libraries
 
-           CocoaPod           | Version
+           Carthage           | Version
 ----------------------------- | -------
-Firebase                      | 3.6.0
-FirebaseAnalytics             | 3.4.2
-FirebaseAppIndexing           | 1.1.0
-FirebaseAuth                  | 3.0.5
-FirebaseCrash                 | 1.0.7
-FirebaseDatabase              | 3.0.3
-FirebaseDynamicLinks          | 1.3.0
-FirebaseInstanceID            | 1.0.8
-FirebaseInvites               | 1.2.1
-FirebaseMessaging             | 1.2.0
-FirebaseRemoteConfig          | 1.3.0
-FirebaseStorage               | 1.0.3
-Google-Mobile-Ads-SDK         | 7.11.0
-GoogleAppUtilities            | 1.1.1
-GoogleAuthUtilities           | 2.0.1
-GoogleIPhoneUtilities         | 1.2.1
-GoogleInterchangeUtilities    | 1.2.1
-GoogleNetworkingUtilities     | 1.2.1
-GoogleParsingUtilities        | 1.1.1
-GooglePlusUtilities           | 1.1.1
-GoogleSignIn                  | 4.0.0
-GoogleSymbolUtilities         | 1.1.1
-GoogleUtilities               | 1.3.1
+Firebase                      | 3.14.0
+FirebaseAnalytics             | 3.7.0
+FirebaseAppIndexing           | 1.2.0
+FirebaseAuth                  | 3.1.1
+FirebaseCore                  | 3.5.1
+FirebaseCrash                 | 1.1.6
+FirebaseDatabase              | 3.1.2
+FirebaseDynamicLinks          | 1.3.3
+FirebaseInstanceID            | 1.0.9
+FirebaseInvites               | 1.2.4
+FirebaseMessaging             | 1.2.2
+FirebaseRemoteConfig          | 1.3.4
+FirebaseStorage               | 1.1.0
+GTMOAuth2                     | 1.1.4
+GTMSessionFetcher             | 1.1.8
+Google-Mobile-Ads-SDK         | 7.18.0
+GoogleAPIClientForREST        | 1.2.0
+GoogleSignIn                  | 4.0.2
+GoogleToolboxForMac           | 2.1.1
+Protobuf                      | 3.2.0
+
 
 
 ## Author
@@ -135,5 +140,4 @@ Soheil B.Marvasti
 
 
 ## License
-
 I do not own this project.

Source/AdMob/GoogleMobileAds.framework/Headers/DFPBannerView.h

@@ -9,6 +9,7 @@
 #import <GoogleMobileAds/GADAppEventDelegate.h>
 #import <GoogleMobileAds/GADBannerView.h>
 #import <GoogleMobileAds/GADCorrelator.h>
+#import <GoogleMobileAds/GADVideoController.h>
 #import <GoogleMobileAds/GoogleMobileAdsDefines.h>
 
 GAD_ASSUME_NONNULL_BEGIN
@@ -57,12 +58,21 @@ GAD_ASSUME_NONNULL_BEGIN
 @property(nonatomic, weak, GAD_NULLABLE)
     IBOutlet id<DFPCustomRenderedBannerViewDelegate> customRenderedBannerViewDelegate;
 
+/// Video controller for controlling video rendered by this ad view.
+@property(nonatomic, strong, readonly) GADVideoController *videoController;
+
 /// If you've set enableManualImpressions to YES, call this method when the ad is visible.
 - (void)recordImpression;
 
 /// Use this function to resize the banner view without launching a new ad request.
 - (void)resize:(GADAdSize)size;
 
+/// Sets options that configure ad loading.
+///
+/// @param adOptions An array of GADAdLoaderOptions objects. The array is deep copied and option
+/// objects cannot be modified after calling this method.
+- (void)setAdOptions:(NSArray *)adOptions;
+
 #pragma mark Deprecated
 
 /// Deprecated. Use the validAdSizes property.

Source/AdMob/GoogleMobileAds.framework/Headers/DFPRequest.h

@@ -30,7 +30,7 @@ GAD_EXTERN const id kDFPSimulatorID;
 /// This API is deprecated and a no-op, use an instance of GADCorrelator set on DFPInterstitial or
 /// DFPBannerView objects to correlate requests.
 + (void)updateCorrelator GAD_DEPRECATED_MSG_ATTRIBUTE(
-    "Set GADCorrelator objects on your ads instead. This method longer affects ad correlation.");
+    "Set GADCorrelator objects on your ads instead. This method no longer affects ad correlation.");
 
 @end
 

Source/AdMob/GoogleMobileAds.framework/Headers/GADAdChoicesView.h

@@ -0,0 +1,23 @@
+//
+//  GADAdChoicesView.h
+//  Google Mobile Ads SDK
+//
+//  Copyright 2016 Google Inc. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+#import <GoogleMobileAds/GoogleMobileAdsDefines.h>
+
+GAD_ASSUME_NONNULL_BEGIN
+
+/// Displays AdChoices content.
+///
+/// If a GADAdChoicesView is set on GADNativeAppInstallAdView or GADNativeContentAdView prior to
+/// calling -setNativeAppInstallAd: or -setNativeContentAd:, AdChoices content will render inside
+/// the GADAdChoicesView. By default, AdChoices is placed in the top right corner of
+/// GADNativeAppInstallAdView and GADNativeContentAdView.
+@interface GADAdChoicesView : UIView
+@end
+
+GAD_ASSUME_NONNULL_END

Source/AdMob/GoogleMobileAds.framework/Headers/GADAdNetworkExtras.h

@@ -7,10 +7,16 @@
 
 #import <Foundation/Foundation.h>
 
+#import <GoogleMobileAds/GoogleMobileAdsDefines.h>
+
+GAD_ASSUME_NONNULL_BEGIN
+
 /// An object implementing this protocol contains information set by the publisher on the client
 /// device for a particular ad network.
 ///
 /// Ad networks should create an 'extras' object implementing this protocol for their publishers to
 /// use.
 @protocol GADAdNetworkExtras<NSObject>
 @end
+
+GAD_ASSUME_NONNULL_END

Source/AdMob/GoogleMobileAds.framework/Headers/GADAdSize.h

@@ -19,12 +19,12 @@ GAD_ASSUME_NONNULL_BEGIN
 /// Do not create a GADAdSize manually. Use one of the kGADAdSize constants. Treat GADAdSize as an
 /// opaque type. Do not access any fields directly. To obtain a concrete CGSize, use the function
 /// CGSizeFromGADAdSize().
-typedef struct GADAdSize GADAdSize;
+typedef struct GAD_BOXABLE GADAdSize GADAdSize;
 
 /// Ad size.
 ///
 /// @see typedef GADAdSize
-struct GADAdSize {
+struct GAD_BOXABLE GADAdSize {
   CGSize size;       ///< The ad size. Don't modify this value directly.
   NSUInteger flags;  ///< Reserved.
 };

Source/AdMob/GoogleMobileAds.framework/Headers/GADAppEventDelegate.h

@@ -7,9 +7,13 @@
 
 #import <Foundation/Foundation.h>
 
+#import <GoogleMobileAds/GoogleMobileAdsDefines.h>
+
 @class GADBannerView;
 @class GADInterstitial;
 
+GAD_ASSUME_NONNULL_BEGIN
+
 /// Implement your app event within these methods. The delegate will be notified when the SDK
 /// receives an app event message from the ad.
 @protocol GADAppEventDelegate<NSObject>
@@ -19,11 +23,13 @@
 /// Called when the banner receives an app event.
 - (void)adView:(GADBannerView *)banner
     didReceiveAppEvent:(NSString *)name
-              withInfo:(NSString *)info;
+              withInfo:(NSString *GAD_NULLABLE_TYPE)info;
 
 /// Called when the interstitial receives an app event.
 - (void)interstitial:(GADInterstitial *)interstitial
     didReceiveAppEvent:(NSString *)name
-              withInfo:(NSString *)info;
+              withInfo:(NSString *GAD_NULLABLE_TYPE)info;
 
 @end
+
+GAD_ASSUME_NONNULL_END

Source/AdMob/GoogleMobileAds.framework/Headers/GADBannerViewDelegate.h

@@ -8,10 +8,13 @@
 #import <Foundation/Foundation.h>
 
 #import <GoogleMobileAds/GADAdDelegate.h>
+#import <GoogleMobileAds/GoogleMobileAdsDefines.h>
 
 @class GADBannerView;
 @class GADRequestError;
 
+GAD_ASSUME_NONNULL_BEGIN
+
 /// Delegate methods for receiving GADBannerView state change messages such as ad request status
 /// and ad click lifecycle.
 @protocol GADBannerViewDelegate<GADAdDelegate>
@@ -47,3 +50,5 @@
 - (void)adViewWillLeaveApplication:(GADBannerView *)bannerView;
 
 @end
+
+GAD_ASSUME_NONNULL_END

Source/AdMob/GoogleMobileAds.framework/Headers/GADCorrelator.h

@@ -7,6 +7,10 @@
 
 #import <Foundation/Foundation.h>
 
+#import <GoogleMobileAds/GoogleMobileAdsDefines.h>
+
+GAD_ASSUME_NONNULL_BEGIN
+
 /// Represents a correlation between multiple ads. Set an instance of this object on multiple ads to
 /// indicate they are being used in a common context.
 @interface GADCorrelator : NSObject
@@ -15,3 +19,5 @@
 - (void)reset;
 
 @end
+
+GAD_ASSUME_NONNULL_END

Source/AdMob/GoogleMobileAds.framework/Headers/GADCorrelatorAdLoaderOptions.h

@@ -7,11 +7,16 @@
 
 #import <GoogleMobileAds/GADAdLoader.h>
 #import <GoogleMobileAds/GADCorrelator.h>
+#import <GoogleMobileAds/GoogleMobileAdsDefines.h>
+
+GAD_ASSUME_NONNULL_BEGIN
 
 /// Ad loader options for adding a correlator to a native ad request.
 @interface GADCorrelatorAdLoaderOptions : GADAdLoaderOptions
 
 /// Correlator object for correlating ads loaded by an ad loader to other ad objects.
-@property(nonatomic, strong) GADCorrelator *correlator;
+@property(nonatomic, strong, GAD_NULLABLE) GADCorrelator *correlator;
 
 @end
+
+GAD_ASSUME_NONNULL_END

Source/AdMob/GoogleMobileAds.framework/Headers/GADCustomEventBanner.h

@@ -10,6 +10,9 @@
 #import <GoogleMobileAds/GADAdSize.h>
 #import <GoogleMobileAds/GADCustomEventBannerDelegate.h>
 #import <GoogleMobileAds/GADCustomEventRequest.h>
+#import <GoogleMobileAds/GoogleMobileAdsDefines.h>
+
+GAD_ASSUME_NONNULL_BEGIN
 
 /// The banner custom event protocol. Your banner custom event handler must implement this protocol.
 @protocol GADCustomEventBanner<NSObject>
@@ -18,7 +21,7 @@
 ///
 /// In your class, define the -delegate and -setDelegate: methods or use "@synthesize delegate". The
 /// Google Mobile Ads SDK sets this property on instances of your class.
-@property(nonatomic, weak) id<GADCustomEventBannerDelegate> delegate;
+@property(nonatomic, weak, GAD_NULLABLE) id<GADCustomEventBannerDelegate> delegate;
 
 /// Called by mediation when your custom event is scheduled to be executed. Report execution results
 /// to the delegate.
@@ -28,8 +31,10 @@
 /// @param serverLabel Label configured in the mediation UI.
 /// @param request Contains ad request information.
 - (void)requestBannerAd:(GADAdSize)adSize
-              parameter:(NSString *)serverParameter
-                  label:(NSString *)serverLabel
+              parameter:(NSString *GAD_NULLABLE_TYPE)serverParameter
+                  label:(NSString *GAD_NULLABLE_TYPE)serverLabel
                 request:(GADCustomEventRequest *)request;
 
 @end
+
+GAD_ASSUME_NONNULL_END