Merge branch 'main' into rl.macrobenchmark.fix.2

Author: rlazo

.github/workflows/private-mirror-sync.yml

@@ -19,6 +19,7 @@ jobs:
           fetch-depth: 0
           submodules: true
           token: ${{ secrets.GOOGLE_OSS_BOT_TOKEN }}
+          committer: google-oss-bot <[email protected]>
       - name: Force push HEAD to private repo main branch
         run: |
           git remote add mirror https://github.com/FirebasePrivate/firebase-android-sdk.git

ci/fireci/fireciplugins/macrobenchmark/commands.py

@@ -173,7 +173,11 @@ def ci(pull_request: bool, changed_modules_file: Path, repeat: int):
   with open(output_path) as output_file:
     output = json.load(output_file)
     project_name = 'test-changed' if pull_request else 'test-all'
-    ftl_dirs = list(filter(lambda x: x['project'] == project_name, output))[0]['successful_runs']
+    ftl_run = list(filter(lambda x: x['project'] == project_name, output))
+    if not ftl_run:
+      logger.warning(f'No output for "{project_name}", ignoring.')
+      return
+    ftl_dirs = ftl_run[0]['successful_runs']
     ftl_bucket_name = 'fireescape-benchmark-results'
 
     log = ci_utils.ci_log_link()

firebase-perf/firebase-perf.gradle

@@ -99,44 +99,43 @@ android {
 }
 
 dependencies {
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.27'
+    annotationProcessor libs.dagger.compiler
     compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6'
-    implementation "androidx.annotation:annotation:1.1.0"
+    implementation libs.androidx.annotation
     implementation "androidx.lifecycle:lifecycle-process:2.3.1"
-    implementation "com.google.android.gms:play-services-tasks:18.0.1"
+    implementation libs.playservices.tasks
     implementation libs.protobuf.java.lite
     implementation libs.kotlin.stdlib
-    implementation 'androidx.annotation:annotation:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.datatransport:transport-api:3.0.0'
-    implementation 'com.google.dagger:dagger:2.27'
+    implementation libs.dagger.dagger
     api 'com.google.firebase:firebase-annotations:16.2.0'
     api 'com.google.firebase:firebase-installations-interop:17.1.0'
     api 'com.google.firebase:protolite-well-known-types:18.0.0'
-    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
+    implementation libs.okhttp
     api("com.google.firebase:firebase-common:21.0.0")
     api("com.google.firebase:firebase-common-ktx:21.0.0")
     api("com.google.firebase:firebase-components:18.0.0")
     api("com.google.firebase:firebase-config:21.5.0")
     api("com.google.firebase:firebase-installations:17.2.0")
     api("com.google.firebase:firebase-sessions:2.0.0") {
-         exclude group: 'com.google.firebase', module: 'firebase-common'
-         exclude group: 'com.google.firebase', module: 'firebase-common-ktx'
-         exclude group: 'com.google.firebase', module: 'firebase-components'
-     }
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-common-ktx'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
     javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
     javadocClasspath libs.findbugs.jsr305
     runtimeOnly("com.google.firebase:firebase-datatransport:18.1.8") {
-         exclude group: 'com.google.firebase', module: 'firebase-common'
-         exclude group: 'com.google.firebase', module: 'firebase-components'
-     }
+        exclude group: 'com.google.firebase', module: 'firebase-common'
+        exclude group: 'com.google.firebase', module: 'firebase-components'
+    }
     testCompileOnly libs.protobuf.java
     testImplementation libs.androidx.test.core
     testImplementation libs.truth
     testImplementation libs.robolectric
-    testImplementation 'androidx.test:rules:1.2.0'
-    testImplementation 'junit:junit:4.12'
+    testImplementation libs.androidx.test.rules
+    testImplementation libs.junit
     testImplementation libs.mockito.core
     testImplementation 'org.mockito:mockito-inline:5.2.0'
     testImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6'
-}
+}