Master->Dev Update

.github/workflows/cpp-packaging.yml

@@ -0,0 +1,14 @@
+name: C++ binary SDK packaging
+
+on:
+  workflow_dispatch:
+    inputs:
+      commitId:
+        description: 'commit ID to package'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: noop
+        run: true

Android/firebase_dependencies.gradle

@@ -16,22 +16,22 @@ 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:17.4.1'],
-  'admob' : ['com.google.firebase:firebase-ads:19.1.0',
-             'com.google.android.gms:play-services-measurement-sdk-api:17.4.1'],
-  'analytics' : ['com.google.firebase:firebase-analytics:17.4.1'],
-  'auth' : ['com.google.firebase:firebase-auth:19.3.1'],
-  'database' : ['com.google.firebase:firebase-database:19.3.0'],
+  'app' : ['com.google.firebase:firebase-analytics:17.4.4'],
+  'admob' : ['com.google.firebase:firebase-ads:19.2.0',
+             'com.google.android.gms:play-services-measurement-sdk-api:17.4.4'],
+  'analytics' : ['com.google.firebase:firebase-analytics:17.4.4'],
+  'auth' : ['com.google.firebase:firebase-auth:19.3.2'],
+  'database' : ['com.google.firebase:firebase-database:19.3.1'],
   'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:19.1.0'],
-  'firestore' : ['com.google.firebase:firebase-firestore:21.4.3'],
+  'firestore' : ['com.google.firebase:firebase-firestore:21.5.0'],
   'functions' : ['com.google.firebase:firebase-functions:19.0.2'],
-  'instance_id' : ['com.google.firebase:firebase-iid:20.1.7'],
+  'instance_id' : ['com.google.firebase:firebase-iid:20.2.3'],
   'invites' : ['com.google.firebase:firebase-invites:17.0.0'],
   // Messaging has an additional local dependency to include.
-  'messaging' : ['com.google.firebase:firebase-messaging:20.1.7',
+  'messaging' : ['com.google.firebase:firebase-messaging:20.2.3',
                  'firebase_cpp_sdk.messaging:messaging_java'],
   'performance' : ['com.google.firebase:firebase-perf:19.0.7'],
-  'remote_config' : ['com.google.firebase:firebase-config:19.1.4'],
+  'remote_config' : ['com.google.firebase:firebase-config:19.2.0'],
   'storage' : ['com.google.firebase:firebase-storage:19.1.1']
 ]
 

admob/admob_resources/build.gradle

@@ -45,8 +45,8 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:17.4.1'
-  implementation 'com.google.firebase:firebase-ads:19.1.0'
+  implementation 'com.google.firebase:firebase-analytics:17.4.4'
+  implementation 'com.google.firebase:firebase-ads:19.2.0'
 }
 
 afterEvaluate {

admob/tools/ios/testapp/README.md

@@ -0,0 +1,57 @@
+Firebase AdMob iOS Test App
+===========================
+
+The Firebase AdMob iOS test app is designed to enable implementing, modifying,
+and debugging API features directly in Xcode.
+
+Getting Started
+---------------
+
+- Get the code:
+
+        git5 init
+        git5-track-p4-depot-paths //depot_firebase_cpp/admob/client/cpp/tools/ios/testapp/p4_depot_paths
+        git5 sync
+
+- Create the following symlinks (DO NOT check these in to google3 -- they should be added to your
+  .gitignore):
+
+    NOTE: Firebase changed their includes from `include` to `src/include`.
+    These soft links work around the issue.
+
+        GOOGLE3_PATH=~/path/to/git5/repo/google3 # Change to your google3 path
+        ln -s $GOOGLE3_PATH/firebase/app/client/cpp/src/include/ $GOOGLE3_PATH/firebase/app/client/cpp/include
+        ln -s $GOOGLE3_PATH/firebase/admob/client/cpp/src/include/ $GOOGLE3_PATH/firebase/admob/client/cpp/include
+
+Setting up the App
+------------------
+
+- In Project Navigator, add the GoogleMobileAds.framework to the Frameworks
+  testapp project.
+- Update the following files:
+   - google3/firebase/admob/client/cpp/src/common/admob_common.cc
+     - Comment out the following code:
+
+                /*
+                FIREBASE_APP_REGISTER_CALLBACKS(admob,
+                                                {
+                                                  if (app == ::firebase::App::GetInstance()) {
+                                                    return firebase::admob::Initialize(*app);
+                                                  }
+                                                  return kInitResultSuccess;
+                                                },
+                                                {
+                                                  if (app == ::firebase::App::GetInstance()) {
+                                                    firebase::admob::Terminate();
+                                                  }
+                                                });
+                */
+
+   - google3/firebase/admob/client/cpp/src/include/firebase/admob.h
+     - Comment out the following code:
+
+                /*
+                #if !defined(DOXYGEN) && !defined(SWIG)
+                FIREBASE_APP_REGISTER_CALLBACKS_REFERENCE(admob)
+                #endif  // !defined(DOXYGEN) && !defined(SWIG)
+                */

admob/tools/ios/testapp/p4_depot_paths

@@ -0,0 +1,7 @@
+# Run the following command to git5 track the required directories for the
+# Firebase-AdMob iOS test app:
+#
+#   $ git5-track-p4-depot-paths //depot_firebase_cpp/admob/client/cpp/tools/ios/testapp/p4_depot_paths
+
+//depot_firebase_cpp/app/...
+//depot_firebase_cpp/admob/...