Merge branch 'main' into fie-quota-retry

Author: welishr

.github/workflows/check-vertexai-responses.yml

@@ -0,0 +1,40 @@
+name: Check Vertex AI Responses
+
+on: pull_request
+
+jobs:
+  check-version:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Clone mock responses
+        run: firebase-vertexai/update_responses.sh
+      - name: Find cloned and latest versions
+        run: |
+          CLONED=$(git describe --tags)
+          LATEST=$(git tag --sort=v:refname | tail -n1)
+          echo "cloned_tag=$CLONED" >> $GITHUB_ENV
+          echo "latest_tag=$LATEST" >> $GITHUB_ENV
+        working-directory: firebase-vertexai/src/test/resources/vertexai-sdk-test-data
+      - name: Find comment from previous run if exists
+        uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e
+        id: fc
+        with:
+          issue-number: ${{github.event.number}}
+          body-includes: Vertex AI Mock Responses Check
+      - name: Comment on PR if newer version is available
+        if: ${{env.cloned_tag != env.latest_tag && !steps.fc.outputs.comment-id}}
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043
+        with:
+          issue-number: ${{github.event.number}}
+          body: >
+            ### Vertex AI Mock Responses Check :warning:
+            
+            A newer major version of the mock responses for Vertex AI unit tests is available.
+            [update_responses.sh](https://github.com/firebase/firebase-android-sdk/blob/main/firebase-vertexai/update_responses.sh)
+            should be updated to clone the latest version of the responses: `${{env.latest_tag}}`
+      - name: Delete comment when version gets updated
+        if: ${{env.cloned_tag == env.latest_tag && steps.fc.outputs.comment-id}}
+        uses: detomarco/delete-comment@850734dd44d8b15fef55b45252613b903ceb06f0
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}

.github/workflows/check_format.yml

@@ -0,0 +1,73 @@
+name: Check Format
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  determine_changed:
+    name: "Determine changed modules"
+    runs-on: ubuntu-22.04
+    if: (github.repository == 'Firebase/firebase-android-sdk' && github.event_name == 'push') || github.event_name == 'pull_request'
+    outputs:
+      modules: ${{ steps.changed-modules.outputs.modules }}
+    steps:
+      - uses: actions/[email protected]
+        with:
+          fetch-depth: 2
+          submodules: true
+
+      - name: Set up JDK 17
+        uses: actions/[email protected]
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+
+      - id: changed-modules
+        run: |
+          git diff --name-only HEAD~1 | xargs printf -- '--changed-git-paths %s\n' | xargs ./gradlew writeChangedProjects --output-file-path=modules.json
+          echo modules=$(cat modules.json) >> $GITHUB_OUTPUT
+
+  check_format:
+    name: "Check Format"
+    runs-on: ubuntu-22.04
+    needs:
+      - determine_changed
+    strategy:
+      fail-fast: false
+      matrix:
+        module: ${{ fromJSON(needs.determine_changed.outputs.modules) }}
+
+    steps:
+      - uses: actions/[email protected]
+        with:
+          fetch-depth: 2
+          submodules: true
+
+      - name: Set up JDK 17
+        uses: actions/[email protected]
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+
+      - name: ${{ matrix.module }} Check Format
+        run: |
+          ./gradlew ${{matrix.module}}:spotlessCheck
+
+  # A job that fails if any job in the check_format matrix fails,
+  # to be used as a required check for merging.
+  check_all:
+    runs-on: ubuntu-22.04
+    if: always()
+    name: Check Format (matrix)
+    needs: check_format
+    steps:
+      - name: Check matrix
+        if: needs.check_format.result != 'success'
+        run: exit 1

.github/workflows/post_release_cleanup.yml

@@ -28,6 +28,9 @@ jobs:
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v4
         with:
+          token: ${{ secrets.GOOGLE_OSS_BOT_TOKEN }}
+          committer: google-oss-bot <[email protected]>
+          assignees: ${{ github.actor }}
           base: 'main'
           branch: 'releases/${{ inputs.name }}.mergeback'
           add-paths: |

README.md

@@ -217,21 +217,11 @@ your app module's build.gradle.
 
 ### Code Formatting
 
-#### Java
+Java and Kotlin are both formatted using `spotless`.
 
-N/A for now
-
-
-#### Kotlin
-
-Kotlin code in this repo is formatted with the `ktfmt` tool. You can enable
-this formatting in Android Studio by downloading and installing the
-[ktfmt plugin](https://plugins.jetbrains.com/plugin/14912-ktfmt).
-Enable the plugin in Preferences | Editor | ktfmt Settings. and set code style to Google (internal).
-
-To run formatting on your entire project you can run
+To run formatting on a project, run
 ```bash
-./gradlew :<firebase-project>:ktfmtFormat
+./gradlew :<firebase-project>:spotlessApply
 ```
 
 ### Contributing

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/NetworkClient.java

@@ -212,6 +212,7 @@ String getHeartBeat() {
       return null;
     }
   }
+
   /** Gets the Android package's SHA-1 fingerprint. */
   private String getFingerprintHashForPackage() {
     byte[] hash;

build.gradle

@@ -29,16 +29,18 @@ buildscript {
                 artifact()
             }
         }
-
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
     }
 
     dependencies {
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:3.1.0'
         classpath 'com.google.gms:google-services:4.3.15'
-        classpath "com.ncorti.ktfmt.gradle:plugin:0.11.0"
         classpath 'com.google.firebase:firebase-appdistribution-gradle:5.0.0'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
+        classpath "com.diffplug.spotless:spotless-plugin-gradle:7.0.0.BETA1"
     }
 }
 
@@ -83,10 +85,17 @@ configure(subprojects) {
         }
     }
 
-    apply plugin: "com.ncorti.ktfmt.gradle"
+    apply plugin: "com.diffplug.spotless"
 
-    ktfmt {
-        googleStyle()
+    spotless {
+        java {
+            target 'src/**/*.java'
+            googleJavaFormat('1.22.0').reorderImports(false).skipJavadocFormatting()
+        }
+        kotlin {
+            target 'src/**/*.kt'
+            ktfmt('0.41').googleStyle()
+        }
     }
 }
 

encoders/firebase-encoders-processor/src/test/resources/ExpectedAtEmptyAnnotation.java

@@ -14,19 +14,14 @@
 
 package com.example;
 
-import java.lang.Class;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.String;
 import java.lang.annotation.Annotation;
 
 public final class AtEmptyAnnotation {
   private static final AtEmptyAnnotation BUILDER = new AtEmptyAnnotation();
 
   private static final EmptyAnnotation INSTANCE = new EmptyAnnotationImpl();
 
-  private AtEmptyAnnotation() {
-  }
+  private AtEmptyAnnotation() {}
 
   public static AtEmptyAnnotation builder() {
     return BUILDER;
@@ -37,8 +32,7 @@ public EmptyAnnotation build() {
   }
 
   private static final class EmptyAnnotationImpl implements EmptyAnnotation {
-    EmptyAnnotationImpl() {
-    }
+    EmptyAnnotationImpl() {}
 
     @Override
     public Class<? extends Annotation> annotationType() {
@@ -65,4 +59,4 @@ public String toString() {
       return sb.toString();
     }
   }
-}
+}

encoders/firebase-encoders-processor/src/test/resources/ExpectedAtMyAnnotation.java

@@ -14,10 +14,6 @@
 
 package com.example;
 
-import java.lang.Class;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.String;
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
 
@@ -90,7 +86,8 @@ public static AtMyAnnotation builder() {
   }
 
   public MyAnnotation build() {
-    return new MyAnnotationImpl(intVal, longVal, boolVal, shortVal, floatVal, doubleVal, doubleArrayVal, strVal, enumVal);
+    return new MyAnnotationImpl(
+        intVal, longVal, boolVal, shortVal, floatVal, doubleVal, doubleArrayVal, strVal, enumVal);
   }
 
   private static final class MyAnnotationImpl implements MyAnnotation {
@@ -112,8 +109,16 @@ private static final class MyAnnotationImpl implements MyAnnotation {
 
     private final MyAnnotation.MyEnum enumVal;
 
-    MyAnnotationImpl(int intVal, long longVal, boolean boolVal, short shortVal, float floatVal,
-        double doubleVal, double[] doubleArrayVal, String strVal, MyAnnotation.MyEnum enumVal) {
+    MyAnnotationImpl(
+        int intVal,
+        long longVal,
+        boolean boolVal,
+        short shortVal,
+        float floatVal,
+        double doubleVal,
+        double[] doubleArrayVal,
+        String strVal,
+        MyAnnotation.MyEnum enumVal) {
       this.intVal = intVal;
       this.longVal = longVal;
       this.boolVal = boolVal;
@@ -195,16 +200,18 @@ public boolean equals(Object other) {
 
     @Override
     public int hashCode() {
-      return + (-15901618 ^ ((int)intVal))
-          + (1338661755 ^ ((int)(longVal ^ (longVal >>> 32))))
+      return +(-15901618 ^ ((int) intVal))
+          + (1338661755 ^ ((int) (longVal ^ (longVal >>> 32))))
           + (-373377111 ^ (boolVal ? 1231 : 1237))
-          + (-549529221 ^ ((int)shortVal))
+          + (-549529221 ^ ((int) shortVal))
           + (1880085339 ^ (Float.floatToIntBits(floatVal)))
-          + (696767088 ^ ((int) ((Double.doubleToLongBits(doubleVal) >>> 32) ^ Double.doubleToLongBits(doubleVal))))
+          + (696767088
+              ^ ((int)
+                  ((Double.doubleToLongBits(doubleVal) >>> 32)
+                      ^ Double.doubleToLongBits(doubleVal))))
           + (-1932334201 ^ Arrays.hashCode(doubleArrayVal))
           + (-1615429424 ^ strVal.hashCode())
-          + (-170319456 ^ enumVal.hashCode())
-          ;
+          + (-170319456 ^ enumVal.hashCode());
     }
 
     @Override