Merge remote-tracking branch 'origin/master' into mila/BloomFilter

Author: dconeybe

.github/workflows/build-release-artifacts.yml

@@ -24,7 +24,7 @@ jobs:
 
       - name: Perform gradle build
         run: |
-          ./gradlew firebasePublish -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE -PincludeFireEscapeArtifacts=true
+          ./gradlew firebasePublish -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE
 
       - name: Generate release notes
         run: |

.github/workflows/changelog.yml

@@ -8,7 +8,7 @@ concurrency:
     cancel-in-progress: true
 
 jobs:
-  danger:
+  changelog-check:
     runs-on: ubuntu-22.04
     env:
       BUNDLE_GEMFILE: ./ci/danger/Gemfile

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

@@ -14,4 +14,4 @@ jobs:
 
       - name: Perform gradle build
         run: |
-          ./gradlew checkHeadDependencies -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE -PincludeFireEscapeArtifacts=true
+          ./gradlew checkHeadDependencies -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE

.github/workflows/merge-to-main.yml

@@ -26,15 +26,5 @@ jobs:
           using a feature branch first, and only merge into the main
           branch when the code complete and ready to be released.
 
-
-          **Add the 'main-merge-ack' label to your PR to confirm
-          merging into the main branch is intended.**
-
-    - name: Label checker
-      if: "!contains( github.event.pull_request.labels.*.name, 'main-merge-ack')"
-      run: |
-        echo Missing 'main-merge-ack' label. Read the comment about merging to master in your PR for more information.
-        exit 1
-
     - name: Success
       run: exit 0

.github/workflows/sessions-e2e.yml

@@ -0,0 +1,38 @@
+name: Firebase Sessions E2E Tests
+
+on:
+  workflow_dispatch: # allow triggering the workflow manually
+
+concurrency:
+  group: ${{ github.workflow }}
+
+env:
+  SESSIONS_E2E_GOOGLE_SERVICES: ${{ secrets.SESSIONS_E2E_GOOGLE_SERVICES }}
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout firebase-sessions
+      uses: actions/checkout@v3
+      with:
+        ref: 'firebase-sessions'
+
+    - name: set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: gradle
+
+    - name: Add google-services.json
+      run: |
+        echo $SESSIONS_E2E_GOOGLE_SERVICES | base64 -d > google-services.json
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+
+    - name: Run sessions end-to-end tests
+      run: ./gradlew firebase-sessions:deviceCheck withErrorProne -PtargetBackend="prod"

.github/workflows/validate-dependencies.yml

@@ -14,4 +14,4 @@ jobs:
 
       - name: Perform gradle build
         run: |
-          ./gradlew validatePomForRelease -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE -PincludeFireEscapeArtifacts=true
+          ./gradlew validatePomForRelease -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE

README.md

@@ -251,8 +251,10 @@ projects may be published as follows.
 
 ### Code Formatting
 
-Code in this repo is formatted with the google-java-format tool. You can enable
-this formatting in Android Studio by downloading and installing the
+#### Java
+
+Java code in this repo is formatted with the google-java-format tool. You can
+enable this formatting in Android Studio by downloading and installing the
 [google-java-format plugin](https://github.com/google/google-java-format).
 The plugin is disabled by default, but the repo contains configuration information
 and links to additional plugins.
@@ -262,6 +264,18 @@ To run formatting on your entire project you can run
 ./gradlew :<firebase-project>:googleJavaFormat
 ```
 
+#### 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
+```bash
+./gradlew :<firebase-project>:ktfmtFormat
+```
+
 ### Contributing
 
 We love contributions! Please read our

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

@@ -17,6 +17,7 @@ plugins {
 }
 
 firebaseLibrary {
+    libraryGroup "appcheck"
     testLab.enabled = true
     publishSources = true
 }

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

@@ -17,6 +17,7 @@ plugins {
 }
 
 firebaseLibrary {
+    libraryGroup "appcheck"
     publishSources = true
 }
 

appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle

@@ -17,6 +17,7 @@ plugins {
 }
 
 firebaseLibrary {
+    libraryGroup "appcheck"
     publishSources = true
 }
 

appcheck/firebase-appcheck/CHANGELOG.md

@@ -3,6 +3,12 @@
 # 16.1.2
 * [unchanged] Updated to keep [app_check] SDK versions aligned.
 
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appcheck` library. The Kotlin extensions library has no additional
+updates.
+
 # 16.1.1
 * [changed] Migrated [app_check] SDKs to use standard Firebase executors.
   (GitHub [#4431](//github.com/firebase/firebase-android-sdk/issues/4431){: .external}

appcheck/firebase-appcheck/firebase-appcheck.gradle

@@ -17,6 +17,7 @@ plugins {
 }
 
 firebaseLibrary {
+    libraryGroup "appcheck"
     publishSources = true
 }
 

appcheck/firebase-appcheck/ktx/ktx.gradle

@@ -18,7 +18,7 @@ plugins {
 }
 
 firebaseLibrary {
-    releaseWith project(':appcheck:firebase-appcheck')
+    libraryGroup "appcheck"
     testLab.enabled = true
     publishJavadoc = true
     publishSources = true

buildSrc/src/main/java/com/google/firebase/gradle/MultiProjectReleasePlugin.java

@@ -13,21 +13,18 @@
 // limitations under the License.
 package com.google.firebase.gradle;
 
-import static com.google.firebase.gradle.plugins.ProjectUtilsKt.toBoolean;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.firebase.gradle.bomgenerator.BomGeneratorTask;
-import com.google.firebase.gradle.plugins.FireEscapeArtifactPlugin;
 import com.google.firebase.gradle.plugins.FirebaseLibraryExtension;
-import com.google.firebase.gradle.plugins.JavadocPlugin;
 import com.google.firebase.gradle.plugins.publish.PublishingPlugin;
-import java.io.File;
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.gradle.api.GradleException;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
+import org.gradle.api.tasks.Copy;
+import org.gradle.api.tasks.TaskProvider;
 import org.gradle.api.tasks.bundling.Zip;
 
 /**
@@ -56,18 +53,6 @@ public class MultiProjectReleasePlugin implements Plugin<Project> {
   public void apply(Project project) {
     project.apply(ImmutableMap.of("plugin", PublishingPlugin.class));
 
-    boolean releaseJavadocs = toBoolean(System.getProperty("releaseJavadocs", "true"));
-    File firebaseDevsiteJavadoc = new File(project.getBuildDir(), "firebase-kotlindoc/android");
-
-    project.subprojects(
-        sub -> {
-          sub.afterEvaluate(
-              p -> {
-                sub.apply(ImmutableMap.of("plugin", JavadocPlugin.class));
-                sub.apply(ImmutableMap.of("plugin", FireEscapeArtifactPlugin.class));
-              });
-        });
-
     project
         .getTasks()
         .create(
@@ -80,7 +65,34 @@ public void apply(Project project) {
               task.getDestinationDirectory().set(project.getRootDir());
             });
 
-    project.getTasks().create("generateReleaseConfig", ReleaseGenerator.class);
+    TaskProvider<ReleaseGenerator> generatorTask =
+        project
+            .getTasks()
+            .register(
+                "makeReleaseConfigFiles",
+                ReleaseGenerator.class,
+                task -> {
+                  task.getCurrentRelease()
+                      .convention(project.property("currentRelease").toString());
+                  task.getPastRelease().convention(project.property("pastRelease").toString());
+                  task.getPrintReleaseConfig()
+                      .convention(project.property("printOutput").toString());
+                  task.getReleaseConfigFile()
+                      .convention(project.getLayout().getBuildDirectory().file("release.cfg"));
+                  task.getReleaseReportFile()
+                      .convention(
+                          project.getLayout().getBuildDirectory().file("release_report.md"));
+                });
+
+    project
+        .getTasks()
+        .register(
+            "generateReleaseConfig",
+            Copy.class,
+            task -> {
+              task.from(generatorTask);
+              task.into(project.getRootDir());
+            });
 
     project
         .getGradle()
@@ -104,35 +116,7 @@ public void apply(Project project) {
                                       "Required projectsToPublish parameter missing.");
                                 }
                               }));
-              Task firebasePublish = project.getTasks().findByName("firebasePublish");
-              firebasePublish.dependsOn(validateProjectsToPublish);
-
-              Task generateAllJavadocs =
-                  project.task(
-                      "generateAllJavadocs",
-                      task -> {
-                        for (Project p : projectsToPublish) {
-                          task.dependsOn(p.getPath() + ":kotlindoc");
-                        }
-                      });
-
-              Zip assembleFirebaseJavadocZip =
-                  project
-                      .getTasks()
-                      .create(
-                          "assembleFirebaseJavadocZip",
-                          Zip.class,
-                          zip -> {
-                            zip.dependsOn(generateAllJavadocs);
-                            zip.getDestinationDirectory().set(project.getBuildDir());
-                            zip.getArchiveFileName().set("firebase-javadoc.zip");
-                            zip.from(firebaseDevsiteJavadoc);
-                            zip.include("**/*");
-                          });
-
-              if (releaseJavadocs) {
-                firebasePublish.dependsOn(assembleFirebaseJavadocZip);
-              }
+              project.getTasks().findByName("firebasePublish").dependsOn(validateProjectsToPublish);
             });
   }
 }