From 21544dd5291964b7cca014f04f925fe54e9bd4a5 Mon Sep 17 00:00:00 2001 From: Samuel Stow Date: Tue, 1 Aug 2017 11:09:00 -0700 Subject: [PATCH] Removed Firebase references and added 'Google-Mobile-Ads-SDK' to podfiles and imports --- .../BannerExample.xcodeproj/project.pbxproj | 4 --- .../BannerExample/BannerExample/AppDelegate.m | 5 +-- .../BannerExample/GoogleService-Info.plist | 36 ------------------- Objective-C/admob/BannerExample/Podfile | 3 +- Objective-C/admob/BannerExample/Podfile.lock | 31 +++------------- .../project.pbxproj | 4 --- .../InterstitialExample/AppDelegate.m | 4 +-- .../GoogleService-Info.plist | 36 ------------------- Objective-C/admob/InterstitialExample/Podfile | 3 +- .../admob/InterstitialExample/Podfile.lock | 31 +++------------- .../project.pbxproj | 4 --- .../NativeAdvancedExample/AppDelegate.m | 5 ++- .../GoogleService-Info.plist | 36 ------------------- .../admob/NativeAdvancedExample/Podfile | 3 +- .../admob/NativeAdvancedExample/Podfile.lock | 31 +++------------- .../project.pbxproj | 4 --- .../NativeExpressExample/AppDelegate.m | 5 ++- .../GoogleService-Info.plist | 36 ------------------- .../admob/NativeExpressExample/Podfile | 3 +- .../admob/NativeExpressExample/Podfile.lock | 31 +++------------- .../admob/RewardedVideoExample/Podfile | 3 +- .../admob/RewardedVideoExample/Podfile.lock | 31 +++------------- .../project.pbxproj | 4 --- .../RewardedVideoExample/AppDelegate.m | 4 +-- .../GoogleService-Info.plist | 36 ------------------- .../project.pbxproj | 4 --- .../AppDelegate.h | 2 +- .../AppDelegate.m | 4 +-- .../GoogleService-Info.plist | 36 ------------------- .../TableViewController.h | 2 +- .../NativeExpressTableViewExample/Podfile | 3 +- .../Podfile.lock | 33 +++-------------- .../BannerExample.xcodeproj/project.pbxproj | 4 --- .../BannerExample/AppDelegate.swift | 5 ++- .../BannerExample/GoogleService-Info.plist | 36 ------------------- Swift/admob/BannerExample/Podfile | 3 +- Swift/admob/BannerExample/Podfile.lock | 31 +++------------- .../project.pbxproj | 4 --- .../InterstitialExample/AppDelegate.swift | 5 ++- .../GoogleService-Info.plist | 36 ------------------- Swift/admob/InterstitialExample/Podfile | 3 +- Swift/admob/InterstitialExample/Podfile.lock | 31 +++------------- .../project.pbxproj | 12 ------- .../NativeAdvancedExample/AppDelegate.swift | 5 ++- .../GoogleService-Info.plist | 36 ------------------- Swift/admob/NativeAdvancedExample/Podfile | 3 +- .../admob/NativeAdvancedExample/Podfile.lock | 31 +++------------- .../project.pbxproj | 4 --- .../NativeExpressExample/AppDelegate.swift | 5 ++- .../GoogleService-Info.plist | 36 ------------------- Swift/admob/NativeExpressExample/Podfile | 3 +- Swift/admob/NativeExpressExample/Podfile.lock | 31 +++------------- Swift/admob/RewardedVideoExample/Podfile | 3 +- Swift/admob/RewardedVideoExample/Podfile.lock | 31 +++------------- .../project.pbxproj | 4 --- .../RewardedVideoExample/AppDelegate.swift | 5 ++- .../GoogleService-Info.plist | 36 ------------------- .../project.pbxproj | 4 --- .../AppDelegate.swift | 5 ++- .../GoogleService-Info.plist | 36 ------------------- .../TableViewController.swift | 2 +- .../NativeExpressTableViewExample/Podfile | 3 +- .../Podfile.lock | 33 +++-------------- 63 files changed, 84 insertions(+), 879 deletions(-) delete mode 100644 Objective-C/admob/BannerExample/BannerExample/GoogleService-Info.plist delete mode 100644 Objective-C/admob/InterstitialExample/InterstitialExample/GoogleService-Info.plist delete mode 100644 Objective-C/admob/NativeAdvancedExample/NativeAdvancedExample/GoogleService-Info.plist delete mode 100644 Objective-C/admob/NativeExpressExample/NativeExpressExample/GoogleService-Info.plist delete mode 100644 Objective-C/admob/RewardedVideoExample/RewardedVideoExample/GoogleService-Info.plist delete mode 100644 Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/GoogleService-Info.plist delete mode 100644 Swift/admob/BannerExample/BannerExample/GoogleService-Info.plist delete mode 100644 Swift/admob/InterstitialExample/InterstitialExample/GoogleService-Info.plist delete mode 100644 Swift/admob/NativeAdvancedExample/NativeAdvancedExample/GoogleService-Info.plist delete mode 100644 Swift/admob/NativeExpressExample/NativeExpressExample/GoogleService-Info.plist delete mode 100644 Swift/admob/RewardedVideoExample/RewardedVideoExample/GoogleService-Info.plist delete mode 100644 Swift/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/GoogleService-Info.plist diff --git a/Objective-C/admob/BannerExample/BannerExample.xcodeproj/project.pbxproj b/Objective-C/admob/BannerExample/BannerExample.xcodeproj/project.pbxproj index e1ac2f5b..c2b078b6 100644 --- 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 = ""; }; 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 = ""; }; CF86EE1C19787E6B00411520 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -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 index 5bb0a02c..46f6b88f 100644 --- 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 deleted file mode 100644 index ba32d3fc..00000000 --- a/Objective-C/admob/BannerExample/BannerExample/GoogleService-Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - AD_UNIT_ID_FOR_BANNER_TEST - ca-app-pub-3940256099942544/2934735716 - AD_UNIT_ID_FOR_INTERSTITIAL_TEST - ca-app-pub-3940256099942544/4411468910 - CLIENT_ID - test-do-not-use.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.test-do-not-use - API_KEY - 000000000000000000000000000000000000000 - GCM_SENDER_ID - 999999999999 - PLIST_VERSION - 1 - BUNDLE_ID - com.google.example.BannerExample - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:999999999999:ios:0000000000000000 - DATABASE_URL - https://test-do-not-use.firebaseio.com - - diff --git a/Objective-C/admob/BannerExample/Podfile b/Objective-C/admob/BannerExample/Podfile index 1fcc5980..5e11d0ca 100644 --- 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 index 6cda38ae..9c0156c5 100644 --- 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 index 9f2711a5..bb66519d 100644 --- 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 = ""; }; 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 = ""; }; CF9F261E1991396300F5C44E /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -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 index 5bb0a02c..925d6f78 100644 --- 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 deleted file mode 100644 index 59e12d73..00000000 --- a/Objective-C/admob/InterstitialExample/InterstitialExample/GoogleService-Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - AD_UNIT_ID_FOR_BANNER_TEST - ca-app-pub-3940256099942544/2934735716 - AD_UNIT_ID_FOR_INTERSTITIAL_TEST - ca-app-pub-3940256099942544/4411468910 - CLIENT_ID - test-do-not-use.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.test-do-not-use - API_KEY - 000000000000000000000000000000000000000 - GCM_SENDER_ID - 999999999999 - PLIST_VERSION - 1 - BUNDLE_ID - com.google.example.InterstitialExample - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:999999999999:ios:0000000000000000 - DATABASE_URL - https://test-do-not-use.firebaseio.com - - diff --git a/Objective-C/admob/InterstitialExample/Podfile b/Objective-C/admob/InterstitialExample/Podfile index 06db11f1..72f91da5 100644 --- 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 index d683b205..329ccd32 100644 --- 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 index 1a7884c8..8aa2c80c 100644 --- 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 = ""; }; 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 = ""; }; CF9335BC1B26706400DEF1B4 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -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 index 68044c52..fe585528 100644 --- 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 deleted file mode 100644 index 5dffb286..00000000 --- a/Objective-C/admob/NativeAdvancedExample/NativeAdvancedExample/GoogleService-Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - AD_UNIT_ID_FOR_BANNER_TEST - ca-app-pub-3940256099942544/2934735716 - AD_UNIT_ID_FOR_INTERSTITIAL_TEST - ca-app-pub-3940256099942544/4411468910 - CLIENT_ID - test-do-not-use.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.test-do-not-use - API_KEY - 000000000000000000000000000000000000000 - GCM_SENDER_ID - 999999999999 - PLIST_VERSION - 1 - BUNDLE_ID - com.google.NativeAdvancedExample - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:999999999999:ios:0000000000000000 - DATABASE_URL - https://test-do-not-use.firebaseio.com - - diff --git a/Objective-C/admob/NativeAdvancedExample/Podfile b/Objective-C/admob/NativeAdvancedExample/Podfile index 3fe4a624..c893b073 100644 --- 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 diff --git a/Objective-C/admob/NativeAdvancedExample/Podfile.lock b/Objective-C/admob/NativeAdvancedExample/Podfile.lock index bf3e8549..1ae010d6 100644 --- a/Objective-C/admob/NativeAdvancedExample/Podfile.lock +++ b/Objective-C/admob/NativeAdvancedExample/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: f05a053bc9b0e616728a378fdd495b23177513b9 +PODFILE CHECKSUM: 51731b3545ef8bd4227dc1e9c30d139a99c97d5a COCOAPODS: 1.2.1 diff --git a/Objective-C/admob/NativeExpressExample/NativeExpressExample.xcodeproj/project.pbxproj b/Objective-C/admob/NativeExpressExample/NativeExpressExample.xcodeproj/project.pbxproj index e8d707d3..29a18ba1 100644 --- a/Objective-C/admob/NativeExpressExample/NativeExpressExample.xcodeproj/project.pbxproj +++ b/Objective-C/admob/NativeExpressExample/NativeExpressExample.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 26A008CF1CE0ECBB00EEFC56 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 26A008CE1CE0ECBB00EEFC56 /* GoogleService-Info.plist */; }; 26FD8D891C7CE2260089F0B5 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 26FD8D881C7CE2260089F0B5 /* main.m */; }; 26FD8D8C1C7CE2260089F0B5 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 26FD8D8B1C7CE2260089F0B5 /* AppDelegate.m */; }; 26FD8D8F1C7CE2260089F0B5 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 26FD8D8E1C7CE2260089F0B5 /* ViewController.m */; }; @@ -17,7 +16,6 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 26A008CE1CE0ECBB00EEFC56 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 26FD8D841C7CE2260089F0B5 /* NativeExpressExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NativeExpressExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; 26FD8D881C7CE2260089F0B5 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 26FD8D8A1C7CE2260089F0B5 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -60,7 +58,6 @@ 26FD8D861C7CE2260089F0B5 /* NativeExpressExample */ = { isa = PBXGroup; children = ( - 26A008CE1CE0ECBB00EEFC56 /* GoogleService-Info.plist */, 26FD8D8A1C7CE2260089F0B5 /* AppDelegate.h */, 26FD8D8B1C7CE2260089F0B5 /* AppDelegate.m */, 26FD8D8D1C7CE2260089F0B5 /* ViewController.h */, @@ -140,7 +137,6 @@ buildActionMask = 2147483647; files = ( 26FD8D971C7CE2260089F0B5 /* LaunchScreen.storyboard in Resources */, - 26A008CF1CE0ECBB00EEFC56 /* GoogleService-Info.plist in Resources */, 26FD8D941C7CE2260089F0B5 /* Assets.xcassets in Resources */, 26FD8D921C7CE2260089F0B5 /* Main.storyboard in Resources */, ); diff --git a/Objective-C/admob/NativeExpressExample/NativeExpressExample/AppDelegate.m b/Objective-C/admob/NativeExpressExample/NativeExpressExample/AppDelegate.m index a1f99bb8..96d7f26f 100644 --- a/Objective-C/admob/NativeExpressExample/NativeExpressExample/AppDelegate.m +++ b/Objective-C/admob/NativeExpressExample/NativeExpressExample/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/NativeExpressExample/NativeExpressExample/GoogleService-Info.plist b/Objective-C/admob/NativeExpressExample/NativeExpressExample/GoogleService-Info.plist deleted file mode 100644 index 0249d59b..00000000 --- a/Objective-C/admob/NativeExpressExample/NativeExpressExample/GoogleService-Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - AD_UNIT_ID_FOR_BANNER_TEST - ca-app-pub-3940256099942544/2934735716 - AD_UNIT_ID_FOR_INTERSTITIAL_TEST - ca-app-pub-3940256099942544/4411468910 - CLIENT_ID - test-do-not-use.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.test-do-not-use - API_KEY - 000000000000000000000000000000000000000 - GCM_SENDER_ID - 999999999999 - PLIST_VERSION - 1 - BUNDLE_ID - com.google.example.NativeExpressExample - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:999999999999:ios:0000000000000000 - DATABASE_URL - https://test-do-not-use.firebaseio.com - - diff --git a/Objective-C/admob/NativeExpressExample/Podfile b/Objective-C/admob/NativeExpressExample/Podfile index 538bd547..5fb90a19 100644 --- a/Objective-C/admob/NativeExpressExample/Podfile +++ b/Objective-C/admob/NativeExpressExample/Podfile @@ -3,6 +3,5 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '7.0' target 'NativeExpressExample' do - pod 'Firebase/Core' - pod 'Firebase/AdMob' + pod 'Google-Mobile-Ads-SDK' end diff --git a/Objective-C/admob/NativeExpressExample/Podfile.lock b/Objective-C/admob/NativeExpressExample/Podfile.lock index 6636b491..4331b211 100644 --- a/Objective-C/admob/NativeExpressExample/Podfile.lock +++ b/Objective-C/admob/NativeExpressExample/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: 7c9dc38bd6ba0ac766d33b14b344adb6d25a19e9 +PODFILE CHECKSUM: 6de83a915b8f1d1896fde8777d4077ab07a0f2be COCOAPODS: 1.2.1 diff --git a/Objective-C/admob/RewardedVideoExample/Podfile b/Objective-C/admob/RewardedVideoExample/Podfile index 9e137d0a..9dffc6ec 100644 --- a/Objective-C/admob/RewardedVideoExample/Podfile +++ b/Objective-C/admob/RewardedVideoExample/Podfile @@ -3,6 +3,5 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '7.0' target 'RewardedVideoExample' do - pod 'Firebase/Core' - pod 'Firebase/AdMob' + pod 'Google-Mobile-Ads-SDK' end diff --git a/Objective-C/admob/RewardedVideoExample/Podfile.lock b/Objective-C/admob/RewardedVideoExample/Podfile.lock index 115bc139..07995a6e 100644 --- a/Objective-C/admob/RewardedVideoExample/Podfile.lock +++ b/Objective-C/admob/RewardedVideoExample/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: dc93e0c1c51f5731249c6897e32df817a3961c98 +PODFILE CHECKSUM: 0e503dca9e87f3e7fc3be06f050fe76557afba22 COCOAPODS: 1.2.1 diff --git a/Objective-C/admob/RewardedVideoExample/RewardedVideoExample.xcodeproj/project.pbxproj b/Objective-C/admob/RewardedVideoExample/RewardedVideoExample.xcodeproj/project.pbxproj index 840a9834..f16f3eac 100644 --- a/Objective-C/admob/RewardedVideoExample/RewardedVideoExample.xcodeproj/project.pbxproj +++ b/Objective-C/admob/RewardedVideoExample/RewardedVideoExample.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 26B0F1981CE9388B00E202AF /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 26B0F1971CE9388B00E202AF /* GoogleService-Info.plist */; }; 84E184631B30D695002ADFFB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 84E184621B30D695002ADFFB /* main.m */; }; 84E184661B30D695002ADFFB /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 84E184651B30D695002ADFFB /* AppDelegate.m */; }; 84E184691B30D695002ADFFB /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 84E184681B30D695002ADFFB /* ViewController.m */; }; @@ -17,7 +16,6 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 26B0F1971CE9388B00E202AF /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 84E1845D1B30D695002ADFFB /* RewardedVideoExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RewardedVideoExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; 84E184611B30D695002ADFFB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 84E184621B30D695002ADFFB /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -60,7 +58,6 @@ 84E1845F1B30D695002ADFFB /* RewardedVideoExample */ = { isa = PBXGroup; children = ( - 26B0F1971CE9388B00E202AF /* GoogleService-Info.plist */, 84E184641B30D695002ADFFB /* AppDelegate.h */, 84E184651B30D695002ADFFB /* AppDelegate.m */, 84E184671B30D695002ADFFB /* ViewController.h */, @@ -140,7 +137,6 @@ buildActionMask = 2147483647; files = ( 84E1846C1B30D695002ADFFB /* Main.storyboard in Resources */, - 26B0F1981CE9388B00E202AF /* GoogleService-Info.plist in Resources */, 84E184711B30D695002ADFFB /* LaunchScreen.xib in Resources */, 84E1846E1B30D695002ADFFB /* Images.xcassets in Resources */, ); diff --git a/Objective-C/admob/RewardedVideoExample/RewardedVideoExample/AppDelegate.m b/Objective-C/admob/RewardedVideoExample/RewardedVideoExample/AppDelegate.m index dae2e88d..15daac77 100644 --- a/Objective-C/admob/RewardedVideoExample/RewardedVideoExample/AppDelegate.m +++ b/Objective-C/admob/RewardedVideoExample/RewardedVideoExample/AppDelegate.m @@ -18,15 +18,13 @@ #import "ViewController.h" -@import Firebase; +@import GoogleMobileAds; @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/RewardedVideoExample/RewardedVideoExample/GoogleService-Info.plist b/Objective-C/admob/RewardedVideoExample/RewardedVideoExample/GoogleService-Info.plist deleted file mode 100644 index c5a0c83b..00000000 --- a/Objective-C/admob/RewardedVideoExample/RewardedVideoExample/GoogleService-Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - AD_UNIT_ID_FOR_BANNER_TEST - ca-app-pub-3940256099942544/2934735716 - AD_UNIT_ID_FOR_INTERSTITIAL_TEST - ca-app-pub-3940256099942544/4411468910 - CLIENT_ID - test-do-not-use.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.test-do-not-use - API_KEY - 000000000000000000000000000000000000000 - GCM_SENDER_ID - 999999999999 - PLIST_VERSION - 1 - BUNDLE_ID - com.google.ads.RewardedVideoExample - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:999999999999:ios:0000000000000000 - DATABASE_URL - https://test-do-not-use.firebaseio.com - - diff --git a/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample.xcodeproj/project.pbxproj b/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample.xcodeproj/project.pbxproj index b611edbe..78df8be5 100644 --- a/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample.xcodeproj/project.pbxproj +++ b/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample.xcodeproj/project.pbxproj @@ -13,7 +13,6 @@ 840C3FF21DA1D82A00400493 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 840C3FF01DA1D82A00400493 /* Main.storyboard */; }; 840C3FF41DA1D82A00400493 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 840C3FF31DA1D82A00400493 /* Assets.xcassets */; }; 840C3FF71DA1D82A00400493 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 840C3FF51DA1D82A00400493 /* LaunchScreen.storyboard */; }; - 84143A061DAEA19000E132B3 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 84143A051DAEA19000E132B3 /* GoogleService-Info.plist */; }; 843022031DADB8EC00614B4A /* menu_item_image-web.png in Resources */ = {isa = PBXBuildFile; fileRef = 843022011DADB8EC00614B4A /* menu_item_image-web.png */; }; 843022041DADB8EC00614B4A /* menuItemsJSON.json in Resources */ = {isa = PBXBuildFile; fileRef = 843022021DADB8EC00614B4A /* menuItemsJSON.json */; }; 8453A8DE1DA1D8D400A3EB72 /* MenuItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 8453A8DD1DA1D8D400A3EB72 /* MenuItem.m */; }; @@ -33,7 +32,6 @@ 840C3FF31DA1D82A00400493 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 840C3FF61DA1D82A00400493 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 840C3FF81DA1D82A00400493 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 84143A051DAEA19000E132B3 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 843022011DADB8EC00614B4A /* menu_item_image-web.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menu_item_image-web.png"; sourceTree = ""; }; 843022021DADB8EC00614B4A /* menuItemsJSON.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = menuItemsJSON.json; sourceTree = ""; }; 8453A8DC1DA1D8D400A3EB72 /* MenuItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenuItem.h; sourceTree = ""; }; @@ -74,7 +72,6 @@ 840C3FE61DA1D82A00400493 /* NativeExpressTableViewExample */ = { isa = PBXGroup; children = ( - 84143A051DAEA19000E132B3 /* GoogleService-Info.plist */, 843022011DADB8EC00614B4A /* menu_item_image-web.png */, 843022021DADB8EC00614B4A /* menuItemsJSON.json */, 8453A8E31DA1DCC200A3EB72 /* MenuItemTableViewCell.h */, @@ -162,7 +159,6 @@ buildActionMask = 2147483647; files = ( 843022031DADB8EC00614B4A /* menu_item_image-web.png in Resources */, - 84143A061DAEA19000E132B3 /* GoogleService-Info.plist in Resources */, 840C3FF71DA1D82A00400493 /* LaunchScreen.storyboard in Resources */, 8453A8E11DA1D8FC00A3EB72 /* MenuItem.xib in Resources */, 840C3FF41DA1D82A00400493 /* Assets.xcassets in Resources */, diff --git a/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/AppDelegate.h b/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/AppDelegate.h index 0f9e9eae..d52a68a9 100644 --- a/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/AppDelegate.h +++ b/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/AppDelegate.h @@ -14,7 +14,7 @@ // limitations under the License. // -@import Firebase; +@import GoogleMobileAds; @import UIKit; @interface AppDelegate : UIResponder diff --git a/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/AppDelegate.m b/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/AppDelegate.m index 4bb83c66..0a944f0a 100644 --- a/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/AppDelegate.m +++ b/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/AppDelegate.m @@ -15,13 +15,13 @@ // #import "AppDelegate.h" +@import GoogleMobileAds; @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - // Configure Firebase. - [FIRApp configure]; + // Initialize the Google Mobile Ads SDK with the AdMob application ID. [GADMobileAds configureWithApplicationID:@"ca-app-pub-3940256099942544~1458002511"]; diff --git a/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/GoogleService-Info.plist b/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/GoogleService-Info.plist deleted file mode 100644 index 2c7cd1c7..00000000 --- a/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/GoogleService-Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - AD_UNIT_ID_FOR_BANNER_TEST - ca-app-pub-3940256099942544/2934735716 - AD_UNIT_ID_FOR_INTERSTITIAL_TEST - ca-app-pub-3940256099942544/4411468910 - CLIENT_ID - test-do-not-use.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.test-do-not-use - API_KEY - 000000000000000000000000000000000000000 - GCM_SENDER_ID - 999999999999 - PLIST_VERSION - 1 - BUNDLE_ID - com.google.ads.NativeExpressTableViewExample - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:999999999999:ios:0000000000000000 - DATABASE_URL - https://test-do-not-use.firebaseio.com - - diff --git a/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/TableViewController.h b/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/TableViewController.h index 8af2af53..3ac960c2 100644 --- a/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/TableViewController.h +++ b/Objective-C/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/TableViewController.h @@ -14,7 +14,7 @@ // limitations under the License. // -@import Firebase; +@import GoogleMobileAds; @import UIKit; @interface TableViewController : UITableViewController diff --git a/Objective-C/advanced/NativeExpressTableViewExample/Podfile b/Objective-C/advanced/NativeExpressTableViewExample/Podfile index 3488f4f3..f219ca09 100644 --- a/Objective-C/advanced/NativeExpressTableViewExample/Podfile +++ b/Objective-C/advanced/NativeExpressTableViewExample/Podfile @@ -3,6 +3,5 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '7.0' target 'NativeExpressTableViewExample' do - pod 'Firebase' - pod 'Firebase/AdMob' + pod 'Google-Mobile-Ads-SDK' end diff --git a/Objective-C/advanced/NativeExpressTableViewExample/Podfile.lock b/Objective-C/advanced/NativeExpressTableViewExample/Podfile.lock index cff48477..438d711f 100644 --- a/Objective-C/advanced/NativeExpressTableViewExample/Podfile.lock +++ b/Objective-C/advanced/NativeExpressTableViewExample/Podfile.lock @@ -1,37 +1,12 @@ PODS: - - Firebase (4.0.2): - - Firebase/Core (= 4.0.2) - - 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 - - Firebase/AdMob + - 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: 93bd28bdd43d4cc3c33675defe0a0101f0cc3d78 +PODFILE CHECKSUM: 6d53e9ab351224a61399def2365d69a72873ab0f COCOAPODS: 1.2.1 diff --git a/Swift/admob/BannerExample/BannerExample.xcodeproj/project.pbxproj b/Swift/admob/BannerExample/BannerExample.xcodeproj/project.pbxproj index 88046e5b..062ca2cc 100644 --- a/Swift/admob/BannerExample/BannerExample.xcodeproj/project.pbxproj +++ b/Swift/admob/BannerExample/BannerExample.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 26D3AAA21CE93A510073BF04 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 26D3AAA11CE93A510073BF04 /* GoogleService-Info.plist */; }; 849326E81B066C7900863759 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849326E71B066C7900863759 /* AppDelegate.swift */; }; 849326EA1B066C7900863759 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849326E91B066C7900863759 /* ViewController.swift */; }; 849326ED1B066C7900863759 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 849326EB1B066C7900863759 /* Main.storyboard */; }; @@ -16,7 +15,6 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 26D3AAA11CE93A510073BF04 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 849326E21B066C7900863759 /* BannerExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BannerExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; 849326E61B066C7900863759 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 849326E71B066C7900863759 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -56,7 +54,6 @@ 849326E41B066C7900863759 /* BannerExample */ = { isa = PBXGroup; children = ( - 26D3AAA11CE93A510073BF04 /* GoogleService-Info.plist */, 849326E71B066C7900863759 /* AppDelegate.swift */, 849326E91B066C7900863759 /* ViewController.swift */, 849326EB1B066C7900863759 /* Main.storyboard */, @@ -135,7 +132,6 @@ buildActionMask = 2147483647; files = ( 849326ED1B066C7900863759 /* Main.storyboard in Resources */, - 26D3AAA21CE93A510073BF04 /* GoogleService-Info.plist in Resources */, 849326F21B066C7900863759 /* LaunchScreen.xib in Resources */, 849326EF1B066C7900863759 /* Images.xcassets in Resources */, ); diff --git a/Swift/admob/BannerExample/BannerExample/AppDelegate.swift b/Swift/admob/BannerExample/BannerExample/AppDelegate.swift index 26d6b095..a1417f19 100644 --- a/Swift/admob/BannerExample/BannerExample/AppDelegate.swift +++ b/Swift/admob/BannerExample/BannerExample/AppDelegate.swift @@ -14,7 +14,7 @@ // limitations under the License. // -import Firebase +import GoogleMobileAds import UIKit @UIApplicationMain @@ -24,8 +24,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { - // Use Firebase library to configure APIs - FirebaseApp.configure() + // Initialize Google Mobile Ads SDK GADMobileAds.configure(withApplicationID: "ca-app-pub-3940256099942544~1458002511") diff --git a/Swift/admob/BannerExample/BannerExample/GoogleService-Info.plist b/Swift/admob/BannerExample/BannerExample/GoogleService-Info.plist deleted file mode 100644 index 84ad1193..00000000 --- a/Swift/admob/BannerExample/BannerExample/GoogleService-Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - AD_UNIT_ID_FOR_BANNER_TEST - ca-app-pub-3940256099942544/2934735716 - AD_UNIT_ID_FOR_INTERSTITIAL_TEST - ca-app-pub-3940256099942544/4411468910 - CLIENT_ID - test-do-not-use.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.test-do-not-use - API_KEY - 000000000000000000000000000000000000000 - GCM_SENDER_ID - 999999999999 - PLIST_VERSION - 1 - BUNDLE_ID - com.google.ads.BannerExample - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:999999999999:ios:0000000000000000 - DATABASE_URL - https://test-do-not-use.firebaseio.com - - diff --git a/Swift/admob/BannerExample/Podfile b/Swift/admob/BannerExample/Podfile index 4cd79805..506e9e48 100644 --- a/Swift/admob/BannerExample/Podfile +++ b/Swift/admob/BannerExample/Podfile @@ -4,6 +4,5 @@ platform :ios, '7.0' target 'BannerExample' do use_frameworks! - pod 'Firebase/Core' - pod 'Firebase/AdMob' + pod 'Google-Mobile-Ads-SDK' end diff --git a/Swift/admob/BannerExample/Podfile.lock b/Swift/admob/BannerExample/Podfile.lock index bac7edd6..7e442dfe 100644 --- a/Swift/admob/BannerExample/Podfile.lock +++ b/Swift/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: 2c0d81e35b6afc2a0271b78626ef3c506fa00eeb +PODFILE CHECKSUM: 9734a6eaf17625f9a2b4eb81eb2adcf01462e3b3 COCOAPODS: 1.2.1 diff --git a/Swift/admob/InterstitialExample/InterstitialExample.xcodeproj/project.pbxproj b/Swift/admob/InterstitialExample/InterstitialExample.xcodeproj/project.pbxproj index 2419c5f4..e53ef27f 100644 --- a/Swift/admob/InterstitialExample/InterstitialExample.xcodeproj/project.pbxproj +++ b/Swift/admob/InterstitialExample/InterstitialExample.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 2634E8DF1CE93A8000644055 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2634E8DE1CE93A8000644055 /* GoogleService-Info.plist */; }; 849326B61B066A7F00863759 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849326B51B066A7F00863759 /* AppDelegate.swift */; }; 849326B81B066A7F00863759 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849326B71B066A7F00863759 /* ViewController.swift */; }; 849326BB1B066A7F00863759 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 849326B91B066A7F00863759 /* Main.storyboard */; }; @@ -16,7 +15,6 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 2634E8DE1CE93A8000644055 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 849326B01B066A7F00863759 /* InterstitialExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = InterstitialExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; 849326B41B066A7F00863759 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 849326B51B066A7F00863759 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -56,7 +54,6 @@ 849326B21B066A7F00863759 /* InterstitialExample */ = { isa = PBXGroup; children = ( - 2634E8DE1CE93A8000644055 /* GoogleService-Info.plist */, 849326B51B066A7F00863759 /* AppDelegate.swift */, 849326B71B066A7F00863759 /* ViewController.swift */, 849326B91B066A7F00863759 /* Main.storyboard */, @@ -136,7 +133,6 @@ buildActionMask = 2147483647; files = ( 849326BB1B066A7F00863759 /* Main.storyboard in Resources */, - 2634E8DF1CE93A8000644055 /* GoogleService-Info.plist in Resources */, 849326C01B066A7F00863759 /* LaunchScreen.xib in Resources */, 849326BD1B066A7F00863759 /* Images.xcassets in Resources */, ); diff --git a/Swift/admob/InterstitialExample/InterstitialExample/AppDelegate.swift b/Swift/admob/InterstitialExample/InterstitialExample/AppDelegate.swift index 26d6b095..a1417f19 100644 --- a/Swift/admob/InterstitialExample/InterstitialExample/AppDelegate.swift +++ b/Swift/admob/InterstitialExample/InterstitialExample/AppDelegate.swift @@ -14,7 +14,7 @@ // limitations under the License. // -import Firebase +import GoogleMobileAds import UIKit @UIApplicationMain @@ -24,8 +24,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { - // Use Firebase library to configure APIs - FirebaseApp.configure() + // Initialize Google Mobile Ads SDK GADMobileAds.configure(withApplicationID: "ca-app-pub-3940256099942544~1458002511") diff --git a/Swift/admob/InterstitialExample/InterstitialExample/GoogleService-Info.plist b/Swift/admob/InterstitialExample/InterstitialExample/GoogleService-Info.plist deleted file mode 100644 index 76509528..00000000 --- a/Swift/admob/InterstitialExample/InterstitialExample/GoogleService-Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - AD_UNIT_ID_FOR_BANNER_TEST - ca-app-pub-3940256099942544/2934735716 - AD_UNIT_ID_FOR_INTERSTITIAL_TEST - ca-app-pub-3940256099942544/4411468910 - CLIENT_ID - test-do-not-use.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.test-do-not-use - API_KEY - 000000000000000000000000000000000000000 - GCM_SENDER_ID - 999999999999 - PLIST_VERSION - 1 - BUNDLE_ID - com.google.ads.InterstitialExample - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:999999999999:ios:0000000000000000 - DATABASE_URL - https://test-do-not-use.firebaseio.com - - diff --git a/Swift/admob/InterstitialExample/Podfile b/Swift/admob/InterstitialExample/Podfile index dcc5ebd4..f7e46ce4 100644 --- a/Swift/admob/InterstitialExample/Podfile +++ b/Swift/admob/InterstitialExample/Podfile @@ -4,6 +4,5 @@ platform :ios, '7.0' target 'InterstitialExample' do use_frameworks! - pod 'Firebase/Core' - pod 'Firebase/AdMob' + pod 'Google-Mobile-Ads-SDK' end diff --git a/Swift/admob/InterstitialExample/Podfile.lock b/Swift/admob/InterstitialExample/Podfile.lock index 2445fc67..08d26dc8 100644 --- a/Swift/admob/InterstitialExample/Podfile.lock +++ b/Swift/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: f51085c4b1587e4a2791ffee0a18fba90b84b6c6 +PODFILE CHECKSUM: ae5e4055ee8c0eee2238e86144cdc8cc7a362ca0 COCOAPODS: 1.2.1 diff --git a/Swift/admob/NativeAdvancedExample/NativeAdvancedExample.xcodeproj/project.pbxproj b/Swift/admob/NativeAdvancedExample/NativeAdvancedExample.xcodeproj/project.pbxproj index ee4f45d5..3d151348 100644 --- a/Swift/admob/NativeAdvancedExample/NativeAdvancedExample.xcodeproj/project.pbxproj +++ b/Swift/admob/NativeAdvancedExample/NativeAdvancedExample.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 267F0AF41CE93AA300C90CE5 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 267F0AF31CE93AA300C90CE5 /* GoogleService-Info.plist */; }; 4AEBD5701BF0109B00874961 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AEBD56F1BF0109B00874961 /* AppDelegate.swift */; }; 4AEBD5721BF0109B00874961 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AEBD5711BF0109B00874961 /* ViewController.swift */; }; 4AEBD5751BF0109B00874961 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4AEBD5731BF0109B00874961 /* Main.storyboard */; }; @@ -18,7 +17,6 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 267F0AF31CE93AA300C90CE5 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 4AEBD56C1BF0109B00874961 /* NativeAdvancedExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NativeAdvancedExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4AEBD56F1BF0109B00874961 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 4AEBD5711BF0109B00874961 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -46,7 +44,6 @@ children = ( 4AEBD56E1BF0109B00874961 /* NativeAdvancedExample */, 4AEBD56D1BF0109B00874961 /* Products */, - 77CAAFB1A66B6A865AE904A3 /* Frameworks */, ); sourceTree = ""; }; @@ -61,7 +58,6 @@ 4AEBD56E1BF0109B00874961 /* NativeAdvancedExample */ = { isa = PBXGroup; children = ( - 267F0AF31CE93AA300C90CE5 /* GoogleService-Info.plist */, 4AEBD56F1BF0109B00874961 /* AppDelegate.swift */, 4AEBD5711BF0109B00874961 /* ViewController.swift */, 4AEBD5731BF0109B00874961 /* Main.storyboard */, @@ -74,13 +70,6 @@ path = NativeAdvancedExample; sourceTree = ""; }; - 77CAAFB1A66B6A865AE904A3 /* Frameworks */ = { - isa = PBXGroup; - children = ( - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -145,7 +134,6 @@ 4AEC64101BFAAB9600CF6A16 /* NativeAppInstallAdView.xib in Resources */, 4AEC64111BFAAB9600CF6A16 /* NativeContentAdView.xib in Resources */, 4AEBD5751BF0109B00874961 /* Main.storyboard in Resources */, - 267F0AF41CE93AA300C90CE5 /* GoogleService-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Swift/admob/NativeAdvancedExample/NativeAdvancedExample/AppDelegate.swift b/Swift/admob/NativeAdvancedExample/NativeAdvancedExample/AppDelegate.swift index a36a7d58..253d2752 100644 --- a/Swift/admob/NativeAdvancedExample/NativeAdvancedExample/AppDelegate.swift +++ b/Swift/admob/NativeAdvancedExample/NativeAdvancedExample/AppDelegate.swift @@ -14,7 +14,7 @@ // limitations under the License. // -import Firebase +import GoogleMobileAds import UIKit @UIApplicationMain @@ -24,8 +24,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { - // Use Firebase library to configure APIs. - FirebaseApp.configure() + // Initialize Google Mobile Ads SDK. GADMobileAds.configure(withApplicationID: "ca-app-pub-3940256099942544~1458002511") diff --git a/Swift/admob/NativeAdvancedExample/NativeAdvancedExample/GoogleService-Info.plist b/Swift/admob/NativeAdvancedExample/NativeAdvancedExample/GoogleService-Info.plist deleted file mode 100644 index 5dffb286..00000000 --- a/Swift/admob/NativeAdvancedExample/NativeAdvancedExample/GoogleService-Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - AD_UNIT_ID_FOR_BANNER_TEST - ca-app-pub-3940256099942544/2934735716 - AD_UNIT_ID_FOR_INTERSTITIAL_TEST - ca-app-pub-3940256099942544/4411468910 - CLIENT_ID - test-do-not-use.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.test-do-not-use - API_KEY - 000000000000000000000000000000000000000 - GCM_SENDER_ID - 999999999999 - PLIST_VERSION - 1 - BUNDLE_ID - com.google.NativeAdvancedExample - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:999999999999:ios:0000000000000000 - DATABASE_URL - https://test-do-not-use.firebaseio.com - - diff --git a/Swift/admob/NativeAdvancedExample/Podfile b/Swift/admob/NativeAdvancedExample/Podfile index 7ad91a9f..b3c36cc1 100644 --- a/Swift/admob/NativeAdvancedExample/Podfile +++ b/Swift/admob/NativeAdvancedExample/Podfile @@ -4,6 +4,5 @@ platform :ios, '7.0' target 'NativeAdvancedExample' do use_frameworks! - pod 'Firebase/Core' - pod 'Firebase/AdMob' + pod 'Google-Mobile-Ads-SDK' end diff --git a/Swift/admob/NativeAdvancedExample/Podfile.lock b/Swift/admob/NativeAdvancedExample/Podfile.lock index aed09569..45138c77 100644 --- a/Swift/admob/NativeAdvancedExample/Podfile.lock +++ b/Swift/admob/NativeAdvancedExample/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: ce57bf163043fa6e1bd0bad71414a6599520672c +PODFILE CHECKSUM: d28f34266add95518b9ec9e141c2977666010e1d COCOAPODS: 1.2.1 diff --git a/Swift/admob/NativeExpressExample/NativeExpressExample.xcodeproj/project.pbxproj b/Swift/admob/NativeExpressExample/NativeExpressExample.xcodeproj/project.pbxproj index 6032d639..5495a541 100644 --- a/Swift/admob/NativeExpressExample/NativeExpressExample.xcodeproj/project.pbxproj +++ b/Swift/admob/NativeExpressExample/NativeExpressExample.xcodeproj/project.pbxproj @@ -12,7 +12,6 @@ 26AEE9261CE0511B00994331 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 26AEE9241CE0511B00994331 /* Main.storyboard */; }; 26AEE9281CE0511B00994331 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 26AEE9271CE0511B00994331 /* Assets.xcassets */; }; 26AEE92B1CE0511B00994331 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 26AEE9291CE0511B00994331 /* LaunchScreen.storyboard */; }; - 26AEE9351CE0E44200994331 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 26AEE9341CE0E44200994331 /* GoogleService-Info.plist */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -23,7 +22,6 @@ 26AEE9271CE0511B00994331 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 26AEE92A1CE0511B00994331 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 26AEE92C1CE0511B00994331 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 26AEE9341CE0E44200994331 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -56,7 +54,6 @@ 26AEE91F1CE0511B00994331 /* NativeExpressExample */ = { isa = PBXGroup; children = ( - 26AEE9341CE0E44200994331 /* GoogleService-Info.plist */, 26AEE9201CE0511B00994331 /* AppDelegate.swift */, 26AEE9221CE0511B00994331 /* ViewController.swift */, 26AEE9241CE0511B00994331 /* Main.storyboard */, @@ -127,7 +124,6 @@ buildActionMask = 2147483647; files = ( 26AEE92B1CE0511B00994331 /* LaunchScreen.storyboard in Resources */, - 26AEE9351CE0E44200994331 /* GoogleService-Info.plist in Resources */, 26AEE9281CE0511B00994331 /* Assets.xcassets in Resources */, 26AEE9261CE0511B00994331 /* Main.storyboard in Resources */, ); diff --git a/Swift/admob/NativeExpressExample/NativeExpressExample/AppDelegate.swift b/Swift/admob/NativeExpressExample/NativeExpressExample/AppDelegate.swift index 68263833..79b7fce1 100644 --- a/Swift/admob/NativeExpressExample/NativeExpressExample/AppDelegate.swift +++ b/Swift/admob/NativeExpressExample/NativeExpressExample/AppDelegate.swift @@ -14,7 +14,7 @@ // limitations under the License. // -import Firebase +import GoogleMobileAds import UIKit @UIApplicationMain @@ -24,8 +24,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { - // Use Firebase library to configure APIs - FirebaseApp.configure() + // Initialize Google Mobile Ads SDK GADMobileAds.configure(withApplicationID: "ca-app-pub-3940256099942544~1458002511") diff --git a/Swift/admob/NativeExpressExample/NativeExpressExample/GoogleService-Info.plist b/Swift/admob/NativeExpressExample/NativeExpressExample/GoogleService-Info.plist deleted file mode 100644 index 0249d59b..00000000 --- a/Swift/admob/NativeExpressExample/NativeExpressExample/GoogleService-Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - AD_UNIT_ID_FOR_BANNER_TEST - ca-app-pub-3940256099942544/2934735716 - AD_UNIT_ID_FOR_INTERSTITIAL_TEST - ca-app-pub-3940256099942544/4411468910 - CLIENT_ID - test-do-not-use.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.test-do-not-use - API_KEY - 000000000000000000000000000000000000000 - GCM_SENDER_ID - 999999999999 - PLIST_VERSION - 1 - BUNDLE_ID - com.google.example.NativeExpressExample - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:999999999999:ios:0000000000000000 - DATABASE_URL - https://test-do-not-use.firebaseio.com - - diff --git a/Swift/admob/NativeExpressExample/Podfile b/Swift/admob/NativeExpressExample/Podfile index d8c6e3a2..976b4d3c 100644 --- a/Swift/admob/NativeExpressExample/Podfile +++ b/Swift/admob/NativeExpressExample/Podfile @@ -4,6 +4,5 @@ platform :ios, '7.0' target 'NativeExpressExample' do use_frameworks! - pod 'Firebase/Core' - pod 'Firebase/AdMob' + pod 'Google-Mobile-Ads-SDK' end diff --git a/Swift/admob/NativeExpressExample/Podfile.lock b/Swift/admob/NativeExpressExample/Podfile.lock index 21a5835b..4b99bf1e 100644 --- a/Swift/admob/NativeExpressExample/Podfile.lock +++ b/Swift/admob/NativeExpressExample/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: 13f0a8b35152bf7428082e8ac4a9c23c8542c3a2 +PODFILE CHECKSUM: 123f69053c233c2b1cd94c1584eed20997256b89 COCOAPODS: 1.2.1 diff --git a/Swift/admob/RewardedVideoExample/Podfile b/Swift/admob/RewardedVideoExample/Podfile index 3fc44977..a76a95fa 100644 --- a/Swift/admob/RewardedVideoExample/Podfile +++ b/Swift/admob/RewardedVideoExample/Podfile @@ -4,6 +4,5 @@ platform :ios, '7.0' target 'RewardedVideoExample' do use_frameworks! - pod 'Firebase/Core' - pod 'Firebase/AdMob' + pod 'Google-Mobile-Ads-SDK' end diff --git a/Swift/admob/RewardedVideoExample/Podfile.lock b/Swift/admob/RewardedVideoExample/Podfile.lock index d3cda3d4..e455f415 100644 --- a/Swift/admob/RewardedVideoExample/Podfile.lock +++ b/Swift/admob/RewardedVideoExample/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: e904ef21c7948f7f0bcf7bbde351d1129b39846f +PODFILE CHECKSUM: 75d0c64f7b18644d1740b9d98720c5bc678947bb COCOAPODS: 1.2.1 diff --git a/Swift/admob/RewardedVideoExample/RewardedVideoExample.xcodeproj/project.pbxproj b/Swift/admob/RewardedVideoExample/RewardedVideoExample.xcodeproj/project.pbxproj index 407b3ac2..7caee305 100644 --- a/Swift/admob/RewardedVideoExample/RewardedVideoExample.xcodeproj/project.pbxproj +++ b/Swift/admob/RewardedVideoExample/RewardedVideoExample.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 267F0AF61CE93AC900C90CE5 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 267F0AF51CE93AC900C90CE5 /* GoogleService-Info.plist */; }; 849326B61B066A7F00863759 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849326B51B066A7F00863759 /* AppDelegate.swift */; }; 849326B81B066A7F00863759 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849326B71B066A7F00863759 /* ViewController.swift */; }; 849326BB1B066A7F00863759 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 849326B91B066A7F00863759 /* Main.storyboard */; }; @@ -16,7 +15,6 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 267F0AF51CE93AC900C90CE5 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 849326B01B066A7F00863759 /* RewardedVideoExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RewardedVideoExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; 849326B41B066A7F00863759 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 849326B51B066A7F00863759 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -56,7 +54,6 @@ 849326B21B066A7F00863759 /* RewardedVideoExample */ = { isa = PBXGroup; children = ( - 267F0AF51CE93AC900C90CE5 /* GoogleService-Info.plist */, 849326B51B066A7F00863759 /* AppDelegate.swift */, 849326B71B066A7F00863759 /* ViewController.swift */, 849326B91B066A7F00863759 /* Main.storyboard */, @@ -136,7 +133,6 @@ buildActionMask = 2147483647; files = ( 849326BB1B066A7F00863759 /* Main.storyboard in Resources */, - 267F0AF61CE93AC900C90CE5 /* GoogleService-Info.plist in Resources */, 849326C01B066A7F00863759 /* LaunchScreen.xib in Resources */, 849326BD1B066A7F00863759 /* Images.xcassets in Resources */, ); diff --git a/Swift/admob/RewardedVideoExample/RewardedVideoExample/AppDelegate.swift b/Swift/admob/RewardedVideoExample/RewardedVideoExample/AppDelegate.swift index 68263833..79b7fce1 100644 --- a/Swift/admob/RewardedVideoExample/RewardedVideoExample/AppDelegate.swift +++ b/Swift/admob/RewardedVideoExample/RewardedVideoExample/AppDelegate.swift @@ -14,7 +14,7 @@ // limitations under the License. // -import Firebase +import GoogleMobileAds import UIKit @UIApplicationMain @@ -24,8 +24,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { - // Use Firebase library to configure APIs - FirebaseApp.configure() + // Initialize Google Mobile Ads SDK GADMobileAds.configure(withApplicationID: "ca-app-pub-3940256099942544~1458002511") diff --git a/Swift/admob/RewardedVideoExample/RewardedVideoExample/GoogleService-Info.plist b/Swift/admob/RewardedVideoExample/RewardedVideoExample/GoogleService-Info.plist deleted file mode 100644 index c5a0c83b..00000000 --- a/Swift/admob/RewardedVideoExample/RewardedVideoExample/GoogleService-Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - AD_UNIT_ID_FOR_BANNER_TEST - ca-app-pub-3940256099942544/2934735716 - AD_UNIT_ID_FOR_INTERSTITIAL_TEST - ca-app-pub-3940256099942544/4411468910 - CLIENT_ID - test-do-not-use.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.test-do-not-use - API_KEY - 000000000000000000000000000000000000000 - GCM_SENDER_ID - 999999999999 - PLIST_VERSION - 1 - BUNDLE_ID - com.google.ads.RewardedVideoExample - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:999999999999:ios:0000000000000000 - DATABASE_URL - https://test-do-not-use.firebaseio.com - - diff --git a/Swift/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample.xcodeproj/project.pbxproj b/Swift/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample.xcodeproj/project.pbxproj index 6ca32bdf..6d71bc85 100644 --- a/Swift/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample.xcodeproj/project.pbxproj +++ b/Swift/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample.xcodeproj/project.pbxproj @@ -17,7 +17,6 @@ 846A6C781D73972000270B27 /* menu_item_image-web.png in Resources */ = {isa = PBXBuildFile; fileRef = 846A6C771D73972000270B27 /* menu_item_image-web.png */; }; 846A6C821D760EC000270B27 /* MenuItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = 846A6C811D760EC000270B27 /* MenuItem.xib */; }; 84B326D71D876FCB00517F8F /* NativeExpressAd.xib in Resources */ = {isa = PBXBuildFile; fileRef = 84B326D61D876FCB00517F8F /* NativeExpressAd.xib */; }; - 84B6D3661D99A5D5007D12D2 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 84B6D3651D99A5D5007D12D2 /* GoogleService-Info.plist */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -33,7 +32,6 @@ 846A6C771D73972000270B27 /* menu_item_image-web.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menu_item_image-web.png"; sourceTree = ""; }; 846A6C811D760EC000270B27 /* MenuItem.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MenuItem.xib; sourceTree = ""; }; 84B326D61D876FCB00517F8F /* NativeExpressAd.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NativeExpressAd.xib; sourceTree = ""; }; - 84B6D3651D99A5D5007D12D2 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -67,7 +65,6 @@ isa = PBXGroup; children = ( 843021FF1DADB82F00614B4A /* menuItemsJSON.json */, - 84B6D3651D99A5D5007D12D2 /* GoogleService-Info.plist */, 846A6C771D73972000270B27 /* menu_item_image-web.png */, 846A6C431D6E35FD00270B27 /* AppDelegate.swift */, 846A6C751D73854200270B27 /* TableViewController.swift */, @@ -147,7 +144,6 @@ 846A6C491D6E35FD00270B27 /* Main.storyboard in Resources */, 84B326D71D876FCB00517F8F /* NativeExpressAd.xib in Resources */, 843022001DADB82F00614B4A /* menuItemsJSON.json in Resources */, - 84B6D3661D99A5D5007D12D2 /* GoogleService-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Swift/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/AppDelegate.swift b/Swift/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/AppDelegate.swift index c0ae14fa..819bde1b 100644 --- a/Swift/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/AppDelegate.swift +++ b/Swift/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/AppDelegate.swift @@ -14,7 +14,7 @@ // limitations under the License. // -import Firebase +import GoogleMobileAds import UIKit @UIApplicationMain @@ -24,8 +24,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { - // Configure Firebase. - FirebaseApp.configure() + // Initialize the Google Mobile Ads SDK with the AdMob application ID. GADMobileAds.configure(withApplicationID: "ca-app-pub-3940256099942544~1458002511") diff --git a/Swift/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/GoogleService-Info.plist b/Swift/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/GoogleService-Info.plist deleted file mode 100644 index 2c7cd1c7..00000000 --- a/Swift/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/GoogleService-Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - AD_UNIT_ID_FOR_BANNER_TEST - ca-app-pub-3940256099942544/2934735716 - AD_UNIT_ID_FOR_INTERSTITIAL_TEST - ca-app-pub-3940256099942544/4411468910 - CLIENT_ID - test-do-not-use.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.test-do-not-use - API_KEY - 000000000000000000000000000000000000000 - GCM_SENDER_ID - 999999999999 - PLIST_VERSION - 1 - BUNDLE_ID - com.google.ads.NativeExpressTableViewExample - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:999999999999:ios:0000000000000000 - DATABASE_URL - https://test-do-not-use.firebaseio.com - - diff --git a/Swift/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/TableViewController.swift b/Swift/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/TableViewController.swift index 64dc18d7..21ec0542 100644 --- a/Swift/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/TableViewController.swift +++ b/Swift/advanced/NativeExpressTableViewExample/NativeExpressTableViewExample/TableViewController.swift @@ -14,7 +14,7 @@ // limitations under the License. // -import Firebase +import GoogleMobileAds import UIKit class TableViewController: UITableViewController, GADNativeExpressAdViewDelegate { diff --git a/Swift/advanced/NativeExpressTableViewExample/Podfile b/Swift/advanced/NativeExpressTableViewExample/Podfile index 3488f4f3..f219ca09 100644 --- a/Swift/advanced/NativeExpressTableViewExample/Podfile +++ b/Swift/advanced/NativeExpressTableViewExample/Podfile @@ -3,6 +3,5 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '7.0' target 'NativeExpressTableViewExample' do - pod 'Firebase' - pod 'Firebase/AdMob' + pod 'Google-Mobile-Ads-SDK' end diff --git a/Swift/advanced/NativeExpressTableViewExample/Podfile.lock b/Swift/advanced/NativeExpressTableViewExample/Podfile.lock index cff48477..438d711f 100644 --- a/Swift/advanced/NativeExpressTableViewExample/Podfile.lock +++ b/Swift/advanced/NativeExpressTableViewExample/Podfile.lock @@ -1,37 +1,12 @@ PODS: - - Firebase (4.0.2): - - Firebase/Core (= 4.0.2) - - 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 - - Firebase/AdMob + - 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: 93bd28bdd43d4cc3c33675defe0a0101f0cc3d78 +PODFILE CHECKSUM: 6d53e9ab351224a61399def2365d69a72873ab0f COCOAPODS: 1.2.1