Skip to content

Commit 005fc6b

Browse files
authored
Remove Dokka Plugin (#4031)
* Remove DackkaPlugin from register block This doesn't currently need to be public, as it automatically gets applied via FirebaseLibrary. * Remove Dokka Pugin Now that the Dackka plugin is implemented, we can safely remove our previous Dokka plugin. * Added empty kotlindoc to JavaPlugin for tests * Removed Dokka from JavadocPlugin
1 parent d84113e commit 005fc6b

File tree

4 files changed

+4
-239
lines changed

4 files changed

+4
-239
lines changed

buildSrc/build.gradle.kts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ dependencies {
5757
implementation("org.apache.maven:maven-aether-provider:3.1.0")
5858

5959
implementation("com.google.code.gson:gson:2.8.9")
60-
implementation("org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.17-g013-9b8280a")
6160
implementation("com.android.tools.build:gradle:3.4.3")
6261
implementation("gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9")
6362

@@ -72,10 +71,6 @@ gradlePlugin {
7271
id = "LicenseResolverPlugin"
7372
implementationClass = "com.google.firebase.gradle.plugins.license.LicenseResolverPlugin"
7473
}
75-
register("dackkaPlugin") {
76-
id = "DackkaPlugin"
77-
implementationClass = "com.google.firebase.gradle.plugins.DackkaPlugin"
78-
}
7974
register("multiProjectReleasePlugin") {
8075
id = "MultiProjectReleasePlugin"
8176
implementationClass = "com.google.firebase.gradle.MultiProjectReleasePlugin"
@@ -88,12 +83,10 @@ gradlePlugin {
8883
id = "firebase-library"
8984
implementationClass = "com.google.firebase.gradle.plugins.FirebaseLibraryPlugin"
9085
}
91-
9286
register("firebaseJavaLibraryPlugin") {
9387
id = "firebase-java-library"
9488
implementationClass = "com.google.firebase.gradle.plugins.FirebaseJavaLibraryPlugin"
9589
}
96-
9790
register("firebaseVendorPlugin") {
9891
id = "firebase-vendor"
9992
implementationClass = "com.google.firebase.gradle.plugins.VendorPlugin"

buildSrc/src/main/java/com/google/firebase/gradle/plugins/Dokka.java

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

buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void apply(Project project) {
5555
ImmutableList.of("-module-name", kotlinModuleName(project))));
5656

5757
setupStaticAnalysis(project, firebaseLibrary);
58-
project.afterEvaluate(p -> Dokka.configure(project, null, firebaseLibrary));
58+
project.getTasks().register("kotlindoc");
5959
}
6060

6161
private static void setupStaticAnalysis(Project project, FirebaseLibraryExtension library) {

buildSrc/src/main/java/com/google/firebase/gradle/plugins/JavadocPlugin.java

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import com.android.build.gradle.LibraryExtension;
2020
import com.google.common.collect.ImmutableList;
21-
import com.google.common.collect.ImmutableMap;
2221
import java.io.File;
2322
import java.io.IOException;
2423
import java.util.List;
@@ -34,8 +33,6 @@
3433
import org.gradle.api.tasks.javadoc.Javadoc;
3534
import org.gradle.external.javadoc.CoreJavadocOptions;
3635
import org.gradle.external.javadoc.StandardJavadocDocletOptions;
37-
import org.jetbrains.dokka.gradle.DokkaAndroidPlugin;
38-
import org.jetbrains.dokka.gradle.DokkaTask;
3936

4037
/**
4138
* This plugin modifies the java plugin's javadoc task to be firebase friendly. It does the
@@ -73,10 +70,10 @@ public void apply(Project project) {
7370
toBoolean(
7471
((Map<String, Object>) project.getProperties())
7572
.getOrDefault("includeFireEscapeArtifacts", "false"));
76-
if (!ext.publishJavadoc || !includeFireEscapeArtifacts) {
73+
boolean isKotlinAndroid = project.getPlugins().hasPlugin("kotlin-android");
74+
75+
if (!ext.publishJavadoc || !includeFireEscapeArtifacts || isKotlinAndroid) {
7776
applyDummyJavadoc(project);
78-
} else if (project.getPlugins().hasPlugin("kotlin-android")) {
79-
applyDokka(project);
8077
} else {
8178
applyDoclava(project);
8279
}
@@ -276,13 +273,6 @@ private static void applyDoclava(Project project) {
276273
});
277274
}
278275

279-
private static void applyDokka(Project project) {
280-
project.apply(ImmutableMap.of("plugin", DokkaAndroidPlugin.class));
281-
DokkaTask dokka = (DokkaTask) project.getTasks().getByName("dokka");
282-
dokka.setOutputDirectory(project.getBuildDir() + "/docs/javadoc/reference");
283-
applyDummyJavadoc(project).dependsOn(dokka);
284-
}
285-
286276
private static Task applyDummyJavadoc(Project project) {
287277
return project
288278
.getTasks()

0 commit comments

Comments
 (0)