Merge branch 'main' into bugfix/android-remote-config-specific-app

Author: vimanyu

.clang-format

@@ -1,10 +1 @@
 BasedOnStyle: Google
-Standard: Cpp11
-ColumnLimit: 80
-BinPackParameters: false
-AllowAllParametersOfDeclarationOnNextLine: true
-SpacesInContainerLiterals: true
-DerivePointerAlignment: false
-PointerAlignment: Left
-AllowShortFunctionsOnASingleLine: None
-IncludeBlocks: Preserve

.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

@@ -351,10 +351,10 @@ jobs:
         if: matrix.target_platform == 'Desktop' && !cancelled()
         run: |
           python scripts/gha/desktop_tester.py --testapp_dir ta
-      - name: Run iOS integration tests on Simulator locally
-        if: contains(env.mobileTestOn, 'simulator') && matrix.target_platform == 'iOS' && !cancelled()
+      - name: Run iOS integration tests on iOS Simulator / Android Emulator locally
+        if: contains(env.mobileTestOn, 'simulator') && startsWith(matrix.os, 'macos') && matrix.target_platform != 'Desktop' && !cancelled()
         run: |
-          python scripts/gha/test_simulator.py --testapp_dir ta
+          python scripts/gha/test_simulator.py --testapp_dir ta --ci
       # Workaround for https://github.com/GoogleCloudPlatform/github-actions/issues/100
       # Must be run after the Python setup action
       - name: Set CLOUDSDK_PYTHON (Windows)

.github/workflows/integration_tests.yml

@@ -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

@@ -502,8 +502,8 @@ TEST_F(FirebaseAdMobTest, TestRewardedVideoAd) {
 // Test runs & compiles for phones only.
 
 struct ThreadArgs {
-      firebase::admob::BannerView* banner;
-      sem_t* semaphore;
+  firebase::admob::BannerView* banner;
+  sem_t* semaphore;
 };
 
 static void* DeleteBannerViewOnSignal(void* args) {

admob/integration_test/src/integration_test.cc

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
+#include "admob/src/android/ad_request_converter.h"
+
 #include <assert.h>
 #include <jni.h>
 
 #include <cstdarg>
 #include <cstddef>
 
 #include "admob/admob_resources.h"
-#include "admob/src/android/ad_request_converter.h"
 #include "admob/src/android/admob_android.h"
 #include "admob/src/common/admob_common.h"
 #include "admob/src/include/firebase/admob.h"
@@ -35,7 +36,8 @@ namespace admob {
 static const char* kAdMobAdapterClassName =
     "com/google/ads/mediation/admob/AdMobAdapter";
 
-METHOD_LOOKUP_DEFINITION(ad_request_builder, PROGUARD_KEEP_CLASS
+METHOD_LOOKUP_DEFINITION(ad_request_builder,
+                         PROGUARD_KEEP_CLASS
                          "com/google/android/gms/ads/AdRequest$Builder",
                          ADREQUESTBUILDER_METHODS);
 
@@ -54,18 +56,20 @@ AdRequestConverter::AdRequestConverter(AdRequest request) {
 
   builder = util::ContinueBuilder(
       env, builder,
-      env->CallObjectMethod(builder, ad_request_builder::GetMethodId(
-                                         ad_request_builder::kSetGender),
-                            static_cast<int>(request.gender)));
+      env->CallObjectMethod(
+          builder,
+          ad_request_builder::GetMethodId(ad_request_builder::kSetGender),
+          static_cast<int>(request.gender)));
 
   // Child-drected treatment.
   if (request.tagged_for_child_directed_treatment !=
       kChildDirectedTreatmentStateUnknown) {
     builder = util::ContinueBuilder(
         env, builder,
         env->CallObjectMethod(
-            builder, ad_request_builder::GetMethodId(
-                         ad_request_builder::kTagForChildDirectedTreatment),
+            builder,
+            ad_request_builder::GetMethodId(
+                ad_request_builder::kTagForChildDirectedTreatment),
             (request.tagged_for_child_directed_treatment ==
              kChildDirectedTreatmentStateTagged)));
   }
@@ -75,9 +79,10 @@ AdRequestConverter::AdRequestConverter(AdRequest request) {
     jstring test_device_str = env->NewStringUTF(request.test_device_ids[i]);
     builder = util::ContinueBuilder(
         env, builder,
-        env->CallObjectMethod(builder, ad_request_builder::GetMethodId(
-                                           ad_request_builder::kAddTestDevice),
-                              test_device_str));
+        env->CallObjectMethod(
+            builder,
+            ad_request_builder::GetMethodId(ad_request_builder::kAddTestDevice),
+            test_device_str));
     env->DeleteLocalRef(test_device_str);
   }
 
@@ -86,9 +91,10 @@ AdRequestConverter::AdRequestConverter(AdRequest request) {
     jstring keyword_str = env->NewStringUTF(request.keywords[i]);
     builder = util::ContinueBuilder(
         env, builder,
-        env->CallObjectMethod(builder, ad_request_builder::GetMethodId(
-                                           ad_request_builder::kAddKeyword),
-                              keyword_str));
+        env->CallObjectMethod(
+            builder,
+            ad_request_builder::GetMethodId(ad_request_builder::kAddKeyword),
+            keyword_str));
     env->DeleteLocalRef(keyword_str);
   }
 
@@ -109,9 +115,10 @@ AdRequestConverter::AdRequestConverter(AdRequest request) {
   if (date_ref != nullptr) {
     builder = util::ContinueBuilder(
         env, builder,
-        env->CallObjectMethod(builder, ad_request_builder::GetMethodId(
-                                           ad_request_builder::kSetBirthday),
-                              date_ref));
+        env->CallObjectMethod(
+            builder,
+            ad_request_builder::GetMethodId(ad_request_builder::kSetBirthday),
+            date_ref));
   } else {
     LogWarning(
         "Skipping invalid AdRequest birthday fields (Y: %d, M: %d, D: %d).",
@@ -164,9 +171,10 @@ AdRequestConverter::AdRequestConverter(AdRequest request) {
       env->NewStringUTF(firebase::admob::GetRequestAgentString());
   builder = util::ContinueBuilder(
       env, builder,
-      env->CallObjectMethod(builder, ad_request_builder::GetMethodId(
-                                         ad_request_builder::kSetRequestAgent),
-                            agent_str));
+      env->CallObjectMethod(
+          builder,
+          ad_request_builder::GetMethodId(ad_request_builder::kSetRequestAgent),
+          agent_str));
   env->DeleteLocalRef(agent_str);
 
   // Build request and load ad.

admob/src/android/ad_request_converter.cc

@@ -58,11 +58,9 @@ BannerViewInternalAndroid::BannerViewInternalAndroid(BannerView* base)
   env->DeleteLocalRef(helper_ref);
 }
 
-
-void DestroyOnDeleteCallback(const Future<void>& result,
-                          void* sem_data) {
+void DestroyOnDeleteCallback(const Future<void>& result, void* sem_data) {
   if (sem_data != nullptr) {
-    Semaphore* semaphore =  static_cast<Semaphore*>(sem_data);
+    Semaphore* semaphore = static_cast<Semaphore*>(sem_data);
     semaphore->Post();
   }
 }