From 845c94765f216dc32c941e5746591b893aeabee0 Mon Sep 17 00:00:00 2001 From: Vimanyu Date: Mon, 28 Jun 2021 16:46:24 -0700 Subject: [PATCH 1/2] updating android and ios versions across repo. --- Android/firebase_dependencies.gradle | 2 +- admob/admob_resources/build.gradle | 2 +- admob/integration_test/Podfile | 4 +- analytics/integration_test/Podfile | 2 +- app/integration_test/Podfile | 2 +- auth/integration_test/Podfile | 4 +- database/integration_test/Podfile | 8 +-- dynamic_links/integration_test/Podfile | 2 +- firestore/integration_test/Podfile | 8 +-- firestore/integration_test_internal/Podfile | 8 +-- functions/integration_test/Podfile | 8 +-- installations/integration_test/Podfile | 4 +- ios_pod/Podfile | 26 ++++---- messaging/integration_test/Podfile | 2 +- .../Android/firebase_dependencies.gradle | 2 +- release_build_files/readme.md | 64 +++++++++---------- remote_config/integration_test/Podfile | 4 +- .../gameloop_android/app/build.gradle | 6 +- storage/integration_test/Podfile | 8 +-- 19 files changed, 83 insertions(+), 83 deletions(-) diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle index 2d1a47da0d..7289149d63 100644 --- a/Android/firebase_dependencies.gradle +++ b/Android/firebase_dependencies.gradle @@ -17,7 +17,7 @@ import org.gradle.util.ConfigureUtil; // A map of library to the dependencies that need to be added for it. def firebaseDependenciesMap = [ 'app' : ['com.google.firebase:firebase-analytics:19.0.0'], - 'admob' : ['com.google.firebase:firebase-ads:19.8.0', + 'admob' : ['com.google.firebase:firebase-ads:20.2.0', 'com.google.firebase:firebase-analytics:19.0.0', 'com.google.android.gms:play-services-base:17.6.0'], 'analytics' : ['com.google.firebase:firebase-analytics:19.0.0', diff --git a/admob/admob_resources/build.gradle b/admob/admob_resources/build.gradle index ed33436bb0..8c9e8ff1d1 100644 --- a/admob/admob_resources/build.gradle +++ b/admob/admob_resources/build.gradle @@ -46,7 +46,7 @@ android { dependencies { implementation 'com.google.firebase:firebase-analytics:19.0.0' - implementation 'com.google.firebase:firebase-ads:19.8.0' + implementation 'com.google.firebase:firebase-ads:20.2.0' } afterEvaluate { diff --git a/admob/integration_test/Podfile b/admob/integration_test/Podfile index 162d2cd568..acd78e90b3 100644 --- a/admob/integration_test/Podfile +++ b/admob/integration_test/Podfile @@ -3,8 +3,8 @@ platform :ios, '10.0' # Firebase AdMob test application. target 'integration_test' do - pod 'Firebase/Analytics', '8.1.1' - pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk' + pod 'Firebase/Analytics', '8.2.0' + pod 'Google-Mobile-Ads-SDK', '8.7.0' end post_install do |installer| diff --git a/analytics/integration_test/Podfile b/analytics/integration_test/Podfile index b5173c0002..d18c441043 100644 --- a/analytics/integration_test/Podfile +++ b/analytics/integration_test/Podfile @@ -4,7 +4,7 @@ platform :ios, '10.0' # Firebase Analytics test application. target 'integration_test' do - pod 'Firebase/Analytics', '8.1.1' + pod 'Firebase/Analytics', '8.2.0' end post_install do |installer| diff --git a/app/integration_test/Podfile b/app/integration_test/Podfile index 49a017cdba..25ed96f085 100644 --- a/app/integration_test/Podfile +++ b/app/integration_test/Podfile @@ -4,7 +4,7 @@ platform :ios, '10.0' # Firebase App test application. target 'integration_test' do - pod 'Firebase/Analytics', '8.1.1' + pod 'Firebase/Analytics', '8.2.0' end post_install do |installer| diff --git a/auth/integration_test/Podfile b/auth/integration_test/Podfile index 0bfe971207..292b1dc613 100644 --- a/auth/integration_test/Podfile +++ b/auth/integration_test/Podfile @@ -4,12 +4,12 @@ source 'https://github.com/CocoaPods/Specs.git' target 'integration_test' do platform :ios, '10.0' - pod 'Firebase/Auth', '8.1.1' + pod 'Firebase/Auth', '8.2.0' end target 'integration_test_tvos' do platform :tvos, '10.0' - pod 'Firebase/Auth', '8.1.1' + pod 'Firebase/Auth', '8.2.0' end post_install do |installer| diff --git a/database/integration_test/Podfile b/database/integration_test/Podfile index f3b8d5cede..5cfb332f39 100644 --- a/database/integration_test/Podfile +++ b/database/integration_test/Podfile @@ -4,14 +4,14 @@ source 'https://github.com/CocoaPods/Specs.git' target 'integration_test' do platform :ios, '10.0' - pod 'Firebase/Database', '8.1.1' - pod 'Firebase/Auth', '8.1.1' + pod 'Firebase/Database', '8.2.0' + pod 'Firebase/Auth', '8.2.0' end target 'integration_test_tvos' do platform :tvos, '10.0' - pod 'Firebase/Database', '8.1.1' - pod 'Firebase/Auth', '8.1.1' + pod 'Firebase/Database', '8.2.0' + pod 'Firebase/Auth', '8.2.0' end post_install do |installer| diff --git a/dynamic_links/integration_test/Podfile b/dynamic_links/integration_test/Podfile index 6eab07b079..e3540ab9ba 100644 --- a/dynamic_links/integration_test/Podfile +++ b/dynamic_links/integration_test/Podfile @@ -4,7 +4,7 @@ platform :ios, '10.0' # Firebase Dynamic Links test application. target 'integration_test' do - pod 'Firebase/DynamicLinks', '8.1.1' + pod 'Firebase/DynamicLinks', '8.2.0' end post_install do |installer| diff --git a/firestore/integration_test/Podfile b/firestore/integration_test/Podfile index 4e69408df4..01a57ac725 100644 --- a/firestore/integration_test/Podfile +++ b/firestore/integration_test/Podfile @@ -4,14 +4,14 @@ source 'https://github.com/CocoaPods/Specs.git' target 'integration_test' do platform :ios, '10.0' - pod 'Firebase/Firestore', '8.1.1' - pod 'Firebase/Auth', '8.1.1' + pod 'Firebase/Firestore', '8.2.0' + pod 'Firebase/Auth', '8.2.0' end target 'integration_test_tvos' do platform :tvos, '10.0' - pod 'Firebase/Firestore', '8.1.1' - pod 'Firebase/Auth', '8.1.1' + pod 'Firebase/Firestore', '8.2.0' + pod 'Firebase/Auth', '8.2.0' end post_install do |installer| diff --git a/firestore/integration_test_internal/Podfile b/firestore/integration_test_internal/Podfile index f50440c066..3c07f63f1a 100644 --- a/firestore/integration_test_internal/Podfile +++ b/firestore/integration_test_internal/Podfile @@ -3,14 +3,14 @@ source 'https://github.com/CocoaPods/Specs.git' target 'integration_test' do platform :ios, '10.0' - pod 'Firebase/Firestore', '7.11.0' - pod 'Firebase/Auth', '7.11.0' + pod 'Firebase/Firestore', '8.2.0' + pod 'Firebase/Auth', '8.2.0' end target 'integration_test_tvos' do platform :tvos, '10.0' - pod 'Firebase/Firestore', '7.11.0' - pod 'Firebase/Auth', '7.11.0' + pod 'Firebase/Firestore', '8.2.0' + pod 'Firebase/Auth', '8.2.0' end post_install do |installer| diff --git a/functions/integration_test/Podfile b/functions/integration_test/Podfile index a7eff99dda..b989cf5bdf 100644 --- a/functions/integration_test/Podfile +++ b/functions/integration_test/Podfile @@ -4,14 +4,14 @@ source 'https://github.com/CocoaPods/Specs.git' target 'integration_test' do platform :ios, '10.0' - pod 'Firebase/Functions', '8.1.1' - pod 'Firebase/Auth', '8.1.1' + pod 'Firebase/Functions', '8.2.0' + pod 'Firebase/Auth', '8.2.0' end target 'integration_test_tvos' do platform :tvos, '10.0' - pod 'Firebase/Functions', '8.1.1' - pod 'Firebase/Auth', '8.1.1' + pod 'Firebase/Functions', '8.2.0' + pod 'Firebase/Auth', '8.2.0' end post_install do |installer| diff --git a/installations/integration_test/Podfile b/installations/integration_test/Podfile index 95295d1a96..7b8588753a 100644 --- a/installations/integration_test/Podfile +++ b/installations/integration_test/Podfile @@ -4,8 +4,8 @@ platform :ios, '10.0' # Firebase Installations test application. target 'integration_test' do - pod 'Firebase/Analytics', '8.1.1' - pod 'Firebase/Installations', '8.1.1' + pod 'Firebase/Analytics', '8.2.0' + pod 'Firebase/Installations', '8.2.0' end post_install do |installer| diff --git a/ios_pod/Podfile b/ios_pod/Podfile index da55b5537c..9b9e90ff88 100644 --- a/ios_pod/Podfile +++ b/ios_pod/Podfile @@ -2,19 +2,19 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '10.0' target 'GetPods' do - pod 'Firebase/Core', '8.1.1' + pod 'Firebase/Core', '8.2.0' - pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk' - pod 'Firebase/Analytics', '8.1.1' - pod 'Firebase/Auth', '8.1.1' - pod 'Firebase/Crashlytics', '8.1.1' - pod 'Firebase/Database', '8.1.1' - pod 'Firebase/DynamicLinks', '8.1.1' - pod 'Firebase/Firestore', '8.1.1' - pod 'Firebase/Functions', '8.1.1' - pod 'Firebase/Installations', '8.1.1' - pod 'Firebase/Messaging', '8.1.1' - pod 'Firebase/RemoteConfig', '8.1.1' - pod 'Firebase/Storage', '8.1.1' + pod 'Google-Mobile-Ads-SDK', '8.7.0' + pod 'Firebase/Analytics', '8.2.0' + pod 'Firebase/Auth', '8.2.0' + pod 'Firebase/Crashlytics', '8.2.0' + pod 'Firebase/Database', '8.2.0' + pod 'Firebase/DynamicLinks', '8.2.0' + pod 'Firebase/Firestore', '8.2.0' + pod 'Firebase/Functions', '8.2.0' + pod 'Firebase/Installations', '8.2.0' + pod 'Firebase/Messaging', '8.2.0' + pod 'Firebase/RemoteConfig', '8.2.0' + pod 'Firebase/Storage', '8.2.0' end diff --git a/messaging/integration_test/Podfile b/messaging/integration_test/Podfile index b9537e7f35..d77a7fb704 100644 --- a/messaging/integration_test/Podfile +++ b/messaging/integration_test/Podfile @@ -4,7 +4,7 @@ platform :ios, '10.0' # Firebase Cloud Messaging test application. target 'integration_test' do - pod 'Firebase/Messaging', '8.1.1' + pod 'Firebase/Messaging', '8.2.0' end post_install do |installer| diff --git a/release_build_files/Android/firebase_dependencies.gradle b/release_build_files/Android/firebase_dependencies.gradle index 965dcfead0..1c6879e629 100644 --- a/release_build_files/Android/firebase_dependencies.gradle +++ b/release_build_files/Android/firebase_dependencies.gradle @@ -17,7 +17,7 @@ import org.gradle.util.ConfigureUtil; // A map of library to the dependencies that need to be added for it. def firebaseDependenciesMap = [ 'app' : ['com.google.firebase:firebase-analytics:19.0.0'], - 'admob' : ['com.google.firebase:firebase-ads:19.8.0', + 'admob' : ['com.google.firebase:firebase-ads:20.2.0', 'com.google.firebase:firebase-analytics:19.0.0', 'com.google.android.gms:play-services-base:17.6.0'], 'analytics' : ['com.google.firebase:firebase-analytics:19.0.0', diff --git a/release_build_files/readme.md b/release_build_files/readme.md index bc1fa8df34..2c3b1a7ac4 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -85,7 +85,7 @@ Firebase AdMob | libfirebase_admob.a | | libfirebase_app.a | | com.google.firebase:firebase-analytics:19.0.0 | | (Maven package) -| | com.google.firebase:firebase-ads:19.8.0 +| | com.google.firebase:firebase-ads:20.2.0 | | (Maven package) | | com.google.android.gms:play-services-base:17.6.0 | | (Maven package) @@ -134,7 +134,7 @@ Firebase Messaging | libfirebase_messaging.a | | com.google.firebase:firebase-messaging:22.0.0 | | (Maven package) | | libmessaging_java.jar (Android service) -| | androidx.core:core:1.0.1 (Maven package) +| | androidx.core:core:1.6.0-rc01 (Maven package) Firebase Realtime Database | libfirebase_database.a | | libfirebase_auth.a | | libfirebase_app.a @@ -157,7 +157,7 @@ Firebase Storage | libfirebase_storage.a | | (Maven package) | | com.google.firebase:firebase-storage:20.0.0 | | (Maven package) -| | com.google.firebase:firebase-auth:20.0.4 +| | com.google.firebase:firebase-auth:21.0.1 | | (Maven package) Important: Each version of the Firebase C++ SDK supports specific Firebase @@ -180,46 +180,46 @@ Feature | Required Frameworks and Cocoapods -------------------------- | --------------------------------------- Firebase AdMob | firebase_admob.xcframework | | firebase.xcframework -| | Firebase/Analytics Cocoapod (8.1.1) +| | Firebase/Analytics Cocoapod (8.2.0) | | Google-Mobile-Ads-SDK Cocoapod (7.69.0-cppsdk) Firebase Analytics | firebase_analytics.xcframework | | firebase.xcframework -| | Firebase/Analytics Cocoapod (8.1.1) +| | Firebase/Analytics Cocoapod (8.2.0) Firebase Authentication | firebase_auth.xcframework | | firebase.xcframework -| | Firebase/Auth Cocoapod (8.1.1) +| | Firebase/Auth Cocoapod (8.2.0) Firebase Dynamic Links | firebase_dynamic_links.xcframework | | firebase.xcframework -| | Firebase/DynamicLinks Cocoapod (8.1.1) +| | Firebase/DynamicLinks Cocoapod (8.2.0) Cloud Firestore | firebase_firestore.xcframework | | firebase_auth.xcframework | | firebase.xcframework -| | Firebase/Firestore Cocoapod (8.1.1) -| | Firebase/Auth Cocoapod (8.1.1) +| | Firebase/Firestore Cocoapod (8.2.0) +| | Firebase/Auth Cocoapod (8.2.0) Firebase Functions | firebase_functions.xcframework | | firebase_auth.xcframework (optional) | | firebase.xcframework -| | Firebase/Functions Cocoapod (8.1.1) -| | Firebase/Auth Cocoapod (8.1.1) +| | Firebase/Functions Cocoapod (8.2.0) +| | Firebase/Auth Cocoapod (8.2.0) Firebase Installations | firebase_installations.xcframework | | firebase.xcframework -| | FirebaseInstallations Cocoapod (8.1.1) +| | FirebaseInstallations Cocoapod (8.2.0) Firebase Cloud Messaging | firebase_messaging.xcframework | | firebase.xcframework -| | Firebase/Messaging Cocoapod (8.1.1) +| | Firebase/Messaging Cocoapod (8.2.0) Firebase Realtime Database | firebase_database.xcframework | | firebase_auth.xcframework | | firebase.xcframework -| | Firebase/Database Cocoapod (8.1.1) -| | Firebase/Auth Cocoapod (8.1.1) +| | Firebase/Database Cocoapod (8.2.0) +| | Firebase/Auth Cocoapod (8.2.0) Firebase Remote Config | firebase_remote_config.xcframework | | firebase.xcframework -| | Firebase/RemoteConfig Cocoapod (8.1.1) +| | Firebase/RemoteConfig Cocoapod (8.2.0) Firebase Storage | firebase_storage.xcframework | | firebase_auth.xcframework | | firebase.xcframework -| | Firebase/Storage Cocoapod (8.1.1) -| | Firebase/Auth Cocoapod (8.1.1) +| | Firebase/Storage Cocoapod (8.2.0) +| | Firebase/Auth Cocoapod (8.2.0) Important: Each version of the Firebase C++ SDK supports a specific version of the Firebase iOS SDK. Please ensure that you reference the Cocoapod versions @@ -240,46 +240,46 @@ Feature | Required Libraries and Cocoapods -------------------------- | ----------------------------------------- Firebase AdMob | libfirebase_admob.a | | libfirebase_app.a -| | Firebase/Analytics Cocoapod (8.1.1) +| | Firebase/Analytics Cocoapod (8.2.0) | | Google-Mobile-Ads-SDK Cocoapod (7.69.0-cppsdk) Firebase Analytics | libfirebase_analytics.a | | libfirebase_app.a -| | Firebase/Analytics Cocoapod (8.1.1) +| | Firebase/Analytics Cocoapod (8.2.0) Firebase Authentication | libfirebase_auth.a | | libfirebase_app.a -| | Firebase/Auth Cocoapod (8.1.1) +| | Firebase/Auth Cocoapod (8.2.0) Firebase Dynamic Links | libfirebase_dynamic_links.a | | libfirebase_app.a -| | Firebase/DynamicLinks Cocoapod (8.1.1) +| | Firebase/DynamicLinks Cocoapod (8.2.0) Cloud Firestore | libfirebase_firestore.a | | libfirebase_app.a | | libfirebase_auth.a -| | Firebase/Firestore Cocoapod (8.1.1) -| | Firebase/Auth Cocoapod (8.1.1) +| | Firebase/Firestore Cocoapod (8.2.0) +| | Firebase/Auth Cocoapod (8.2.0) Firebase Functions | libfirebase_functions.a | | libfirebase_app.a | | libfirebase_auth.a (optional) -| | Firebase/Functions Cocoapod (8.1.1) -| | Firebase/Auth Cocoapod (8.1.1) +| | Firebase/Functions Cocoapod (8.2.0) +| | Firebase/Auth Cocoapod (8.2.0) Firebase Installations | libfirebase_installations.a | | libfirebase_app.a -| | FirebaseInstallations Cocoapod (8.1.1) +| | FirebaseInstallations Cocoapod (8.2.0) Firebase Cloud Messaging | libfirebase_messaging.a | | libfirebase_app.a | | Firebase/CloudMessaging Cocoapod (8.1.1) Firebase Realtime Database | libfirebase_database.a | | libfirebase_app.a | | libfirebase_auth.a -| | Firebase/Database Cocoapod (8.1.1) -| | Firebase/Auth Cocoapod (8.1.1) +| | Firebase/Database Cocoapod (8.2.0) +| | Firebase/Auth Cocoapod (8.2.0) Firebase Remote Config | libfirebase_remote_config.a | | libfirebase_app.a -| | Firebase/RemoteConfig Cocoapod (8.1.1) +| | Firebase/RemoteConfig Cocoapod (8.2.0) Firebase Storage | libfirebase_storage.a | | libfirebase_app.a | | libfirebase_auth.a -| | Firebase/Storage Cocoapod (8.1.1) -| | Firebase/Auth Cocoapod (8.1.1) +| | Firebase/Storage Cocoapod (8.2.0) +| | Firebase/Auth Cocoapod (8.2.0) Important: Each version of the Firebase C++ SDK supports a specific version of the Firebase iOS SDK. Please ensure that you reference the Cocoapod versions diff --git a/remote_config/integration_test/Podfile b/remote_config/integration_test/Podfile index dc7ac987de..2b37d40cd4 100644 --- a/remote_config/integration_test/Podfile +++ b/remote_config/integration_test/Podfile @@ -4,12 +4,12 @@ source 'https://github.com/CocoaPods/Specs.git' target 'integration_test' do platform :ios, '10.0' - pod 'Firebase/RemoteConfig', '8.1.1' + pod 'Firebase/RemoteConfig', '8.2.0' end target 'integration_test_tvos' do platform :tvos, '10.0' - pod 'Firebase/RemoteConfig', '8.1.1' + pod 'Firebase/RemoteConfig', '8.2.0' end post_install do |installer| diff --git a/scripts/gha/integration_testing/gameloop_android/app/build.gradle b/scripts/gha/integration_testing/gameloop_android/app/build.gradle index 7ca0c31d84..e04904477a 100644 --- a/scripts/gha/integration_testing/gameloop_android/app/build.gradle +++ b/scripts/gha/integration_testing/gameloop_android/app/build.gradle @@ -25,9 +25,9 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.1.0' - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.core:core-ktx:1.6.0-rc01' + implementation 'androidx.appcompat:appcompat:1.4.0-alpha02' + implementation 'androidx.constraintlayout:constraintlayout:2.1.0-beta02' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' diff --git a/storage/integration_test/Podfile b/storage/integration_test/Podfile index 41990ff460..d266066f58 100644 --- a/storage/integration_test/Podfile +++ b/storage/integration_test/Podfile @@ -4,14 +4,14 @@ source 'https://github.com/CocoaPods/Specs.git' target 'integration_test' do platform :ios, '10.0' - pod 'Firebase/Storage', '8.1.1' - pod 'Firebase/Auth', '8.1.1' + pod 'Firebase/Storage', '8.2.0' + pod 'Firebase/Auth', '8.2.0' end target 'integration_test_tvos' do platform :tvos, '10.0' - pod 'Firebase/Storage', '8.1.1' - pod 'Firebase/Auth', '8.1.1' + pod 'Firebase/Storage', '8.2.0' + pod 'Firebase/Auth', '8.2.0' end post_install do |installer| From b9cbfcf0ec6b93d1cbd71cbb0a6a91103ba9c0b3 Mon Sep 17 00:00:00 2001 From: Vimanyu Date: Mon, 28 Jun 2021 18:47:53 -0700 Subject: [PATCH 2/2] pinning Ads SDK version --- Android/firebase_dependencies.gradle | 2 +- admob/admob_resources/build.gradle | 2 +- admob/integration_test/Podfile | 2 +- ios_pod/Podfile | 2 +- release_build_files/Android/firebase_dependencies.gradle | 2 +- release_build_files/readme.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle index 7289149d63..2d1a47da0d 100644 --- a/Android/firebase_dependencies.gradle +++ b/Android/firebase_dependencies.gradle @@ -17,7 +17,7 @@ import org.gradle.util.ConfigureUtil; // A map of library to the dependencies that need to be added for it. def firebaseDependenciesMap = [ 'app' : ['com.google.firebase:firebase-analytics:19.0.0'], - 'admob' : ['com.google.firebase:firebase-ads:20.2.0', + 'admob' : ['com.google.firebase:firebase-ads:19.8.0', 'com.google.firebase:firebase-analytics:19.0.0', 'com.google.android.gms:play-services-base:17.6.0'], 'analytics' : ['com.google.firebase:firebase-analytics:19.0.0', diff --git a/admob/admob_resources/build.gradle b/admob/admob_resources/build.gradle index 8c9e8ff1d1..ed33436bb0 100644 --- a/admob/admob_resources/build.gradle +++ b/admob/admob_resources/build.gradle @@ -46,7 +46,7 @@ android { dependencies { implementation 'com.google.firebase:firebase-analytics:19.0.0' - implementation 'com.google.firebase:firebase-ads:20.2.0' + implementation 'com.google.firebase:firebase-ads:19.8.0' } afterEvaluate { diff --git a/admob/integration_test/Podfile b/admob/integration_test/Podfile index acd78e90b3..44134c17f8 100644 --- a/admob/integration_test/Podfile +++ b/admob/integration_test/Podfile @@ -4,7 +4,7 @@ platform :ios, '10.0' target 'integration_test' do pod 'Firebase/Analytics', '8.2.0' - pod 'Google-Mobile-Ads-SDK', '8.7.0' + pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk' end post_install do |installer| diff --git a/ios_pod/Podfile b/ios_pod/Podfile index 9b9e90ff88..c7f3ff5805 100644 --- a/ios_pod/Podfile +++ b/ios_pod/Podfile @@ -4,7 +4,7 @@ platform :ios, '10.0' target 'GetPods' do pod 'Firebase/Core', '8.2.0' - pod 'Google-Mobile-Ads-SDK', '8.7.0' + pod 'Google-Mobile-Ads-SDK', '7.69.0-cppsdk' pod 'Firebase/Analytics', '8.2.0' pod 'Firebase/Auth', '8.2.0' pod 'Firebase/Crashlytics', '8.2.0' diff --git a/release_build_files/Android/firebase_dependencies.gradle b/release_build_files/Android/firebase_dependencies.gradle index 1c6879e629..965dcfead0 100644 --- a/release_build_files/Android/firebase_dependencies.gradle +++ b/release_build_files/Android/firebase_dependencies.gradle @@ -17,7 +17,7 @@ import org.gradle.util.ConfigureUtil; // A map of library to the dependencies that need to be added for it. def firebaseDependenciesMap = [ 'app' : ['com.google.firebase:firebase-analytics:19.0.0'], - 'admob' : ['com.google.firebase:firebase-ads:20.2.0', + 'admob' : ['com.google.firebase:firebase-ads:19.8.0', 'com.google.firebase:firebase-analytics:19.0.0', 'com.google.android.gms:play-services-base:17.6.0'], 'analytics' : ['com.google.firebase:firebase-analytics:19.0.0', diff --git a/release_build_files/readme.md b/release_build_files/readme.md index 2c3b1a7ac4..982d91b002 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -85,7 +85,7 @@ Firebase AdMob | libfirebase_admob.a | | libfirebase_app.a | | com.google.firebase:firebase-analytics:19.0.0 | | (Maven package) -| | com.google.firebase:firebase-ads:20.2.0 +| | com.google.firebase:firebase-ads:19.8.0 | | (Maven package) | | com.google.android.gms:play-services-base:17.6.0 | | (Maven package)