diff --git a/examples/.idea/misc.xml b/examples/.idea/misc.xml index 87b25c5..35aa0d5 100644 --- a/examples/.idea/misc.xml +++ b/examples/.idea/misc.xml @@ -5,6 +5,7 @@ + diff --git a/examples/src/bld/java/com/example/ExampleBuild.java b/examples/src/bld/java/com/example/ExampleBuild.java index 5880d28..211b13f 100644 --- a/examples/src/bld/java/com/example/ExampleBuild.java +++ b/examples/src/bld/java/com/example/ExampleBuild.java @@ -94,6 +94,17 @@ public class ExampleBuild extends Project { .execute(); } + @BuildCommand(value = "dokka-jekyll", summary = "Generates documentation in Jekyll flavored markdown format") + public void dokkaJekyll() throws ExitStatusException, IOException, InterruptedException { + new DokkaOperation() + .fromProject(this) + .loggingLevel(LoggingLevel.INFO) + // Create build/dokka/jekyll + .outputDir(Path.of(buildDirectory().getAbsolutePath(), "dokka", "jekkyl").toFile()) + .outputFormat(OutputFormat.JEKYLL) + .execute(); + } + @BuildCommand(summary = "Generates Javadoc for the project") @Override public void javadoc() throws ExitStatusException, IOException, InterruptedException { diff --git a/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java b/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java index dab80d3..c435351 100644 --- a/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java +++ b/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java @@ -48,6 +48,7 @@ public class CompileKotlinOperationBuild extends Project { .include(dependency("org.jetbrains.dokka", "analysis-kotlin-descriptors", dokka)) .include(dependency("org.jetbrains.dokka", "javadoc-plugin", dokka)) .include(dependency("org.jetbrains.dokka", "gfm-plugin", dokka)) + .include(dependency("org.jetbrains.dokka", "jekyll-plugin", dokka)) .include(dependency("com.uwyn.rife2", "bld", version(1, 7, 5))); scope(test) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 1))) diff --git a/src/main/java/rife/bld/extension/dokka/DokkaOperation.java b/src/main/java/rife/bld/extension/dokka/DokkaOperation.java index 4f25058..ad9888f 100644 --- a/src/main/java/rife/bld/extension/dokka/DokkaOperation.java +++ b/src/main/java/rife/bld/extension/dokka/DokkaOperation.java @@ -40,6 +40,8 @@ public class DokkaOperation extends AbstractProcessOperation { "^.*(dokka-base|analysis-kotlin-descriptors|kotlinx-html-jvm|freemarker).*\\.jar$"; private final static String JAVADOC_PLUGIN_REGEXP = "^.*(dokka-base|analysis-kotlin-descriptors|javadoc-plugin|kotlin-as-java-plugin|korte-jvm).*\\.jar$"; + private final static String JEKYLL_PLUGIN_REGEXP = + "^.*(dokka-base|analysis-kotlin-descriptors|jekyll-plugin|gfm-plugin|freemarker).*\\.jar$"; private final Logger LOGGER = Logger.getLogger(DokkaOperation.class.getName()); private final Map globalLinks_ = new ConcurrentHashMap<>(); private final Collection globalPackageOptions_ = new ArrayList<>(); @@ -452,6 +454,8 @@ public class DokkaOperation extends AbstractProcessOperation { pluginsClasspath_.addAll(getJarList(project_.libBldDirectory(), HTML_PLUGIN_REGEXP)); } else if (format.equals(OutputFormat.MARKDOWN)) { pluginsClasspath_.addAll(getJarList(project_.libBldDirectory(), GFM_PLUGIN_REGEXP)); + } else if (format.equals(OutputFormat.JEKYLL)) { + pluginsClasspath_.addAll(getJarList(project_.libBldDirectory(), JEKYLL_PLUGIN_REGEXP)); } return this; } diff --git a/src/main/java/rife/bld/extension/dokka/OutputFormat.java b/src/main/java/rife/bld/extension/dokka/OutputFormat.java index efa17a2..a2674e0 100644 --- a/src/main/java/rife/bld/extension/dokka/OutputFormat.java +++ b/src/main/java/rife/bld/extension/dokka/OutputFormat.java @@ -23,5 +23,5 @@ package rife.bld.extension.dokka; * @since 1.0 */ public enum OutputFormat { - JAVADOC, HTML, MARKDOWN + JAVADOC, JEKYLL, HTML, MARKDOWN }