Merge branch 'master' into mila/multiple-inequality-support

milaGGL · web-flow · commit 6bb2c371ba3b · 2023-08-11T11:19:57.000-04:00
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
@@ -14,7 +14,6 @@
 
 package com.google.firebase.gradle.plugins
 
-import com.google.common.collect.Sets
 import com.google.firebase.gradle.bomgenerator.BomGeneratorTask
 import com.google.firebase.gradle.plugins.PublishingPlugin.Companion.BUILD_BOM_ZIP_TASK
 import com.google.firebase.gradle.plugins.PublishingPlugin.Companion.BUILD_KOTLINDOC_ZIP_TASK
@@ -81,6 +80,8 @@ abstract class PublishingPlugin : Plugin<Project> {
         registerCheckHeadDependenciesTask(project, releasingFirebaseLibraries)
       val validateProjectsToPublish =
         registerValidateProjectsToPublishTask(project, releasingFirebaseLibraries)
+      val validateLibraryGroupsToPublish =
+        registerValidateLibraryGroupsToPublishTask(project, releasingFirebaseLibraries)
       val publishReleasingLibrariesToBuildDir =
         registerPublishReleasingLibrariesToBuildDirTask(project, releasingProjects)
       val generateKotlindocsForRelease =
@@ -128,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,
@@ -287,13 +289,28 @@ abstract class PublishingPlugin : Plugin<Project> {
               "or have a valid $RELEASE_CONFIG_FILE file at the root directory."
           )
         }
-        val libraryGroupProjects =
-          releasinglibraries.flatMap { it.projectsToRelease }.filterNotNull().toSet()
-        val releasingProjects = releasinglibraries.mapNotNull { it.project }.toSet()
-        if (!libraryGroupProjects.equals(releasingProjects)) {
+      }
+    }
+
+  /**
+   * 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: " +
-              Sets.difference(libraryGroupProjects, releasingProjects).map { it.displayName }
+              missingProjects.map { it.mavenName }.joinToString("\n")
           )
         }
       }
@@ -475,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/firebase-appdistribution-api/gradle.properties b/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-beta10
-latestReleasedVersion=16.0.0-beta09
+version=16.0.0-beta11
+latestReleasedVersion=16.0.0-beta10
diff --git a/firebase-appdistribution/CHANGELOG.md b/firebase-appdistribution/CHANGELOG.md
@@ -1,4 +1,6 @@
 # Unreleased
+
+# 16.0.0-beta10
 * [fixed] Updated the third-party license file to include Dagger's license.
 
 # 16.0.0-beta09
diff --git a/firebase-appdistribution/gradle.properties b/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-beta10
-latestReleasedVersion=16.0.0-beta09
+version=16.0.0-beta11
+latestReleasedVersion=16.0.0-beta10
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteLocalStoreTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteLocalStoreTest.java
@@ -444,9 +444,7 @@ public void testDoesNotAutoCreateIndexesWhenIndexLookUpIsExpensive() {
     applyRemoteEvent(
         addedRemoteEvent(doc("coll/e", 10, map("array", Arrays.asList(2, 0, 8))), targetId));
 
-    // First time query runs without indexes.
-    // Based on current heuristic, collection document counts (5) > 2 * resultSize (2).
-    // Full matched index should be created.
+    // SDK will not create indexes since relative read cost is too large.
     executeQuery(query);
     assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
     assertQueryReturned("coll/a", "coll/e");
@@ -479,7 +477,6 @@ public void testIndexAutoCreationWorksWhenBackfillerRunsHalfway() {
     // Based on current heuristic, collection document counts (5) > 2 * resultSize (2).
     // Full matched index should be created.
     executeQuery(query);
-    // Only document a matches the result
     assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
     assertQueryReturned("coll/a", "coll/e");
 
diff --git a/firebase-inappmessaging-display/CHANGELOG.md b/firebase-inappmessaging-display/CHANGELOG.md
@@ -1,4 +1,6 @@
 # Unreleased
+
+# 20.3.3
 * [unchanged] Updated internal Dagger dependency.
 
 # 20.3.2
diff --git a/firebase-inappmessaging-display/gradle.properties b/firebase-inappmessaging-display/gradle.properties
@@ -1,2 +1,2 @@
-version=20.3.3
-latestReleasedVersion=20.3.2
+version=20.3.4
+latestReleasedVersion=20.3.3
diff --git a/firebase-inappmessaging/CHANGELOG.md b/firebase-inappmessaging/CHANGELOG.md
@@ -1,4 +1,6 @@
 # Unreleased
+
+# 20.3.3
 * [unchanged] Updated internal Dagger dependency.
 
 # 20.3.2
diff --git a/firebase-inappmessaging/gradle.properties b/firebase-inappmessaging/gradle.properties
@@ -1,2 +1,2 @@
-version=20.3.3
-latestReleasedVersion=20.3.2
+version=20.3.4
+latestReleasedVersion=20.3.3
diff --git a/firebase-installations/gradle.properties b/firebase-installations/gradle.properties
@@ -1,2 +1,2 @@
-version=17.1.4
-latestReleasedVersion=17.1.3
+version=17.1.5
+latestReleasedVersion=17.1.4
diff --git a/firebase-messaging-directboot/gradle.properties b/firebase-messaging-directboot/gradle.properties
@@ -1,3 +1,3 @@
-version=23.2.1
-latestReleasedVersion=23.2.0
+version=23.2.2
+latestReleasedVersion=23.2.1
 android.enableUnitTestBinaryResources=true
diff --git a/firebase-messaging/CHANGELOG.md b/firebase-messaging/CHANGELOG.md
@@ -1,4 +1,6 @@
 # Unreleased
+
+# 23.2.1
 * [changed] Changed to finish a background broadcast after the message has been
   handled, subject to a timeout. This keeps the `FirebaseMessagingService`'s
   process in an active state while it is handling an FCM message, up to the
diff --git a/firebase-messaging/gradle.properties b/firebase-messaging/gradle.properties
@@ -1,3 +1,3 @@
-version=23.2.1
-latestReleasedVersion=23.2.0
+version=23.2.2
+latestReleasedVersion=23.2.2
 android.enableUnitTestBinaryResources=true
diff --git a/firebase-ml-modeldownloader/CHANGELOG.md b/firebase-ml-modeldownloader/CHANGELOG.md
@@ -1,4 +1,6 @@
 # Unreleased
+
+# 24.1.3
 * [unchanged] Updated internal Dagger dependency.
 * [fixed] Updated the third-party license file to include Dagger's license.
 
diff --git a/firebase-ml-modeldownloader/gradle.properties b/firebase-ml-modeldownloader/gradle.properties
@@ -1,2 +1,2 @@
-version=24.1.3
-latestReleasedVersion=24.1.2
+version=24.1.4
+latestReleasedVersion=24.1.3
diff --git a/firebase-sessions/gradle.properties b/firebase-sessions/gradle.properties
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=1.0.1
-latestReleasedVersion=1.0.0
+version=1.0.2
+latestReleasedVersion=1.0.1
