remove noises from last master merge

Author: milaGGL

.github/workflows/ci_tests.yml

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

firebase-appdistribution-api/CHANGELOG.md

@@ -1,11 +1,17 @@
 # Unreleased
+
+# 16.0.0-beta09
 * [feature] Improved development mode to allow all API calls to be made without having to sign in.
 
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appdistribution-api` library. The Kotlin extensions library has no
+additional updates.
+
 # 16.0.0-beta08
 * [fixed] Fixed an issue where a crash happened whenever a feedback
   notification was shown on devices running Android 4.4 and lower.
 
-
 ## Kotlin
 The Kotlin extensions library transitively includes the updated
 `firebase-appdistribution-api` library. The Kotlin extensions library has no
@@ -15,7 +21,6 @@ additional updates.
 * [feature] Added support for testers to attach JPEG screenshots to their
   feedback.
 
-
 ## Kotlin
 The Kotlin extensions library transitively includes the updated
 `firebase-appdistribution-api` library. The Kotlin extensions library has no

firebase-appdistribution-api/gradle.properties

@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=16.0.0-beta09
-latestReleasedVersion=16.0.0-beta08
+version=16.0.0-beta10
+latestReleasedVersion=16.0.0-beta09

firebase-appdistribution/CHANGELOG.md

@@ -1,7 +1,9 @@
 # Unreleased
-* [feature] Improved development mode to allow all API calls to be made without having to sign in.
 * [fixed] Updated the third-party license file to include Dagger's license.
 
+# 16.0.0-beta09
+* [feature] Improved development mode to allow all API calls to be made without having to sign in.
+
 # 16.0.0-beta08
 * [fixed] Fixed an issue where a crash happened whenever a feedback
   notification was shown on devices running Android 4.4 and lower.

firebase-appdistribution/gradle.properties

@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=16.0.0-beta09
-latestReleasedVersion=16.0.0-beta08
+version=16.0.0-beta10
+latestReleasedVersion=16.0.0-beta09

firebase-config/CHANGELOG.md

@@ -1,4 +1,6 @@
 # Unreleased
+
+# 21.4.1
 * [changed] Internal improvements to support Remote Config real-time updates.
 
 

firebase-config/gradle.properties

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version=21.4.1
-latestReleasedVersion=21.4.0
+version=21.4.2
+latestReleasedVersion=21.4.1
 android.enableUnitTestBinaryResources=true
 

firebase-crashlytics-ndk/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Unreleased
 
+# 18.4.0
+* [changed] Updated `firebase-crashlytics` dependency to v18.4.0
+* 
 # 18.3.7
 * [changed] Updated `firebase-crashlytics` dependency to v18.3.7
 

firebase-crashlytics-ndk/gradle.properties

@@ -1,2 +1,2 @@
-version=18.4.0
-latestReleasedVersion=18.3.7
+version=18.4.1
+latestReleasedVersion=18.4.0

firebase-crashlytics/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Unreleased
+
+# 18.4.0
 * [feature] Integrated with Firebase sessions library to enable upcoming features related to
   session-based crash metrics.
 
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
 # 18.3.7
 * [feature] Added collection of version control information generated by the
   Android Gradle plugin (AGP).

firebase-crashlytics/gradle.properties

@@ -1,2 +1,2 @@
-version=18.4.0
-latestReleasedVersion=18.3.7
+version=18.4.1
+latestReleasedVersion=18.4.0

firebase-firestore/CHANGELOG.md

@@ -1,8 +1,16 @@
 # Unreleased
+* [fixed] Implement equals method on Filter class. [#5210](//github.com/firebase/firebase-android-sdk/issues/5210)
+
+# 24.7.0
 * [feature] Expose MultiDb support in API. [#4015](//github.com/firebase/firebase-android-sdk/issues/4015)
 * [fixed] Fixed a thread interference issue that may lead to a ConcurrentModificationException.
-    (GitHub [#5091](//github.com/firebase/firebase-android-sdk/issues/5091){: .external})
-* [feature] Added support for multiple inequality in compound queries.
+  (GitHub [#5091](//github.com/firebase/firebase-android-sdk/issues/5091){: .external})
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-firestore` library. The Kotlin extensions library has no additional
+updates.
 
 # 24.6.1
 * [feature] Implemented an optimization in the local cache synchronization logic that reduces the number of billed document reads when documents were deleted on the server while the client was not actively listening to the query (e.g. while the client was offline). (GitHub [#4982](//github.com/firebase/firebase-android-sdk/pull/4982){: .external})

firebase-firestore/firebase-firestore.gradle

@@ -70,6 +70,9 @@ android {
         def targetBackend = findProperty("targetBackend") ?: "emulator"
         buildConfigField("String", "TARGET_BACKEND", "\"$targetBackend\"")
 
+        def targetDatabaseId = findProperty('targetDatabaseId') ?: "(default)"
+        buildConfigField("String", "TARGET_DATABASE_ID", "\"$targetDatabaseId\"")
+
         def localProps = new Properties()
 
         try {
@@ -154,7 +157,7 @@ dependencies {
     testImplementation 'com.google.guava:guava-testlib:12.0-rc2'
 
     androidTestImplementation 'junit:junit:4.13.2'
-    androidTestImplementation("com.google.truth:truth:$googleTruthVersion"){
+    androidTestImplementation("com.google.truth:truth:$googleTruthVersion") {
         exclude group: "org.codehaus.mojo", module: "animal-sniffer-annotations"
     }
     androidTestImplementation 'org.mockito:mockito-core:2.25.0'

firebase-firestore/gradle.properties

@@ -1,2 +1,2 @@
-version=24.7.0
-latestReleasedVersion=24.6.1
+version=24.7.1
+latestReleasedVersion=24.7.0

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/BundleTest.java

@@ -14,6 +14,7 @@
 
 package com.google.firebase.firestore;
 
+import static com.google.common.truth.Truth.assertThat;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.querySnapshotToValues;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testFirestore;
 import static com.google.firebase.firestore.testutil.TestUtil.map;
@@ -198,7 +199,7 @@ public void testLoadedDocumentsShouldNotBeGarbageCollectedRightAway() throws Exc
   public void testLoadWithDocumentsFromOtherProjectFails() throws Exception {
     List<LoadBundleTaskProgress> progressEvents = new ArrayList<>();
 
-    byte[] bundle = createBundle("other-project");
+    byte[] bundle = createBundle("other-project", db.getDatabaseId().getDatabaseId());
     LoadBundleTask bundleTask = db.loadBundle(bundle);
 
     bundleTask.addOnProgressListener(progressEvents::add);
@@ -207,10 +208,9 @@ public void testLoadWithDocumentsFromOtherProjectFails() throws Exception {
       awaitCompletion(bundleTask);
       fail();
     } catch (RuntimeExecutionException e) {
-      assertEquals(
-          "Resource name is not valid for current instance: "
-              + "projects/other-project/databases/(default)/documents",
-          e.getCause().getCause().getMessage());
+      assertThat(e.getCause().getCause())
+          .hasMessageThat()
+          .contains("Resource name is not valid for current instance");
     }
 
     assertEquals(2, progressEvents.size());
@@ -262,14 +262,16 @@ private int getUTF8ByteCount(String s) {
    * Returns a valid bundle by replacing project id in `BUNDLE_TEMPLATES` with the given db project
    * id (also recalculates length prefixes).
    */
-  private byte[] createBundle(String projectId) throws UnsupportedEncodingException {
+  private byte[] createBundle(String projectId, String databaseId)
+      throws UnsupportedEncodingException {
     StringBuilder bundle = new StringBuilder();
 
     // Prepare non-metadata elements since we need the total length of these elements before
     // generating the metadata.
     for (int i = 1; i < BUNDLE_TEMPLATES.length; ++i) {
       // Extract elements from BUNDLE_TEMPLATE and replace the project ID.
       String element = BUNDLE_TEMPLATES[i].replaceAll("\\{projectId\\}", projectId);
+      element = element.replaceAll("\\(default\\)", databaseId);
       bundle.append(getUTF8ByteCount(element));
       bundle.append(element);
     }
@@ -290,7 +292,7 @@ private byte[] createBundle(String projectId) throws UnsupportedEncodingExceptio
    * current test database.
    */
   private byte[] createBundle() throws UnsupportedEncodingException {
-    return createBundle(db.getDatabaseId().getProjectId());
+    return createBundle(db.getDatabaseId().getProjectId(), db.getDatabaseId().getDatabaseId());
   }
 
   private void verifySuccessProgress(LoadBundleTaskProgress progress) {

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CountTest.java

@@ -33,6 +33,7 @@
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.gms.tasks.Task;
+import com.google.firebase.firestore.model.DatabaseId;
 import com.google.firebase.firestore.testutil.IntegrationTestUtil;
 import java.util.Collections;
 import org.junit.After;
@@ -276,6 +277,14 @@ public void testCountFailWithGoodMessageIfMissingIndex() {
 
     Throwable cause = throwable.getCause();
     assertThat(cause).hasMessageThat().ignoringCase().contains("index");
-    assertThat(cause).hasMessageThat().contains("https://console.firebase.google.com");
+    if (collection
+        .firestore
+        .getDatabaseId()
+        .getDatabaseId()
+        .equals(DatabaseId.DEFAULT_DATABASE_ID)) {
+      assertThat(cause).hasMessageThat().contains("https://console.firebase.google.com");
+    } else {
+      assertThat(cause).hasMessageThat().contains("Missing index configuration");
+    }
   }
 }

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java

@@ -102,7 +102,8 @@ public void firestoreGetInstanceWithNullAppFails() {
   }
 
   @Test
-  public void firestoreGetInstanceWithNullDbNamepFails() {
+  public void firestoreGetInstanceWithNullDbNameFails() {
+    FirebaseApp.initializeApp(ApplicationProvider.getApplicationContext());
     expectError(
         () -> FirebaseFirestore.getInstance((String) null),
         "Provided database name must not be null.");
@@ -250,9 +251,12 @@ public void writesMustNotContainReferencesToADifferentDatabase() {
     expectWriteError(
         data,
         String.format(
-            "Invalid data. Document reference is for database %s/(default) but should be for "
-                + "database %s/(default) (found in field foo)",
-            IntegrationTestUtil.BAD_PROJECT_ID, IntegrationTestUtil.provider().projectId()));
+            "Invalid data. Document reference is for database %s/%s but should be for "
+                + "database %s/%s (found in field foo)",
+            IntegrationTestUtil.BAD_PROJECT_ID,
+            BuildConfig.TARGET_DATABASE_ID,
+            IntegrationTestUtil.provider().projectId(),
+            BuildConfig.TARGET_DATABASE_ID));
   }
 
   @Test

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/IntegrationTestUtil.java

@@ -283,7 +283,7 @@ public static FirebaseFirestore testFirestore(
       FirebaseFirestoreSettings settings,
       String persistenceKey) {
     return testFirestore(
-        DatabaseId.forDatabase(projectId, DatabaseId.DEFAULT_DATABASE_ID),
+        DatabaseId.forDatabase(projectId, BuildConfig.TARGET_DATABASE_ID),
         logLevel,
         settings,
         persistenceKey);