Merge branch 'main' into bugfix/optional-query-param-fields

Author: Alex Ames

.github/workflows/check-labels.yml

@@ -0,0 +1,45 @@
+name: Checks
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize, labeled, unlabeled]
+
+env:
+  triggerLabelFull: "tests-requested: full"
+  triggerLabelQuick: "tests-requested: quick"
+  statusLabelInProgress: "tests: in-progress"
+  statusLabelFailed: "tests: failed"
+
+jobs:
+  file_format_check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: false
+      - name: Setup python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      - name: Install prerequisites
+        run: python scripts/gha/install_prereqs_desktop.py
+      - name: log clang format version
+        shell: bash
+        run: clang-format --version
+      - name: git fetch origin main
+        shell: bash
+        run: git fetch origin main
+      - name: Detect Formatting Changes
+        shell: bash
+        run: python3 scripts/format_code.py -git_diff -noformat_file -verbose
+  
+  check_integration_test_labels:
+    # This check fails if integration tests are queued, in progress, or failed.
+    runs-on: ubuntu-latest
+    steps:
+    - uses: docker://agilepathway/pull-request-label-checker:latest
+      with:
+        none_of: "${{ env.statusLabelInProgress }},${{ env.statusLabelFailed }},${{ env.triggerLabelFull }},${{ env.triggerLabelQuick }}"
+        repo_token: ${{ github.token }}
+
+

.github/workflows/checks.yml

@@ -14,7 +14,7 @@ on:
         required: true
       apis:
         description: 'CSV of apis to build and test'
-        default: 'admob,analytics,auth,database,dynamic_links,firestore,functions,installations,instance_id,messaging,remote_config,storage'
+        default: 'admob,analytics,auth,database,dynamic_links,firestore,functions,installations,messaging,remote_config,storage'
         required: true
       operating_systems:
         description: 'CSV of VMs to run on'

.github/workflows/integration_tests.yml

@@ -29,8 +29,6 @@ def firebaseDependenciesMap = [
   '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.1.0',
-                   'com.google.android.gms:play-services-base:17.6.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.1.0',
@@ -95,9 +93,6 @@ class Dependencies {
   def getInstallations() {
     libSet.add('installations')
   }
-  def getInstanceId() {
-    libSet.add('instance_id')
-  }
   def getInvites() {
     libSet.add('invites')
   }

Android/firebase_dependencies.gradle

@@ -48,9 +48,6 @@ option(FIREBASE_INCLUDE_FUNCTIONS
 option(FIREBASE_INCLUDE_INSTALLATIONS
        "Include the Firebase Installations library."
        ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
-option(FIREBASE_INCLUDE_INSTANCE_ID
-       "Include the Firebase Instance ID library."
-       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_MESSAGING
        "Include the Firebase Cloud Messaging library."
        ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
@@ -554,9 +551,6 @@ endif()
 if (FIREBASE_INCLUDE_INSTALLATIONS)
   add_subdirectory(installations)
 endif()
-if (FIREBASE_INCLUDE_INSTANCE_ID)
-  add_subdirectory(instance_id)
-endif()
 if (FIREBASE_INCLUDE_MESSAGING)
   add_subdirectory(messaging)
 endif()

CMakeLists.txt

@@ -118,6 +118,11 @@ Before you submit your pull request consider the following guidelines:
 * Follow our [Coding Rules](#rules).
 * Avoid checking in files that shouldn't be tracked (e.g `.tmp`, `.idea`).
   We recommend using a [global](#global-gitignore) gitignore for this.
+* Format your code:
+     ```shell
+     python3 scripts/format_code.py -git_diff -verbose
+     ```
+
 * Commit your changes using a descriptive commit message.
 
      ```shell

CONTRIBUTING.md

@@ -4,7 +4,7 @@ platform :ios, '10.0'
 # Firebase AdMob test application.
 
 target 'integration_test' do
-  pod 'Firebase/AdMob', '7.10.0'
+  pod 'Firebase/AdMob', '7.11.0'
 end
 
 post_install do |installer|

admob/integration_test/Podfile

@@ -279,7 +279,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -316,7 +316,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

admob/integration_test/integration_test.xcodeproj/project.pbxproj

@@ -4,7 +4,7 @@ platform :ios, '10.0'
 # Firebase Analytics test application.
 
 target 'integration_test' do
-  pod 'Firebase/Analytics', '7.10.0'
+  pod 'Firebase/Analytics', '7.11.0'
 end
 
 post_install do |installer|

analytics/integration_test/Podfile

@@ -236,7 +236,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -273,7 +273,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";