Update C++ SDK version to 7.2.0, and dependencies to M93. (#363)

jonsimantov · web-flow · commit 1f03fab24807 · 2021-04-12T12:10:15.000-07:00
* Change Podfile versions to 7.10.0.
* Update Android dependencies.
* Update C++ SDK version to 7.2.0.
* Update Firestore dependency to 7.10.0 cocoapod as well.
diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle
@@ -16,30 +16,30 @@ 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:18.0.2'],
-  'admob' : ['com.google.firebase:firebase-ads:19.7.0',
-             'com.google.android.gms:play-services-measurement-sdk-api:18.0.2',
+  'app' : ['com.google.firebase:firebase-analytics:18.0.3'],
+  'admob' : ['com.google.firebase:firebase-ads:20.0.0',
+             'com.google.android.gms:play-services-measurement-sdk-api:18.0.3',
              'com.google.android.gms:play-services-base:17.6.0'],
-  'analytics' : ['com.google.firebase:firebase-analytics:18.0.2',
+  'analytics' : ['com.google.firebase:firebase-analytics:18.0.3',
                  'com.google.android.gms:play-services-base:17.6.0'],
-  'auth' : ['com.google.firebase:firebase-auth:20.0.2'],
-  'database' : ['com.google.firebase:firebase-database:19.6.0'],
+  'auth' : ['com.google.firebase:firebase-auth:20.0.4'],
+  'database' : ['com.google.firebase:firebase-database:19.7.0'],
   'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:19.1.1'],
-  'firestore' : ['com.google.firebase:firebase-firestore:22.0.2'],
+  'firestore' : ['com.google.firebase:firebase-firestore:22.1.2'],
   'functions' : ['com.google.firebase:firebase-functions:19.2.0'],
   'installations' : ['com.google.firebase:firebase-installations:16.3.5',
                      'com.google.android.gms:play-services-base:17.6.0'],
-  'instance_id' : ['com.google.firebase:firebase-iid:21.0.1'],
+  'instance_id' : ['com.google.firebase:firebase-iid:21.1.0'],
   'invites' : ['com.google.firebase:firebase-invites:17.0.0'],
   // Messaging has an additional local dependency to include.
-  'messaging' : ['com.google.firebase:firebase-messaging:21.0.1',
+  'messaging' : ['com.google.firebase:firebase-messaging:21.1.0',
                  'firebase_cpp_sdk.messaging:messaging_java',
-                 'androidx.core:core:1.0.1',
+                 'androidx.core:core:1.0.2',
                  'com.google.flatbuffers:flatbuffers-java:1.9.0'],
-  'performance' : ['com.google.firebase:firebase-perf:19.1.0'],
-  'remote_config' : ['com.google.firebase:firebase-config:20.0.3',
+  'performance' : ['com.google.firebase:firebase-perf:19.1.1'],
+  'remote_config' : ['com.google.firebase:firebase-config:20.0.4',
                      'com.google.android.gms:play-services-base:17.6.0'],
-  'storage' : ['com.google.firebase:firebase-storage:19.2.1']
+  'storage' : ['com.google.firebase:firebase-storage:19.2.2']
 ]
 
 // A map of library to the gradle resources that they depend upon.
diff --git a/admob/integration_test/Podfile b/admob/integration_test/Podfile
@@ -4,7 +4,7 @@ platform :ios, '10.0'
 # Firebase AdMob test application.
 
 target 'integration_test' do
-  pod 'Firebase/AdMob', '7.5.0'
+  pod 'Firebase/AdMob', '7.10.0'
 end
 
 post_install do |installer|
diff --git 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', '7.5.0'
+  pod 'Firebase/Analytics', '7.10.0'
 end
 
 post_install do |installer|
diff --git 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', '7.5.0'
+  pod 'Firebase/Analytics', '7.10.0'
 end
 
 post_install do |installer|
diff --git a/auth/integration_test/Podfile b/auth/integration_test/Podfile
@@ -4,7 +4,7 @@ platform :ios, '10.0'
 # Firebase Auth test application.
 
 target 'integration_test' do
-  pod 'Firebase/Auth', '7.5.0'
+  pod 'Firebase/Auth', '7.10.0'
 end
 
 post_install do |installer|
diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
@@ -18,7 +18,7 @@ if(TARGET firestore)
   return()
 endif()
 
-set(version 5f6febab5e133960ca8fc6d2639ea460253bc43a)
+set(version CocoaPods-7.10.0)
 ExternalProject_Add(
   firestore
 
diff --git a/cpp_sdk_version.json b/cpp_sdk_version.json
@@ -1,5 +1,5 @@
 {
-  "released": "7.1.0",
-  "stable": "7.1.0",
-  "head": "7.1.0"
+  "released": "7.2.0",
+  "stable": "7.2.0",
+  "head": "7.2.0"
 }
diff --git a/database/integration_test/Podfile b/database/integration_test/Podfile
@@ -4,8 +4,8 @@ platform :ios, '10.0'
 # Firebase Realtime Database test application.
 
 target 'integration_test' do
-  pod 'Firebase/Database', '7.5.0'
-  pod 'Firebase/Auth', '7.5.0'
+  pod 'Firebase/Database', '7.10.0'
+  pod 'Firebase/Auth', '7.10.0'
 end
 
 post_install do |installer|
diff --git 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', '7.5.0'
+  pod 'Firebase/DynamicLinks', '7.10.0'
 end
 
 post_install do |installer|
diff --git a/firestore/integration_test/Podfile b/firestore/integration_test/Podfile
@@ -4,8 +4,8 @@ platform :ios, '10.0'
 # Firebase Realtime Firestore test application.
 
 target 'integration_test' do
-  pod 'Firebase/Firestore', '7.5.0'
-  pod 'Firebase/Auth', '7.5.0'
+  pod 'Firebase/Firestore', '7.10.0'
+  pod 'Firebase/Auth', '7.10.0'
 end
 
 post_install do |installer|
diff --git a/firestore/integration_test_internal/Podfile b/firestore/integration_test_internal/Podfile
@@ -3,8 +3,8 @@ platform :ios, '10.0'
 # Cloud Firestore internal test application.
 
 target 'integration_test' do
-  pod 'Firebase/Firestore', '7.5.0'
-  pod 'Firebase/Auth', '7.5.0'
+  pod 'Firebase/Firestore', '7.10.0'
+  pod 'Firebase/Auth', '7.10.0'
 end
 
 post_install do |installer|
diff --git a/functions/integration_test/Podfile b/functions/integration_test/Podfile
@@ -4,8 +4,8 @@ platform :ios, '10.0'
 # Cloud Functions for Firebase test application.
 
 target 'integration_test' do
-  pod 'Firebase/Functions', '7.5.0'
-  pod 'Firebase/Auth', '7.5.0'
+  pod 'Firebase/Functions', '7.10.0'
+  pod 'Firebase/Auth', '7.10.0'
 end
 
 post_install do |installer|
diff --git 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', '7.5.0'
-  pod 'Firebase/Installations', '7.5.0'
+  pod 'Firebase/Analytics', '7.10.0'
+  pod 'Firebase/Installations', '7.10.0'
 end
 
 post_install do |installer|
diff --git a/instance_id/integration_test/Podfile b/instance_id/integration_test/Podfile
@@ -4,8 +4,8 @@ platform :ios, '10.0'
 # Firebase Instance ID test application.
 
 target 'integration_test' do
-  pod 'Firebase/Analytics', '7.5.0'
-  pod 'FirebaseInstanceID', '7.5.0'
+  pod 'Firebase/Analytics', '7.10.0'
+  pod 'FirebaseInstanceID', '7.10.0'
 end
 
 post_install do |installer|
diff --git a/ios_pod/Podfile b/ios_pod/Podfile
@@ -2,20 +2,20 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '10.0'
 
 target 'GetPods' do
-  pod 'Firebase/Core', '7.5.0'
+  pod 'Firebase/Core', '7.10.0'
 
-  pod 'Firebase/AdMob', '7.5.0'
-  pod 'Firebase/Analytics', '7.5.0'
-  pod 'Firebase/Auth', '7.5.0'
-  pod 'Firebase/Database', '7.5.0'
-  pod 'Firebase/DynamicLinks', '7.5.0'
-  pod 'Firebase/Firestore', '7.5.0'
-  pod 'Firebase/Functions', '7.5.0'
-  pod 'Firebase/Installations', '7.5.0'
-  pod 'FirebaseInstanceID', '7.5.0'
-  pod 'Firebase/Messaging', '7.5.0'
-  pod 'Firebase/RemoteConfig', '7.5.0'
-  pod 'Firebase/Storage', '7.5.0'
+  pod 'Firebase/AdMob', '7.10.0'
+  pod 'Firebase/Analytics', '7.10.0'
+  pod 'Firebase/Auth', '7.10.0'
+  pod 'Firebase/Database', '7.10.0'
+  pod 'Firebase/DynamicLinks', '7.10.0'
+  pod 'Firebase/Firestore', '7.10.0'
+  pod 'Firebase/Functions', '7.10.0'
+  pod 'Firebase/Installations', '7.10.0'
+  pod 'FirebaseInstanceID', '7.10.0'
+  pod 'Firebase/Messaging', '7.10.0'
+  pod 'Firebase/RemoteConfig', '7.10.0'
+  pod 'Firebase/Storage', '7.10.0'
 
   pod 'Crashlytics', '3.14.0'
 end
diff --git 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', '7.5.0'
+  pod 'Firebase/Messaging', '7.10.0'
 end
 
 post_install do |installer|
diff --git a/release_build_files/Android/firebase_dependencies.gradle b/release_build_files/Android/firebase_dependencies.gradle
@@ -16,29 +16,30 @@ 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:18.0.2'],
-  'admob' : ['com.google.firebase:firebase-ads:19.7.0',
-             'com.google.android.gms:play-services-measurement-sdk-api:18.0.2',
+  'app' : ['com.google.firebase:firebase-analytics:18.0.3'],
+  'admob' : ['com.google.firebase:firebase-ads:20.0.0',
+             'com.google.android.gms:play-services-measurement-sdk-api:18.0.3',
              'com.google.android.gms:play-services-base:17.6.0'],
-  'analytics' : ['com.google.firebase:firebase-analytics:18.0.2',
+  'analytics' : ['com.google.firebase:firebase-analytics:18.0.3',
                  'com.google.android.gms:play-services-base:17.6.0'],
-  'auth' : ['com.google.firebase:firebase-auth:20.0.2'],
-  'database' : ['com.google.firebase:firebase-database:19.6.0'],
+  'auth' : ['com.google.firebase:firebase-auth:20.0.4'],
+  'database' : ['com.google.firebase:firebase-database:19.7.0'],
   'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:19.1.1'],
-  'firestore' : ['com.google.firebase:firebase-firestore:22.0.2'],
+  'firestore' : ['com.google.firebase:firebase-firestore:22.1.2'],
   'functions' : ['com.google.firebase:firebase-functions:19.2.0'],
   'installations' : ['com.google.firebase:firebase-installations:16.3.5',
                      'com.google.android.gms:play-services-base:17.6.0'],
-  'instance_id' : ['com.google.firebase:firebase-iid:21.0.1'],
+  'instance_id' : ['com.google.firebase:firebase-iid:21.1.0'],
   'invites' : ['com.google.firebase:firebase-invites:17.0.0'],
-  'messaging' : ['com.google.firebase.messaging.cpp:firebase_messaging_cpp@aar',
-                 'com.google.firebase:firebase-messaging:21.0.1',
-                 'androidx.core:core:1.0.1',
+  // Messaging has an additional local dependency to include.
+  'messaging' : ['com.google.firebase:firebase-messaging:21.1.0',
+                 'com.google.firebase.messaging.cpp:firebase_messaging_cpp@aar',
+                 'androidx.core:core:1.0.2',
                  'com.google.flatbuffers:flatbuffers-java:1.9.0'],
   'performance' : ['com.google.firebase:firebase-perf:19.1.0'],
-  'remote_config' : ['com.google.firebase:firebase-config:20.0.3',
+  'remote_config' : ['com.google.firebase:firebase-config:20.0.4',
                      'com.google.android.gms:play-services-base:17.6.0'],
-  'storage' : ['com.google.firebase:firebase-storage:19.2.1'],
+  'storage' : ['com.google.firebase:firebase-storage:19.2.2'],
   'testlab' : []
 ]
 
diff --git a/release_build_files/readme.md b/release_build_files/readme.md
diff --git a/remote_config/integration_test/Podfile b/remote_config/integration_test/Podfile
diff --git a/storage/integration_test/Podfile b/storage/integration_test/Podfile

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "released": "7.1.0",`
`3`		`- "stable": "7.1.0",`
`4`		`- "head": "7.1.0"`
	`2`	`+ "released": "7.2.0",`
	`3`	`+ "stable": "7.2.0",`
	`4`	`+ "head": "7.2.0"`
`5`	`5`	`}`