Merge remote-tracking branch 'origin/master' into cheryllin/autoIndexExperiment

Author: dconeybe

.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

.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

.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:

.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

.github/workflows/check-head-dependencies.yml

@@ -7,10 +7,10 @@ on:
       - 'releases/**'
 
 jobs:
-  build-artifacts:
+  check-head-dependencies:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3.5.3
 
       - name: Perform gradle build
         run: |

.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
@@ -31,7 +31,7 @@ jobs:
       - 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 ::set-output name=modules::$(cat modules.json)
+          echo modules=$(cat modules.json) >> $GITHUB_OUTPUT
 
   unit_tests:
     name: "Unit Tests"
@@ -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/[email protected]
+        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:

.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
 

.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 }}
 

.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'

.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 }}

.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

.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

.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:

.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

.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
 

.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
 

.github/workflows/semver-check.yml

@@ -7,10 +7,10 @@ on:
       - 'releases/**'
 
 jobs:
-  build-artifacts:
+  semver-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3.5.3
 
       - name: Perform gradle build
         run: |

.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

.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

.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 }}
@@ -35,7 +35,7 @@ jobs:
           # Query the git history for all gradle.properties files changed by this push.
           # Then, check the diff to see if any "latestReleasedVersion=" lines changed.
           if (git diff '${{ github.event.before }}' -- '**/gradle.properties' | grep -q '^[-+]latestReleasedVersion='); then
-            echo "::set-output name=released_version_changed::1"
+            echo "released_version_changed=1" >> $GITHUB_OUTPUT
           else
             echo "No change to latestReleasedVersion detected since ${{ github.event.before }}"
           fi
@@ -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

.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: |

.github/workflows/version-check.yml

@@ -0,0 +1,17 @@
+name: Version Check
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - 'releases/**'
+
+jobs:
+  version-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+
+      - name: Build
+        run: |
+          ./gradlew gmavenVersionCheck

README.md

@@ -225,30 +225,21 @@ strategy](https://docs.gradle.org/current/dsl/org.gradle.api.artifacts.Resolutio
 
 ### Commands
 
-The simplest way to publish a project and all its associated dependencies is to
-just publish all projects. The following command builds SNAPSHOT dependencies of
-all projects. All pom level dependencies within the published artifacts will
-also point to SNAPSHOT versions that are co-published.
+For more advanced use cases where developers wish to make changes to a project,
+but have transitive dependencies point to publicly released versions, individual
+projects may be published as follows.
 
 ```bash
-./gradlew publishAllToLocal
+# e.g. to publish Firestore and Functions
+./gradlew -PprojectsToPublish="firebase-firestore,firebase-functions" \
+    publishReleasingLibrariesToMavenLocal
 ```
 
 Developers may take a dependency on these locally published versions by adding
 the `mavenLocal()` repository to your [repositories
 block](https://docs.gradle.org/current/userguide/declaring_repositories.html) in
 your app module's build.gradle.
 
-For more advanced use cases where developers wish to make changes to a project,
-but have transitive dependencies point to publicly released versions, individual
-projects may be published as follows.
-
-```bash
-# e.g. to publish Firestore and Functions
-./gradlew -PprojectsToPublish=":firebase-firestore,:firebase-functions" \
-    publishProjectsToMavenLocal
-```
-
 ### Code Formatting
 
 #### Java

appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle

@@ -53,21 +53,21 @@ dependencies {
     implementation 'com.google.firebase:firebase-appcheck-interop:17.0.0'
     implementation 'com.google.android.gms:play-services-base:18.0.1'
     implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-    implementation 'androidx.test:core:1.2.0'
+    implementation "androidx.test:core:$androidxTestCoreVersion"
 
     javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
 
     testImplementation 'junit:junit:4.13-beta-2'
     testImplementation 'org.mockito:mockito-core:2.25.0'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation project(':appcheck:firebase-appcheck-safetynet')
 
     androidTestImplementation project(':firebase-storage')
     androidTestImplementation 'junit:junit:4.13-beta-2'
     androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'org.mockito:mockito-core:2.25.0'
 }