Merge branch 'master' into ep/bump-auto-service-annotations

Author: rlazo

.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

@@ -10,7 +10,7 @@ jobs:
   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
@@ -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

.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

@@ -10,7 +10,7 @@ jobs:
   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 }}
@@ -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: |

buildSrc/src/main/java/com/google/firebase/gradle/plugins/PublishingPlugin.kt

@@ -14,6 +14,7 @@
 
 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
@@ -79,7 +80,7 @@ abstract class PublishingPlugin : Plugin<Project> {
       val checkHeadDependencies =
         registerCheckHeadDependenciesTask(project, releasingFirebaseLibraries)
       val validateProjectsToPublish =
-        registerValidateProjectsToPublishTask(project, releasingProjects)
+        registerValidateProjectsToPublishTask(project, releasingFirebaseLibraries)
       val publishReleasingLibrariesToBuildDir =
         registerPublishReleasingLibrariesToBuildDirTask(project, releasingProjects)
       val generateKotlindocsForRelease =
@@ -275,17 +276,26 @@ abstract class PublishingPlugin : Plugin<Project> {
   // TODO(b/280320915): Remove doLast when Gradle + IDEA fix task configuration avoidance bug
   private fun registerValidateProjectsToPublishTask(
     project: Project,
-    releasingProjects: List<Project>
+    releasinglibraries: List<FirebaseLibraryExtension>
   ) =
     project.tasks.register(VALIDATE_PROJECTS_TO_PUBLISH_TASK) {
       doLast {
-        if (releasingProjects.isEmpty()) {
+        if (releasinglibraries.isEmpty()) {
           throw GradleException(
             "No projects to release. " +
               "Ensure you've specified the projectsToPublish parameter, " +
               "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)) {
+          throw GradleException(
+            "Some libraries in library groups are not in the release: " +
+              Sets.difference(libraryGroupProjects, releasingProjects).map { it.displayName }
+          )
+        }
       }
     }
 
@@ -378,6 +388,7 @@ abstract class PublishingPlugin : Plugin<Project> {
       currentRelease.convention(project.provideProperty("currentRelease"))
       pastRelease.convention(project.provideProperty("pastRelease"))
       printReleaseConfig.convention(project.provideProperty("printOutput"))
+      commitsToIgnoreFile.convention(project.layout.projectDirectory.file("ignoreCommits.txt"))
 
       releaseConfigFile.convention(project.layout.projectDirectory.file(RELEASE_CONFIG_FILE))
       releaseReportMdFile.convention(project.layout.projectDirectory.file(RELEASE_REPORT_MD_FILE))

buildSrc/src/main/java/com/google/firebase/gradle/plugins/ReleaseGenerator.kt

@@ -29,6 +29,8 @@ import org.gradle.api.Project
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
@@ -120,6 +122,14 @@ abstract class ReleaseGenerator : DefaultTask() {
 
   @get:Optional @get:Input abstract val printReleaseConfig: Property<String>
 
+  @get:Optional @get:InputFiles abstract val commitsToIgnoreFile: RegularFileProperty
+
+  @get:Internal
+  val commitsToIgnore: List<ObjectId>
+    get() =
+      commitsToIgnoreFile.asFileIfExistsOrNull()?.readLines()?.map { ObjectId.fromString(it) }
+        ?: emptyList()
+
   @get:OutputFile abstract val releaseConfigFile: RegularFileProperty
 
   @get:OutputFile abstract val releaseReportMdFile: RegularFileProperty
@@ -224,7 +234,10 @@ abstract class ReleaseGenerator : DefaultTask() {
       .addRange(previousReleaseRef, currentReleaseRef)
       .setMaxCount(10)
       .call()
-      .filter { !it.fullMessage.contains(RELEASE_CHANGE_FILTER) }
+      .filter {
+        !it.fullMessage.contains(RELEASE_CHANGE_FILTER) &&
+          !commitsToIgnore.any { ignore -> it.id == ignore }
+      }
       .isNotEmpty()
 
   private fun getDirChanges(
@@ -238,8 +251,14 @@ abstract class ReleaseGenerator : DefaultTask() {
       .addPath(directory)
       .addRange(previousReleaseRef, currentReleaseRef)
       .call()
-      .filter { !it.fullMessage.contains(RELEASE_CHANGE_FILTER) }
+      .filter {
+        !it.fullMessage.contains(RELEASE_CHANGE_FILTER) &&
+          !commitsToIgnore.any { ignore -> it.id == ignore }
+      }
       .map { CommitDiff.fromRevCommit(it) }
 
   private fun getRelativeDir(project: Project) = project.path.substring(1).replace(':', '/')
 }
+
+fun RegularFileProperty.asFileIfExistsOrNull(): File? =
+  if (isPresent && asFile.get().exists()) asFile.get() else null