Merge branch 'main' into dependabot/github_actions/dot-github/workflows/actions/download-artifact-4.1.7

Author: rlazo

.github/workflows/build-src-check.yml

@@ -26,7 +26,7 @@ jobs:
         run: |
           ./gradlew -b buildSrc/build.gradle.kts -PenablePluginTests=true check
       - name: Publish Test Results
-        uses: EnricoMi/publish-unit-test-result-action@b9f6c61d965bcaa18acc02d6daf706373a448f02
+        uses: EnricoMi/publish-unit-test-result-action@82082dac68ad6a19d980f8ce817e108b9f496c2a
         with:
           files: "**/build/test-results/**/*.xml"
           check_name: "buildSrc Test Results"

.github/workflows/ci_tests.yml

@@ -172,6 +172,6 @@ jobs:
           path: artifacts
 
       - name: Publish Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v1
+        uses: EnricoMi/publish-unit-test-result-action@82082dac68ad6a19d980f8ce817e108b9f496c2a
         with:
           files: "artifacts/**/*.xml"

.github/workflows/create_releases.yml

@@ -19,7 +19,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Create base branch
-        uses: peterjgrainger/action-create-branch@c2800a3a9edbba2218da6861fa46496cf8f3195a
+        uses: peterjgrainger/action-create-branch@08259812c8ebdbf1973747f9297e332fa078d3c1
         with:
           branch: 'releases/${{ inputs.name }}'
 

build.gradle

@@ -40,8 +40,7 @@ buildscript {
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.google.firebase:firebase-appdistribution-gradle:5.0.0'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
-        classpath "com.diffplug.spotless:spotless-plugin-gradle:7.0.0.BETA1"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:1.8.22"
+        classpath libs.spotless.plugin.gradle
     }
 }
 

buildSrc/build.gradle.kts

@@ -14,7 +14,7 @@
 
 plugins {
     id("com.ncorti.ktfmt.gradle") version "0.11.0"
-    kotlin("plugin.serialization") version "1.8.22"
+    alias(libs.plugins.kotlinx.serialization)
     `kotlin-dsl`
 }
 
@@ -59,8 +59,8 @@ dependencies {
 
     implementation(libs.kotlinx.serialization.json)
     implementation("com.google.code.gson:gson:2.8.9")
-    implementation("com.android.tools.build:gradle:8.2.1")
-    implementation("com.android.tools.build:builder-test-api:8.2.1")
+    implementation(libs.android.gradlePlugin.gradle)
+    implementation(libs.android.gradlePlugin.builder.test.api)
 
     testImplementation(libs.bundles.kotest)
     testImplementation("junit:junit:4.13.2")

buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java

@@ -91,7 +91,8 @@ public abstract class BomGeneratorTask extends DefaultTask {
           "com.google.firebase:firebase-perf",
           "com.google.firebase:firebase-perf-ktx",
           "com.google.firebase:firebase-storage",
-          "com.google.firebase:firebase-storage-ktx");
+          "com.google.firebase:firebase-storage-ktx",
+          "firebase-vertexai");
   private static final List<String> IGNORED_ARTIFACTS =
       ImmutableList.of(
           "crash-plugin",
@@ -155,7 +156,6 @@ public abstract class BomGeneratorTask extends DefaultTask {
           "firebase-storage-common",
           "firebase-storage-common-license",
           "firebase-storage-license",
-          "firebase-vertexai",
           "perf-plugin",
           "play-services-ads",
           "protolite-well-known-types",

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

@@ -134,7 +134,7 @@ abstract class MakeReleaseNotesTask : DefaultTask() {
         .trimMargin()
         .trim()
 
-    releaseNotesFile.asFile.get().writeText(releaseNotes)
+    releaseNotesFile.asFile.get().writeText(releaseNotes + "\n")
   }
 
   /**

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

@@ -394,7 +394,7 @@ enum class DeltaType {
           Delta(
             after.name,
             "",
-            String.format("Class %s made abstract.", after.name),
+            String.format("Class %s made final.", after.name),
             CLASS_MADE_FINAL,
             VersionDelta.MAJOR
           )
@@ -594,6 +594,10 @@ enum class DeltaType {
   },
   CHANGED_FROM_STATIC {
     override fun getViolations(before: ClassInfo?, after: ClassInfo?): List<Delta> {
+      // Safe to ignore: if `after` is null, then it has been removed and another check will
+      // report this.
+      if (after == null) return emptyList()
+
       val allBeforeMethods = getAllMethods(before)
       val allAfterMethods = getAllMethods(after)
       val afterStaticMethods =