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
 }