Skip to content

Remove Javadoc + Fireescape artifacts from releasing jars #4833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-release-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- name: Perform gradle build
run: |
./gradlew firebasePublish -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE -PincludeFireEscapeArtifacts=true
./gradlew firebasePublish -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE

- name: Generate release notes
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-head-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:

- name: Perform gradle build
run: |
./gradlew checkHeadDependencies -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE -PincludeFireEscapeArtifacts=true
./gradlew checkHeadDependencies -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE
2 changes: 1 addition & 1 deletion .github/workflows/validate-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:

- name: Perform gradle build
run: |
./gradlew validatePomForRelease -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE -PincludeFireEscapeArtifacts=true
./gradlew validatePomForRelease -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,10 @@
// limitations under the License.
package com.google.firebase.gradle;

import static com.google.firebase.gradle.plugins.ProjectUtilsKt.toBoolean;

import com.google.common.collect.ImmutableMap;
import com.google.firebase.gradle.bomgenerator.BomGeneratorTask;
import com.google.firebase.gradle.plugins.FireEscapeArtifactPlugin;
import com.google.firebase.gradle.plugins.FirebaseLibraryExtension;
import com.google.firebase.gradle.plugins.JavadocPlugin;
import com.google.firebase.gradle.plugins.publish.PublishingPlugin;
import java.io.File;
import java.util.Set;
import java.util.stream.Collectors;
import org.gradle.api.GradleException;
Expand Down Expand Up @@ -56,18 +51,6 @@ public class MultiProjectReleasePlugin implements Plugin<Project> {
public void apply(Project project) {
project.apply(ImmutableMap.of("plugin", PublishingPlugin.class));

boolean releaseJavadocs = toBoolean(System.getProperty("releaseJavadocs", "true"));
File firebaseDevsiteJavadoc = new File(project.getBuildDir(), "firebase-kotlindoc/android");

project.subprojects(
sub -> {
sub.afterEvaluate(
p -> {
sub.apply(ImmutableMap.of("plugin", JavadocPlugin.class));
sub.apply(ImmutableMap.of("plugin", FireEscapeArtifactPlugin.class));
});
});

project
.getTasks()
.create(
Expand Down Expand Up @@ -104,35 +87,8 @@ public void apply(Project project) {
"Required projectsToPublish parameter missing.");
}
}));
Task firebasePublish = project.getTasks().findByName("firebasePublish");
firebasePublish.dependsOn(validateProjectsToPublish);

Task generateAllJavadocs =
project.task(
"generateAllJavadocs",
task -> {
for (Project p : projectsToPublish) {
task.dependsOn(p.getPath() + ":kotlindoc");
}
});

Zip assembleFirebaseJavadocZip =
project
.getTasks()
.create(
"assembleFirebaseJavadocZip",
Zip.class,
zip -> {
zip.dependsOn(generateAllJavadocs);
zip.getDestinationDirectory().set(project.getBuildDir());
zip.getArchiveFileName().set("firebase-javadoc.zip");
zip.from(firebaseDevsiteJavadoc);
zip.include("**/*");
});

if (releaseJavadocs) {
firebasePublish.dependsOn(assembleFirebaseJavadocZip);
}
project.getTasks().findByName("firebasePublish").dependsOn(validateProjectsToPublish);
});
}
}

This file was deleted.

Loading