Merge branch 'master' into daymon-refactor-publisher

Author: daymxn

.github/workflows/api-information.yml

@@ -12,7 +12,7 @@ jobs:
           fetch-depth: 2
           submodules: true
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin

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

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/[email protected]
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin

.github/workflows/ci_tests.yml

@@ -22,7 +22,7 @@ jobs:
           submodules: true
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin
@@ -50,7 +50,7 @@ jobs:
           submodules: true
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin
@@ -100,7 +100,7 @@ jobs:
           submodules: true
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin

.github/workflows/fireperf-e2e.yml

@@ -28,7 +28,7 @@ jobs:
           token: ${{ secrets.GOOGLE_OSS_BOT_TOKEN }}
           path: firebase-android-buildtools
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin

.github/workflows/health-metrics.yml

@@ -29,7 +29,7 @@ jobs:
           fetch-depth: 2
           submodules: true
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin
@@ -64,7 +64,7 @@ jobs:
           fetch-depth: 2
           submodules: true
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin
@@ -99,7 +99,7 @@ jobs:
           fetch-depth: 2
           submodules: true
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin

.github/workflows/make-bom.yml

@@ -13,7 +13,7 @@ jobs:
           python-version: '3.10'
       - uses: actions/[email protected]
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin

.github/workflows/semver-check.yml

@@ -0,0 +1,17 @@
+name: Semver Check
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - 'releases/**'
+
+jobs:
+  build-artifacts:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Perform gradle build
+        run: |
+          ./gradlew semverCheckForRelease -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE

.github/workflows/smoke-tests.yml

@@ -12,7 +12,7 @@ jobs:
           fetch-depth: 2
           submodules: true
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin

build.gradle

@@ -36,7 +36,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.14'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.2'
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.3.0'
         classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9'
         classpath 'com.google.gms:google-services:4.3.15'

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

@@ -96,11 +96,12 @@ class FirebaseLibraryPlugin : BaseFirebaseLibraryPlugin() {
       aarAndroidFile.value(true)
       filePath.value(project.file("semver/previous.aar").absolutePath)
     }
-
+    val artifact = firebaseLibrary.artifactId.get()
+    val releaseAar = if (artifact.contains("-ktx")) "ktx-release.aar" else "${artifact}-release.aar"
     project.tasks.register<Copy>("extractCurrentClasses") {
       dependsOn("bundleReleaseAar")
 
-      from(project.zipTree("build/outputs/aar/${firebaseLibrary.artifactId.get()}-release.aar"))
+      from(project.zipTree("build/outputs/aar/${releaseAar}"))
       into(project.file("semver/current-version"))
     }
     project.tasks.register<Copy>("extractPreviousClasses") {

buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/Coverage.java

@@ -36,7 +36,7 @@ public static void apply(FirebaseLibraryExtension firebaseLibrary) {
     JacocoPluginExtension jacoco = project.getExtensions().getByType(JacocoPluginExtension.class);
 
     jacoco.setToolVersion("0.8.8");
-    jacoco.setReportsDir(reportsDir);
+    jacoco.getReportsDirectory().set(reportsDir);
     project
         .getTasks()
         .withType(

buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/GenerateLicensesTask.java

@@ -32,7 +32,7 @@
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.TaskAction;
-import org.gradle.api.tasks.incremental.IncrementalTaskInputs;
+import org.gradle.work.InputChanges;
 
 abstract class GenerateLicensesTask extends DefaultTask {
   private static final int NEW_LINE_LENGTH = "\n".getBytes().length;
@@ -56,7 +56,7 @@ public GenerateLicensesTask() {
   }
 
   @TaskAction
-  void execute(IncrementalTaskInputs inputs) {
+  void execute(InputChanges inputs) {
     Set<URI> licenseUris = new HashSet<URI>();
     for (ThirdPartyLicensesExtension.CustomLicense license : getadditionalLicenses()) {
       licenseUris.addAll(license.licenseUris);

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

@@ -151,6 +151,15 @@ public void apply(Project project) {
                   .getExtraProperties()
                   .set("projectsToPublish", projectsToPublish);
 
+              project
+                  .getTasks()
+                  .register(
+                      "semverCheckForRelease",
+                      t -> {
+                        for (FirebaseLibraryExtension toPublish : projectsToPublish) {
+                          t.dependsOn(toPublish.getPath() + ":semverCheck");
+                        }
+                      });
               project
                   .getTasks()
                   .create(

ci/danger/Gemfile.lock

@@ -49,7 +49,7 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    git (1.12.0)
+    git (1.13.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     kramdown (2.4.0)
@@ -63,7 +63,7 @@ GEM
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     open4 (1.3.4)
-    public_suffix (5.0.0)
+    public_suffix (5.0.1)
     rchardet (1.8.0)
     rexml (3.2.5)
     ruby2_keywords (0.0.5)

firebase-common/src/main/java/com/google/firebase/concurrent/DelegatingScheduledExecutorService.java

@@ -124,6 +124,7 @@ public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit)
   }
 
   @Override
+  @SuppressWarnings("FutureReturnValueIgnored")
   public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit) {
     return new DelegatingScheduledFuture<>(
         completer ->

firebase-common/src/main/java/com/google/firebase/concurrent/DelegatingScheduledFuture.java

@@ -24,6 +24,7 @@
 // going to be removed. In this case it's required since we need to implement a ScheduledFuture so
 // we can't use CallbackToFutureAdapter.
 @SuppressLint("RestrictedApi")
+@SuppressWarnings("RestrictTo")
 class DelegatingScheduledFuture<V> extends AbstractResolvableFuture<V>
     implements ScheduledFuture<V> {