Skip to content

Commit b68c1f6

Browse files
authored
Remove Javadoc + Fireescape artifacts from releasing jars (#4833)
* Remove Javadoc + Fireescape artifact generation * Remove left over classes * Remove old release property from workflows
1 parent 018969e commit b68c1f6

File tree

6 files changed

+4
-437
lines changed

6 files changed

+4
-437
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- name: Perform gradle build
2626
run: |
27-
./gradlew firebasePublish -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE -PincludeFireEscapeArtifacts=true
27+
./gradlew firebasePublish -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE
2828
2929
- name: Generate release notes
3030
run: |

.github/workflows/check-head-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414

1515
- name: Perform gradle build
1616
run: |
17-
./gradlew checkHeadDependencies -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE -PincludeFireEscapeArtifacts=true
17+
./gradlew checkHeadDependencies -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE

.github/workflows/validate-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414

1515
- name: Perform gradle build
1616
run: |
17-
./gradlew validatePomForRelease -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE -PincludeFireEscapeArtifacts=true
17+
./gradlew validatePomForRelease -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE

buildSrc/src/main/java/com/google/firebase/gradle/MultiProjectReleasePlugin.java

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,10 @@
1313
// limitations under the License.
1414
package com.google.firebase.gradle;
1515

16-
import static com.google.firebase.gradle.plugins.ProjectUtilsKt.toBoolean;
17-
1816
import com.google.common.collect.ImmutableMap;
1917
import com.google.firebase.gradle.bomgenerator.BomGeneratorTask;
20-
import com.google.firebase.gradle.plugins.FireEscapeArtifactPlugin;
2118
import com.google.firebase.gradle.plugins.FirebaseLibraryExtension;
22-
import com.google.firebase.gradle.plugins.JavadocPlugin;
2319
import com.google.firebase.gradle.plugins.publish.PublishingPlugin;
24-
import java.io.File;
2520
import java.util.Set;
2621
import java.util.stream.Collectors;
2722
import org.gradle.api.GradleException;
@@ -56,18 +51,6 @@ public class MultiProjectReleasePlugin implements Plugin<Project> {
5651
public void apply(Project project) {
5752
project.apply(ImmutableMap.of("plugin", PublishingPlugin.class));
5853

59-
boolean releaseJavadocs = toBoolean(System.getProperty("releaseJavadocs", "true"));
60-
File firebaseDevsiteJavadoc = new File(project.getBuildDir(), "firebase-kotlindoc/android");
61-
62-
project.subprojects(
63-
sub -> {
64-
sub.afterEvaluate(
65-
p -> {
66-
sub.apply(ImmutableMap.of("plugin", JavadocPlugin.class));
67-
sub.apply(ImmutableMap.of("plugin", FireEscapeArtifactPlugin.class));
68-
});
69-
});
70-
7154
project
7255
.getTasks()
7356
.create(
@@ -104,35 +87,8 @@ public void apply(Project project) {
10487
"Required projectsToPublish parameter missing.");
10588
}
10689
}));
107-
Task firebasePublish = project.getTasks().findByName("firebasePublish");
108-
firebasePublish.dependsOn(validateProjectsToPublish);
109-
110-
Task generateAllJavadocs =
111-
project.task(
112-
"generateAllJavadocs",
113-
task -> {
114-
for (Project p : projectsToPublish) {
115-
task.dependsOn(p.getPath() + ":kotlindoc");
116-
}
117-
});
118-
119-
Zip assembleFirebaseJavadocZip =
120-
project
121-
.getTasks()
122-
.create(
123-
"assembleFirebaseJavadocZip",
124-
Zip.class,
125-
zip -> {
126-
zip.dependsOn(generateAllJavadocs);
127-
zip.getDestinationDirectory().set(project.getBuildDir());
128-
zip.getArchiveFileName().set("firebase-javadoc.zip");
129-
zip.from(firebaseDevsiteJavadoc);
130-
zip.include("**/*");
131-
});
13290

133-
if (releaseJavadocs) {
134-
firebasePublish.dependsOn(assembleFirebaseJavadocZip);
135-
}
91+
project.getTasks().findByName("firebasePublish").dependsOn(validateProjectsToPublish);
13692
});
13793
}
13894
}

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

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)