Merge branch 'master' into perfDataCollectionStateForSessions

firebase · Aug 15, 2023 · c2e289a · c2e289a
2 parents 564bcde + da631d2
commit c2e289a
Show file tree

Hide file tree

Showing 90 changed files with 1,584 additions and 133 deletions.
diff --git a/.github/workflows/api-information.yml b/.github/workflows/api-information.yml
@@ -7,7 +7,7 @@ jobs:
     if: github.event.pull_request.head.repo.full_name == github.repository
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 2
           submodules: true

diff --git a/.github/workflows/build-release-artifacts.yml b/.github/workflows/build-release-artifacts.yml
@@ -13,7 +13,7 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3.5.3
 
       - name: Set up JDK 11
         uses: actions/setup-java@v3

diff --git a/.github/workflows/build-src-check.yml b/.github/workflows/build-src-check.yml
@@ -13,7 +13,7 @@ jobs:
   build-src-check:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.5.3
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -13,7 +13,7 @@ jobs:
     env:
       BUNDLE_GEMFILE: ./ci/danger/Gemfile
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v3.5.3
       with:
         fetch-depth: 100
         submodules: true

diff --git a/.github/workflows/check-head-dependencies.yml b/.github/workflows/check-head-dependencies.yml
@@ -10,7 +10,7 @@ jobs:
   check-head-dependencies:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3.5.3
 
       - name: Perform gradle build
         run: |

diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
@@ -16,7 +16,7 @@ jobs:
     outputs:
       modules: ${{ steps.changed-modules.outputs.modules }}
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 2
           submodules: true
@@ -44,7 +44,7 @@ jobs:
         module: ${{ fromJSON(needs.determine_changed.outputs.modules) }}
 
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 2
           submodules: true
@@ -100,7 +100,7 @@ jobs:
         module: ${{ fromJSON(needs.determine_changed.outputs.modules) }}
 
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 2
           submodules: true
@@ -130,6 +130,47 @@ jobs:
         run: |
           ./gradlew ${{matrix.module}}:deviceCheck withErrorProne -PtargetBackend="prod"
 
+  firestore_custom_integ_tests:
+    name: "Firestore Custom Instrumentation Tests Against Named DB"
+    runs-on: ubuntu-22.04
+    needs:
+      - determine_changed
+    # only run on post submit or PRs not originating from forks.
+    if: ((github.repository == 'Firebase/firebase-android-sdk' && github.event_name == 'push') || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)) && contains(fromJSON(needs.determine_changed.outputs.modules), ':firebase-firestore')
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v3.5.3
+        with:
+          fetch-depth: 2
+          submodules: true
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: 11
+          distribution: temurin
+          cache: gradle
+
+      - name: Add google-services.json
+        env:
+          INTEG_TESTS_GOOGLE_SERVICES: ${{ secrets.INTEG_TESTS_GOOGLE_SERVICES }}
+        run: |
+          echo $INTEG_TESTS_GOOGLE_SERVICES | base64 -d > google-services.json
+      - uses: google-github-actions/auth@v0
+        with:
+          credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
+      - uses: google-github-actions/setup-gcloud@v0
+      - name: Firestore Named DB Integ Tests
+        env:
+          FIREBASE_CI: 1
+          FTL_RESULTS_BUCKET: android-ci
+          FTL_RESULTS_DIR: ${{ github.event_name == 'pull_request' && format('pr-logs/pull/{0}/{1}/{2}/{3}_{4}/artifacts/', github.repository, github.event.pull_request.number, github.job, github.run_id, github.run_attempt) || format('logs/{0}/{1}_{2}/artifacts/', github.workflow, github.run_id, github.run_attempt)}}
+          FIREBASE_APP_CHECK_DEBUG_SECRET: ${{ secrets.FIREBASE_APP_CHECK_DEBUG_SECRET }}
+        run: |
+          ./gradlew firebase-firestore:deviceCheck withErrorProne -PtargetBackend="prod" -PtargetDatabaseId="test-db"
+
   publish-test-results:
     name: "Publish Tests Results"
     needs:

diff --git a/.github/workflows/create_releases.yml b/.github/workflows/create_releases.yml
@@ -26,7 +26,7 @@ jobs:
   create-pull-request:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/diff-javadoc.yml b/.github/workflows/diff-javadoc.yml
@@ -13,7 +13,7 @@ jobs:
         run: mkdir ~/diff
 
       - name: Checkout PR branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 2
           submodules: true
@@ -32,7 +32,7 @@ jobs:
         run: mv build ~/diff/modified
 
       - name: Checkout master
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
         with:
           ref: ${{ github.base_ref }}
 

diff --git a/.github/workflows/fireci.yml b/.github/workflows/fireci.yml
@@ -15,7 +15,7 @@ jobs:
     name: "fireci tests"
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.5.3
       - uses: actions/setup-python@v2
         with:
           python-version: '3.8'

diff --git a/.github/workflows/fireperf-e2e.yml b/.github/workflows/fireperf-e2e.yml
@@ -20,9 +20,9 @@ jobs:
         environment: [ prod, autopush ]
     steps:
       - name: Checkout firebase-android-sdk
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
       - name: Checkout firebase-android-buildtools
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
         with:
           repository: FirebasePrivate/firebase-android-buildtools
           token: ${{ secrets.GOOGLE_OSS_BOT_TOKEN }}

diff --git a/.github/workflows/health-metrics.yml b/.github/workflows/health-metrics.yml
@@ -24,7 +24,7 @@ jobs:
               && github.event.pull_request.head.repo.full_name == github.repository)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 2
           submodules: true
@@ -59,7 +59,7 @@ jobs:
               && github.event.pull_request.head.repo.full_name == github.repository)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 2
           submodules: true
@@ -95,7 +95,7 @@ jobs:
               && github.event.pull_request.base.ref == 'master')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 2
           submodules: true

diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
       - name: Setup Pages
         uses: actions/configure-pages@v2
       - name: Build with Jekyll

diff --git a/.github/workflows/make-bom.yml b/.github/workflows/make-bom.yml
@@ -11,7 +11,7 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: '3.10'
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.5.3
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:

diff --git a/.github/workflows/private-mirror-sync.yml b/.github/workflows/private-mirror-sync.yml
@@ -14,7 +14,7 @@ jobs:
     if: github.repository == 'firebase/firebase-android-sdk'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 0
           submodules: true

diff --git a/.github/workflows/release-note-changes.yml b/.github/workflows/release-note-changes.yml
@@ -9,7 +9,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v3.5.3
       with:
         fetch-depth: 0
 

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        uses: actions/checkout@v3.5.3
         with:
           persist-credentials: false
 

diff --git a/.github/workflows/semver-check.yml b/.github/workflows/semver-check.yml
@@ -10,7 +10,7 @@ jobs:
   semver-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3.5.3
 
       - name: Perform gradle build
         run: |

diff --git a/.github/workflows/sessions-e2e.yml b/.github/workflows/sessions-e2e.yml
@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout firebase-sessions
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
 
       - name: set up JDK 11
         uses: actions/setup-java@v3

diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
@@ -7,7 +7,7 @@ jobs:
     if: github.event.pull_request.head.repo.full_name == github.repository
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 2
           submodules: true

diff --git a/.github/workflows/update-cpp-sdk-on-release.yml b/.github/workflows/update-cpp-sdk-on-release.yml
@@ -23,7 +23,7 @@ jobs:
     outputs:
       released_version_changed: ${{ steps.check_version.outputs.released_version_changed }}
     steps:
-      - uses: actions/checkout@v2.3.1
+      - uses: actions/checkout@v3.5.3
         with:
           # Check out the actual head commit, not any merge commit.
           ref: ${{ github.sha }}
@@ -56,7 +56,7 @@ jobs:
           python-version: 3.7
 
       - name: Check out firebase-cpp-sdk
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v3.5.3
         with:
           repository: firebase/firebase-cpp-sdk
           ref: main

diff --git a/.github/workflows/validate-dependencies.yml b/.github/workflows/validate-dependencies.yml
@@ -10,7 +10,7 @@ jobs:
   build-artifacts:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3.5.3
 
       - name: Perform gradle build
         run: |

diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt
@@ -99,6 +99,7 @@ abstract class PomValidator : DefaultTask() {
       listOf(
         "javax.inject", // javax.inject doesn't respect SemVer and doesn't update
         "dagger", // dagger doesn't respect Semver
+        "auto-service-annotations", // auto-service-annotations doesn't respect SemVer
       )
   }
 }
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PublishingPlugin.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PublishingPlugin.kt
@@ -79,7 +79,9 @@ abstract class PublishingPlugin : Plugin<Project> {
       val checkHeadDependencies =
         registerCheckHeadDependenciesTask(project, releasingFirebaseLibraries)
       val validateProjectsToPublish =
-        registerValidateProjectsToPublishTask(project, releasingProjects)
+        registerValidateProjectsToPublishTask(project, releasingFirebaseLibraries)
+      val validateLibraryGroupsToPublish =
+        registerValidateLibraryGroupsToPublishTask(project, releasingFirebaseLibraries)
       val publishReleasingLibrariesToBuildDir =
         registerPublishReleasingLibrariesToBuildDirTask(project, releasingProjects)
       val generateKotlindocsForRelease =
@@ -127,6 +129,7 @@ abstract class PublishingPlugin : Plugin<Project> {
       project.tasks.register(FIREBASE_PUBLISH_TASK) {
         dependsOn(
           validateProjectsToPublish,
+          validateLibraryGroupsToPublish,
           checkHeadDependencies,
           // validatePomForRelease, TODO(b/279466888) - Make GmavenHelper testable
           buildMavenZip,
@@ -275,11 +278,11 @@ abstract class PublishingPlugin : Plugin<Project> {
   // TODO(b/280320915): Remove doLast when Gradle + IDEA fix task configuration avoidance bug
   private fun registerValidateProjectsToPublishTask(
     project: Project,
-    releasingProjects: List<Project>
+    releasinglibraries: List<FirebaseLibraryExtension>
   ) =
     project.tasks.register(VALIDATE_PROJECTS_TO_PUBLISH_TASK) {
       doLast {
-        if (releasingProjects.isEmpty()) {
+        if (releasinglibraries.isEmpty()) {
           throw GradleException(
             "No projects to release. " +
               "Ensure you've specified the projectsToPublish parameter, " +
@@ -289,6 +292,30 @@ abstract class PublishingPlugin : Plugin<Project> {
       }
     }
 
+  /**
+   * Registers the [VALIDATE_LIBRARY_GROUPS_TO_PUBLISH_TASK] task.
+   *
+   * Validates that all library groups of all publishing projects are included in the release config
+   *
+   * @throws GradleException if a library is releasing without it's library group.
+   */
+  private fun registerValidateLibraryGroupsToPublishTask(
+    project: Project,
+    releasinglibraries: List<FirebaseLibraryExtension>
+  ) =
+    project.tasks.register(VALIDATE_LIBRARY_GROUPS_TO_PUBLISH_TASK) {
+      doLast {
+        val libraryGroupProjects = releasinglibraries.flatMap { it.librariesToRelease }
+        val missingProjects = libraryGroupProjects - releasinglibraries
+        if (missingProjects.isNotEmpty()) {
+          throw GradleException(
+            "Some libraries in library groups are not in the release: " +
+              missingProjects.map { it.mavenName }.joinToString("\n")
+          )
+        }
+      }
+    }
+
   /**
    * Registers the [PUBLISH_RELEASING_LIBS_TO_BUILD_TASK] task.
    *
@@ -465,6 +492,7 @@ abstract class PublishingPlugin : Plugin<Project> {
 
     const val GENERATE_BOM_TASK = "generateBom"
     const val VALIDATE_PROJECTS_TO_PUBLISH_TASK = "validateProjectsToPublish"
+    const val VALIDATE_LIBRARY_GROUPS_TO_PUBLISH_TASK = "validateLibraryGroupsToPublish"
     const val SEMVER_CHECK_TASK = "semverCheckForRelease"
     const val RELEASE_GENEATOR_TASK = "generateReleaseConfig"
     const val VALIDATE_POM_TASK = "validatePomForRelease"

diff --git a/encoders/firebase-encoders-processor/firebase-encoders-processor.gradle b/encoders/firebase-encoders-processor/firebase-encoders-processor.gradle
@@ -21,7 +21,7 @@ def jvm = org.gradle.internal.jvm.Jvm.current()
 
 dependencies {
     implementation 'com.google.firebase:firebase-encoders:17.0.0'
-    implementation 'com.google.auto.service:auto-service-annotations:1.0-rc6'
+    implementation 'com.google.auto.service:auto-service-annotations:1.0.1'
     implementation 'com.squareup:javapoet:1.13.0'
     compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
     implementation 'com.google.guava:guava:28.1-jre'