Merge branch 'master' into firebase-kotlin-format

Author: mrober

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

@@ -15,6 +15,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: 11
+          distribution: temurin
+          cache: gradle
+
       - name: Perform gradle build
         run: |
           ./gradlew firebasePublish -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE -PincludeFireEscapeArtifacts=true

.github/workflows/diff-javadoc.yml

@@ -19,7 +19,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

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

@@ -120,16 +120,9 @@ public void apply(Project project) {
 
               Set<String> allFirebaseProjects =
                   project.getSubprojects().stream()
-                      .filter(
-                          sub ->
-                              sub.getExtensions().findByType(FirebaseLibraryExtension.class)
-                                  != null)
-                      .map(
-                          sub ->
-                              sub.getExtensions()
-                                  .findByType(FirebaseLibraryExtension.class)
-                                  .artifactId
-                                  .get())
+                      .map(sub -> sub.getExtensions().findByType(FirebaseLibraryExtension.class))
+                      .filter(ext -> ext != null)
+                      .map(ext -> ext.artifactId.get())
                       .collect(Collectors.toSet());
 
               Set<FirebaseLibraryExtension> projectsToPublish =
@@ -140,7 +133,8 @@ public void apply(Project project) {
                               project
                                   .project(name)
                                   .getExtensions()
-                                  .getByType(FirebaseLibraryExtension.class))
+                                  .findByType(FirebaseLibraryExtension.class))
+                      .filter(ext -> ext != null)
                       .flatMap(lib -> lib.getLibrariesToRelease().stream())
                       .collect(Collectors.toSet());
               project