Removed Firebase references and added 'Google-Mobile-Ads-SDK' to podf…

…iles and imports
googleads · Aug 1, 2017 · 21544dd · 21544dd
1 parent 1344a58
commit 21544dd
Show file tree

Hide file tree

Showing 63 changed files with 84 additions and 879 deletions.
diff --git a/Objective-C/admob/BannerExample/BannerExample.xcodeproj/project.pbxproj b/Objective-C/admob/BannerExample/BannerExample.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		26AF82EC1CE935AF00AB9A51 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 26AF82EB1CE935AF00AB9A51 /* GoogleService-Info.plist */; };
 		CF86EE1D19787E6B00411520 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CF86EE1C19787E6B00411520 /* main.m */; };
 		CF86EE2019787E6B00411520 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CF86EE1F19787E6B00411520 /* AppDelegate.m */; };
 		CF86EE2319787E6B00411520 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CF86EE2219787E6B00411520 /* ViewController.m */; };
@@ -16,7 +15,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		26AF82EB1CE935AF00AB9A51 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		CF86EE1719787E6B00411520 /* BannerExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BannerExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		CF86EE1B19787E6B00411520 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		CF86EE1C19787E6B00411520 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
@@ -58,7 +56,6 @@
 		CF86EE1919787E6B00411520 /* BannerExample */ = {
 			isa = PBXGroup;
 			children = (
-				26AF82EB1CE935AF00AB9A51 /* GoogleService-Info.plist */,
 				CF86EE1E19787E6B00411520 /* AppDelegate.h */,
 				CF86EE1F19787E6B00411520 /* AppDelegate.m */,
 				CF86EE2119787E6B00411520 /* ViewController.h */,
@@ -138,7 +135,6 @@
 			files = (
 				CF86EE2619787E6B00411520 /* Main.storyboard in Resources */,
 				CF86EE2819787E6B00411520 /* Images.xcassets in Resources */,
-				26AF82EC1CE935AF00AB9A51 /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Objective-C/admob/BannerExample/BannerExample/AppDelegate.m b/Objective-C/admob/BannerExample/BannerExample/AppDelegate.m
@@ -15,8 +15,7 @@
 //
 
 #import "AppDelegate.h"
-
-@import Firebase;
+@import GoogleMobileAds;
 
 @interface AppDelegate ()
 
@@ -27,8 +26,6 @@ @implementation AppDelegate
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
 
-  // Use Firebase library to configure APIs
-  [FIRApp configure];
   // Initialize Google Mobile Ads SDK
   [GADMobileAds configureWithApplicationID:@"ca-app-pub-3940256099942544~1458002511"];
 

diff --git a/Objective-C/admob/BannerExample/BannerExample/GoogleService-Info.plist b/Objective-C/admob/BannerExample/BannerExample/GoogleService-Info.plist
diff --git a/Objective-C/admob/BannerExample/Podfile b/Objective-C/admob/BannerExample/Podfile
@@ -3,6 +3,5 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '7.0'
 
 target 'BannerExample' do
-  pod 'Firebase/Core'
-  pod 'Firebase/AdMob'
+  pod 'Google-Mobile-Ads-SDK'
 end
diff --git a/Objective-C/admob/BannerExample/Podfile.lock b/Objective-C/admob/BannerExample/Podfile.lock
@@ -1,35 +1,12 @@
 PODS:
-  - Firebase/AdMob (4.0.2):
-    - Firebase/Core
-    - Google-Mobile-Ads-SDK (= 7.20.0)
-  - Firebase/Core (4.0.2):
-    - FirebaseAnalytics (= 4.0.1)
-    - FirebaseCore (= 4.0.2)
-  - FirebaseAnalytics (4.0.1):
-    - FirebaseCore (~> 4.0)
-    - FirebaseInstanceID (~> 2.0)
-    - GoogleToolboxForMac/NSData+zlib (~> 2.1)
-  - FirebaseCore (4.0.2):
-    - GoogleToolboxForMac/NSData+zlib (~> 2.1)
-  - FirebaseInstanceID (2.0.0):
-    - FirebaseCore (~> 4.0)
-  - Google-Mobile-Ads-SDK (7.20.0)
-  - GoogleToolboxForMac/Defines (2.1.1)
-  - GoogleToolboxForMac/NSData+zlib (2.1.1):
-    - GoogleToolboxForMac/Defines (= 2.1.1)
+  - Google-Mobile-Ads-SDK (7.21.0)
 
 DEPENDENCIES:
-  - Firebase/AdMob
-  - Firebase/Core
+  - Google-Mobile-Ads-SDK
 
 SPEC CHECKSUMS:
-  Firebase: c7ad0731eab26d18a3fc547dd048b0f7cd9c63ae
-  FirebaseAnalytics: 4d7040fefc3cd8b291cde35f12cf063d7963f15d
-  FirebaseCore: 1a8bf6c795ad07d2918278657954ffd2552e9c17
-  FirebaseInstanceID: 9fbf536668f4d3f0880e7438456dabd1376e294b
-  Google-Mobile-Ads-SDK: 168312cdc167fa22746d4ea8e839fc4825dd2966
-  GoogleToolboxForMac: 8e329f1b599f2512c6b10676d45736bcc2cbbeb0
+  Google-Mobile-Ads-SDK: 4a6f1b43c8cc0e1e95a3b59d9f52a01671c6f9f3
 
-PODFILE CHECKSUM: e8d322daf859c9ed2ebe682454f6fdd82d955602
+PODFILE CHECKSUM: d68d4e731a9b5b53785d6b3d3c2d9591736d8b17
 
 COCOAPODS: 1.2.1
diff --git a/Objective-C/admob/InterstitialExample/InterstitialExample.xcodeproj/project.pbxproj b/Objective-C/admob/InterstitialExample/InterstitialExample.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		2682C7371CE93662000958E2 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2682C7361CE93662000958E2 /* GoogleService-Info.plist */; };
 		CF9F261F1991396300F5C44E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CF9F261E1991396300F5C44E /* main.m */; };
 		CF9F26221991396300F5C44E /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CF9F26211991396300F5C44E /* AppDelegate.m */; };
 		CF9F26251991396300F5C44E /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CF9F26241991396300F5C44E /* ViewController.m */; };
@@ -16,7 +15,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		2682C7361CE93662000958E2 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		CF9F26191991396300F5C44E /* InterstitialExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = InterstitialExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		CF9F261D1991396300F5C44E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		CF9F261E1991396300F5C44E /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
@@ -58,7 +56,6 @@
 		CF9F261B1991396300F5C44E /* InterstitialExample */ = {
 			isa = PBXGroup;
 			children = (
-				2682C7361CE93662000958E2 /* GoogleService-Info.plist */,
 				CF9F26201991396300F5C44E /* AppDelegate.h */,
 				CF9F26211991396300F5C44E /* AppDelegate.m */,
 				CF9F26231991396300F5C44E /* ViewController.h */,
@@ -138,7 +135,6 @@
 			files = (
 				CF9F26281991396300F5C44E /* Main.storyboard in Resources */,
 				CF9F262A1991396400F5C44E /* Images.xcassets in Resources */,
-				2682C7371CE93662000958E2 /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Objective-C/admob/InterstitialExample/InterstitialExample/AppDelegate.m b/Objective-C/admob/InterstitialExample/InterstitialExample/AppDelegate.m
@@ -16,7 +16,7 @@
 
 #import "AppDelegate.h"
 
-@import Firebase;
+@import GoogleMobileAds;
 
 @interface AppDelegate ()
 
@@ -27,8 +27,6 @@ @implementation AppDelegate
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
 
-  // Use Firebase library to configure APIs
-  [FIRApp configure];
   // Initialize Google Mobile Ads SDK
   [GADMobileAds configureWithApplicationID:@"ca-app-pub-3940256099942544~1458002511"];
 

diff --git a/Objective-C/admob/InterstitialExample/InterstitialExample/GoogleService-Info.plist b/Objective-C/admob/InterstitialExample/InterstitialExample/GoogleService-Info.plist
diff --git a/Objective-C/admob/InterstitialExample/Podfile b/Objective-C/admob/InterstitialExample/Podfile
@@ -3,6 +3,5 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '7.0'
 
 target 'InterstitialExample' do
-  pod 'Firebase/Core'
-  pod 'Firebase/AdMob'
+  pod 'Google-Mobile-Ads-SDK'
 end
diff --git a/Objective-C/admob/InterstitialExample/Podfile.lock b/Objective-C/admob/InterstitialExample/Podfile.lock
@@ -1,35 +1,12 @@
 PODS:
-  - Firebase/AdMob (4.0.2):
-    - Firebase/Core
-    - Google-Mobile-Ads-SDK (= 7.20.0)
-  - Firebase/Core (4.0.2):
-    - FirebaseAnalytics (= 4.0.1)
-    - FirebaseCore (= 4.0.2)
-  - FirebaseAnalytics (4.0.1):
-    - FirebaseCore (~> 4.0)
-    - FirebaseInstanceID (~> 2.0)
-    - GoogleToolboxForMac/NSData+zlib (~> 2.1)
-  - FirebaseCore (4.0.2):
-    - GoogleToolboxForMac/NSData+zlib (~> 2.1)
-  - FirebaseInstanceID (2.0.0):
-    - FirebaseCore (~> 4.0)
-  - Google-Mobile-Ads-SDK (7.20.0)
-  - GoogleToolboxForMac/Defines (2.1.1)
-  - GoogleToolboxForMac/NSData+zlib (2.1.1):
-    - GoogleToolboxForMac/Defines (= 2.1.1)
+  - Google-Mobile-Ads-SDK (7.21.0)
 
 DEPENDENCIES:
-  - Firebase/AdMob
-  - Firebase/Core
+  - Google-Mobile-Ads-SDK
 
 SPEC CHECKSUMS:
-  Firebase: c7ad0731eab26d18a3fc547dd048b0f7cd9c63ae
-  FirebaseAnalytics: 4d7040fefc3cd8b291cde35f12cf063d7963f15d
-  FirebaseCore: 1a8bf6c795ad07d2918278657954ffd2552e9c17
-  FirebaseInstanceID: 9fbf536668f4d3f0880e7438456dabd1376e294b
-  Google-Mobile-Ads-SDK: 168312cdc167fa22746d4ea8e839fc4825dd2966
-  GoogleToolboxForMac: 8e329f1b599f2512c6b10676d45736bcc2cbbeb0
+  Google-Mobile-Ads-SDK: 4a6f1b43c8cc0e1e95a3b59d9f52a01671c6f9f3
 
-PODFILE CHECKSUM: fe3bd7a5175c2a4bec821e4239b8c613b35fc18a
+PODFILE CHECKSUM: 566c40e2b89767a8c4c9182597b5d1b30b773720
 
 COCOAPODS: 1.2.1
diff --git a/Objective-C/admob/NativeAdvancedExample/NativeAdvancedExample.xcodeproj/project.pbxproj b/Objective-C/admob/NativeAdvancedExample/NativeAdvancedExample.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		26B0F1961CE9377B00E202AF /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 26B0F1951CE9377B00E202AF /* GoogleService-Info.plist */; };
 		CF9335BD1B26706400DEF1B4 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CF9335BC1B26706400DEF1B4 /* main.m */; };
 		CF9335C01B26706400DEF1B4 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CF9335BF1B26706400DEF1B4 /* AppDelegate.m */; };
 		CF9335C31B26706400DEF1B4 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CF9335C21B26706400DEF1B4 /* ViewController.m */; };
@@ -19,7 +18,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		26B0F1951CE9377B00E202AF /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		CF9335B71B26706400DEF1B4 /* NativeAdvancedExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NativeAdvancedExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		CF9335BB1B26706400DEF1B4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		CF9335BC1B26706400DEF1B4 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
@@ -64,7 +62,6 @@
 		CF9335B91B26706400DEF1B4 /* NativeAdvancedExample */ = {
 			isa = PBXGroup;
 			children = (
-				26B0F1951CE9377B00E202AF /* GoogleService-Info.plist */,
 				CF9335BE1B26706400DEF1B4 /* AppDelegate.h */,
 				CF9335BF1B26706400DEF1B4 /* AppDelegate.m */,
 				CF9335C11B26706400DEF1B4 /* ViewController.h */,
@@ -150,7 +147,6 @@
 				CF9335ED1B26715A00DEF1B4 /* NativeContentAdView.xib in Resources */,
 				CF9335EC1B26715A00DEF1B4 /* NativeAppInstallAdView.xib in Resources */,
 				CF9335C81B26706400DEF1B4 /* Images.xcassets in Resources */,
-				26B0F1961CE9377B00E202AF /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Objective-C/admob/NativeAdvancedExample/NativeAdvancedExample/AppDelegate.m b/Objective-C/admob/NativeAdvancedExample/NativeAdvancedExample/AppDelegate.m
@@ -16,7 +16,7 @@
 
 #import "AppDelegate.h"
 
-@import Firebase;
+@import GoogleMobileAds;
 
 @interface AppDelegate ()
 
@@ -26,8 +26,7 @@ @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-  // Use Firebase library to configure APIs
-  [FIRApp configure];
+
   // Initialize Google Mobile Ads SDK
   [GADMobileAds configureWithApplicationID:@"ca-app-pub-3940256099942544~1458002511"];
 

diff --git a/Objective-C/admob/NativeAdvancedExample/NativeAdvancedExample/GoogleService-Info.plist b/Objective-C/admob/NativeAdvancedExample/NativeAdvancedExample/GoogleService-Info.plist
diff --git a/Objective-C/admob/NativeAdvancedExample/Podfile b/Objective-C/admob/NativeAdvancedExample/Podfile
@@ -3,6 +3,5 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '7.0'
 
 target 'NativeAdvancedExample' do
-  pod 'Firebase/Core'
-  pod 'Firebase/AdMob'
+  pod 'Google-Mobile-Ads-SDK'
 end