diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index aa4fa67..f778f97 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -1,15 +1,16 @@ name: bld-ci -on: [ push, pull_request, workflow_dispatch ] +on: [push, pull_request, workflow_dispatch] jobs: build-bld-project: - runs-on: ubuntu-latest - strategy: matrix: - java-version: [ 17, 21, 22 ] - kotlin-version: [ 1.19.24, 2.0.0 ] + java-version: [17, 21, 24] + kotlin-version: [1.9.25, 2.1.20] + os: [ ubuntu-latest, windows-latest, macos-latest ] + + runs-on: ${{ matrix.os }} steps: - name: Checkout source repository diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index e191f6d..88c2cd6 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -47,11 +47,11 @@ jobs: uses: actions/configure-pages@v3 - name: Upload artifact - uses: actions/upload-pages-artifact@v1 + uses: actions/upload-pages-artifact@v3 with: # Upload generated Javadocs repository path: "build/javadoc/" - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v1 + uses: actions/deploy-pages@v4 diff --git a/.idea/bld.xml b/.idea/bld.xml new file mode 100644 index 0000000..6600cee --- /dev/null +++ b/.idea/bld.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/icon.svg b/.idea/icon.svg new file mode 100644 index 0000000..81220b4 --- /dev/null +++ b/.idea/icon.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 9f8c820..f9b1d1d 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.idea/libraries/compile.xml b/.idea/libraries/compile.xml index 9bd86aa..99cc0c0 100644 --- a/.idea/libraries/compile.xml +++ b/.idea/libraries/compile.xml @@ -7,7 +7,7 @@ - - + + \ No newline at end of file diff --git a/.idea/libraries/runtime.xml b/.idea/libraries/runtime.xml index 2ae5c4b..d4069f2 100644 --- a/.idea/libraries/runtime.xml +++ b/.idea/libraries/runtime.xml @@ -8,7 +8,7 @@ - - + + \ No newline at end of file diff --git a/.idea/libraries/test.xml b/.idea/libraries/test.xml index b80486a..57ed5ef 100644 --- a/.idea/libraries/test.xml +++ b/.idea/libraries/test.xml @@ -8,7 +8,7 @@ - - + + \ No newline at end of file diff --git a/.idea/runConfigurations/Run Tests.xml b/.idea/runConfigurations/Run Tests.xml deleted file mode 100644 index 057a90e..0000000 --- a/.idea/runConfigurations/Run Tests.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 5b2667b..ba429d0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,7 +9,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-2.0.1.jar", + "${HOME}/.bld/dist/bld-2.2.1.jar", "lib/**/*.jar" ] } diff --git a/README.md b/README.md index 420b4de..2e8db74 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,19 @@ [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) -[![bld](https://img.shields.io/badge/2.0.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![bld](https://img.shields.io/badge/2.2.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-dokka/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-dokka) [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-dokka/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-dokka) [![GitHub CI](https://github.com/rife2/bld-dokka/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-dokka/actions/workflows/bld.yml) -To install, please refer to the [extensions](https://github.com/rife2/bld/wiki/Extensions) and [support](https://github.com/rife2/bld/wiki/Kotlin-Support) -documentation. +To install the latest version, add the following to the `lib/bld/bld-wrapper.properties` file: + +```properties +bld.extension-dokka=com.uwyn.rife2:bld-dokka +``` + +For more information, please refer to the [extensions](https://github.com/rife2/bld/wiki/Extensions) documentation. + ## Generate API Documentation diff --git a/config/pmd.xml b/config/pmd.xml index 3d3203c..2641880 100644 --- a/config/pmd.xml +++ b/config/pmd.xml @@ -7,9 +7,9 @@ - - + + diff --git a/examples/.idea/bld.xml b/examples/.idea/bld.xml new file mode 100644 index 0000000..6600cee --- /dev/null +++ b/examples/.idea/bld.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/examples/.idea/libraries/bld.xml b/examples/.idea/libraries/bld.xml index 4dd96bf..153a060 100644 --- a/examples/.idea/libraries/bld.xml +++ b/examples/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/examples/.idea/libraries/compile.xml b/examples/.idea/libraries/compile.xml index 9bd86aa..99cc0c0 100644 --- a/examples/.idea/libraries/compile.xml +++ b/examples/.idea/libraries/compile.xml @@ -7,7 +7,7 @@ - - + + \ No newline at end of file diff --git a/examples/.idea/libraries/runtime.xml b/examples/.idea/libraries/runtime.xml index 2ae5c4b..d4069f2 100644 --- a/examples/.idea/libraries/runtime.xml +++ b/examples/.idea/libraries/runtime.xml @@ -8,7 +8,7 @@ - - + + \ No newline at end of file diff --git a/examples/.idea/libraries/test.xml b/examples/.idea/libraries/test.xml index b80486a..57ed5ef 100644 --- a/examples/.idea/libraries/test.xml +++ b/examples/.idea/libraries/test.xml @@ -8,7 +8,7 @@ - - + + \ No newline at end of file diff --git a/examples/.vscode/settings.json b/examples/.vscode/settings.json index 5b2667b..ba429d0 100644 --- a/examples/.vscode/settings.json +++ b/examples/.vscode/settings.json @@ -9,7 +9,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-2.0.1.jar", + "${HOME}/.bld/dist/bld-2.2.1.jar", "lib/**/*.jar" ] } diff --git a/examples/lib/bld/bld-wrapper.jar b/examples/lib/bld/bld-wrapper.jar index f51a154..814993b 100644 Binary files a/examples/lib/bld/bld-wrapper.jar and b/examples/lib/bld/bld-wrapper.jar differ diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties index 7719b26..73eee8e 100644 --- a/examples/lib/bld/bld-wrapper.properties +++ b/examples/lib/bld/bld-wrapper.properties @@ -1,8 +1,8 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= -bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.0 -bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.0 +bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.3 +bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.1.0-SNAPSHOT bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.sourceDirectories= -bld.version=2.0.1 +bld.version=2.2.1 diff --git a/examples/src/bld/java/com/example/ExampleBuild.java b/examples/src/bld/java/com/example/ExampleBuild.java index f6a2f09..c39cb2d 100644 --- a/examples/src/bld/java/com/example/ExampleBuild.java +++ b/examples/src/bld/java/com/example/ExampleBuild.java @@ -34,13 +34,14 @@ public class ExampleBuild extends Project { repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES); - final var kotlin = version(2, 0, 0); + final var kotlin = version(2, 1, 20); scope(compile) .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin)); scope(test) .include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", kotlin)) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 3))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 3))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1))) + .include(dependency("org.junit.platform", "junit-platform-launcher", version(1, 12, 1))); // Include the Kotlin source directory when creating or publishing sources Java Archives jarSourcesOperation().sourceDirectories(new File(srcMainDirectory(), "kotlin")); diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index f17986d..8705a25 100644 Binary files a/lib/bld/bld-wrapper.jar and b/lib/bld/bld-wrapper.jar differ diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 79b2f59..c5da09f 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,8 +1,8 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= -bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.2 -bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.4 +bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.4 +bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.1 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.sourceDirectories= -bld.version=2.0.1 +bld.version=2.2.1 diff --git a/src/bld/java/rife/bld/extension/DokkaOperationBuild.java b/src/bld/java/rife/bld/extension/DokkaOperationBuild.java index 8923f78..5d42723 100644 --- a/src/bld/java/rife/bld/extension/DokkaOperationBuild.java +++ b/src/bld/java/rife/bld/extension/DokkaOperationBuild.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,7 @@ import rife.bld.publish.PublishLicense; import rife.bld.publish.PublishScm; import java.util.List; +import java.util.Locale; import static rife.bld.dependencies.Repository.*; import static rife.bld.dependencies.Scope.compile; @@ -33,15 +34,16 @@ public class DokkaOperationBuild extends Project { public DokkaOperationBuild() { pkg = "rife.bld.extension"; name = "bld-dokka"; - version = version(1, 0, 0); + version = version(1, 0, 4, "SNAPSHOT"); javaRelease = 17; downloadSources = true; autoDownloadPurge = true; + repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS); - var dokka = version(1, 9, 20); + var dokka = version(2, 0, 0); scope(compile) .include(dependency("org.jetbrains.dokka", "dokka-cli", dokka)) .include(dependency("org.jetbrains.dokka", "dokka-base", dokka)) @@ -49,11 +51,11 @@ public class DokkaOperationBuild extends Project { .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(2, 0, 1))); + .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1))); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 3))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 3))) - .include(dependency("org.assertj", "assertj-core", version(3, 26, 3))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1))) + .include(dependency("org.assertj", "assertj-core", version(3, 27, 3))); javadocOperation() .javadocOptions() @@ -63,28 +65,26 @@ public class DokkaOperationBuild extends Project { publishOperation() .repository(version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2")) + .repository(repository("github")) .info() .groupId("com.uwyn.rife2") .artifactId(name) .description("bld Dokka Extension") .url("https://github.com/rife2/bld-dokka") - .developer( - new PublishDeveloper() - .id("ethauvin") - .name("Erik C. Thauvin") - .email("erik@thauvin.net") - .url("https://erik.thauvin.net/") + .developer(new PublishDeveloper() + .id("ethauvin") + .name("Erik C. Thauvin") + .email("erik@thauvin.net") + .url("https://erik.thauvin.net/") ) - .license( - new PublishLicense() - .name("The Apache License, Version 2.0") - .url("https://www.apache.org/licenses/LICENSE-2.0.txt") + .license(new PublishLicense() + .name("The Apache License, Version 2.0") + .url("https://www.apache.org/licenses/LICENSE-2.0.txt") ) - .scm( - new PublishScm() - .connection("scm:git:https://github.com/rife2/bld-dokka.git") - .developerConnection("scm:git:git@github.com:rife2/bld-dokka.git") - .url("https://github.com/rife2/bld-dokka") + .scm(new PublishScm() + .connection("scm:git:https://github.com/rife2/bld-dokka.git") + .developerConnection("scm:git:git@github.com:rife2/bld-dokka.git") + .url("https://github.com/rife2/bld-dokka") ) .signKey(property("sign.key")) .signPassphrase(property("sign.passphrase")); @@ -105,10 +105,13 @@ public class DokkaOperationBuild extends Project { @Override public void test() throws Exception { - new ExecOperation() - .fromProject(this) - .command("scripts/cliargs.sh") - .execute(); + var os = System.getProperty("os.name"); + if (os != null && os.toLowerCase(Locale.US).contains("linux")) { + new ExecOperation() + .fromProject(this) + .command("scripts/cliargs.sh") + .execute(); + } super.test(); } } diff --git a/src/main/java/rife/bld/extension/DokkaOperation.java b/src/main/java/rife/bld/extension/DokkaOperation.java index 03f9323..c8e6762 100644 --- a/src/main/java/rife/bld/extension/DokkaOperation.java +++ b/src/main/java/rife/bld/extension/DokkaOperation.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,11 @@ import rife.tools.StringUtils; import java.io.File; import java.io.IOException; -import java.util.*; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; @@ -41,13 +45,13 @@ import java.util.stream.Collectors; @SuppressWarnings("PMD.AvoidThrowingRawExceptionTypes") public class DokkaOperation extends AbstractProcessOperation { public static final String SEMICOLON = ";"; - private final static String GFM_PLUGIN_REGEXP = + private static final String GFM_PLUGIN_REGEXP = "^.*(dokka-base|analysis-kotlin-descriptors|gfm-plugin|freemarker).*\\.jar$"; - private final static String HTML_PLUGIN_REGEXP = + private static final String HTML_PLUGIN_REGEXP = "^.*(dokka-base|analysis-kotlin-descriptors|kotlinx-html-jvm|freemarker).*\\.jar$"; - private final static String JAVADOC_PLUGIN_REGEXP = + private static final 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 = + private static final 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<>(); @@ -369,8 +373,7 @@ public class DokkaOperation extends AbstractProcessOperation { * @return this operation instance */ public DokkaOperation globalPackageOptions(String... options) { - globalPackageOptions_.addAll(List.of(options)); - return this; + return globalPackageOptions(List.of(options)); } /** @@ -411,8 +414,7 @@ public class DokkaOperation extends AbstractProcessOperation { * @return this operation instance */ public DokkaOperation globalSrcLink(String... links) { - globalSrcLinks_.addAll(List.of(links)); - return this; + return globalSrcLink(List.of(links)); } /** @@ -444,10 +446,10 @@ public class DokkaOperation extends AbstractProcessOperation { * * @param files one or more files * @return this operation instance + * @see #includes(Collection) */ public DokkaOperation includes(File... files) { - includes_.addAll(List.of(files)); - return this; + return includes(List.of(files)); } /** @@ -459,12 +461,28 @@ public class DokkaOperation extends AbstractProcessOperation { * * @param files one or more files * @return this operation instance + * @see #includesStrings(Collection) */ public DokkaOperation includes(String... files) { - includes_.addAll(Arrays.stream(files).map(File::new).toList()); - return this; + return includesStrings(List.of(files)); } + /** + * Sets the Markdown files that contain module and package documentation. + *

+ * The contents of specified files are parsed and embedded into documentation as module and package descriptions. + *

+ * This can be configured on per-package basis. + * + * @param files one or more files + * @return this operation instance + * @see #includesPaths(Collection) + */ + public DokkaOperation includes(Path... files) { + return includesPaths(List.of(files)); + } + + /** * Retrieves the markdown files that contain the module and package documentation. * @@ -483,12 +501,43 @@ public class DokkaOperation extends AbstractProcessOperation { * * @param files the markdown files * @return this operation instance + * @see #includes(File...) */ public DokkaOperation includes(Collection files) { includes_.addAll(files); return this; } + /** + * Sets the Markdown files that contain module and package documentation. + *

+ * The contents of specified files are parsed and embedded into documentation as module and package descriptions. + *

+ * This can be configured on per-package basis. + * + * @param files the markdown files + * @return this operation instance + * @see #includes(Path...) + */ + public DokkaOperation includesPaths(Collection files) { + return includes(files.stream().map(Path::toFile).toList()); + } + + /** + * Sets the Markdown files that contain module and package documentation. + *

+ * The contents of specified files are parsed and embedded into documentation as module and package descriptions. + *

+ * This can be configured on per-package basis. + * + * @param files the markdown files + * @return this operation instance + * @see #includes(String...) + */ + public DokkaOperation includesStrings(Collection files) { + return includes(files.stream().map(File::new).toList()); + } + /** * JSON configuration file path. * @@ -499,6 +548,33 @@ public class DokkaOperation extends AbstractProcessOperation { return this; } + /** + * JSON configuration file path. + * + * @param configuration the configuration file path + */ + public DokkaOperation json(Path configuration) { + return json(configuration.toFile()); + } + + /** + * Retrieves the JSON configuration file path. + * + * @return the configuration file path + */ + public File json() { + return json_; + } + + /** + * JSON configuration file path. + * + * @param configuration the configuration file path + */ + public DokkaOperation json(String configuration) { + return json(new File(configuration)); + } + /** * Sets the logging level. * @@ -589,6 +665,15 @@ public class DokkaOperation extends AbstractProcessOperation { return this; } + /** + * Retrieves the output directory path. + * + * @return the output directory + */ + public File outputDir() { + return outputDir_; + } + /** * Sets the output directory path, {@code ./dokka} by default. *

@@ -598,8 +683,19 @@ public class DokkaOperation extends AbstractProcessOperation { * @return this operation instance */ public DokkaOperation outputDir(String outputDir) { - outputDir_ = new File(outputDir); - return this; + return outputDir(new File(outputDir)); + } + + /** + * Sets the output directory path, {@code ./dokka} by default. + *

+ * The directory to where documentation is generated, regardless of output format. + * + * @param outputDir the output directory + * @return this operation instance + */ + public DokkaOperation outputDir(Path outputDir) { + return outputDir(outputDir.toFile()); } /** @@ -641,12 +737,12 @@ public class DokkaOperation extends AbstractProcessOperation { /** * Sets the configuration for Dokka plugins. * - * @param pluginConfiguratione the map of configurations + * @param pluginConfigurations the map of configurations * @return this operation instance * @see #pluginConfigurations(String, String) */ - public DokkaOperation pluginConfigurations(Map pluginConfiguratione) { - pluginsConfiguration_.putAll(pluginConfiguratione); + public DokkaOperation pluginConfigurations(Map pluginConfigurations) { + pluginsConfiguration_.putAll(pluginConfigurations); return this; } @@ -664,10 +760,10 @@ public class DokkaOperation extends AbstractProcessOperation { * * @param jars one or more jars * @return this operation instance + * @see #includes(Collection) */ public DokkaOperation pluginsClasspath(File... jars) { - pluginsClasspath_.addAll(List.of(jars)); - return this; + return pluginsClasspath(List.of(jars)); } /** @@ -675,10 +771,21 @@ public class DokkaOperation extends AbstractProcessOperation { * * @param jars one or more jars * @return this operation instance + * @see #pluginsClasspathStrings(Collection) */ public DokkaOperation pluginsClasspath(String... jars) { - pluginsClasspath_.addAll(Arrays.stream(jars).map(File::new).toList()); - return this; + return pluginsClasspathStrings(List.of(jars)); + } + + /** + * Sets the jars for Dokka plugins and their dependencies. + * + * @param jars one or more jars + * @return this operation instance + * @see #pluginsClasspathPaths(Collection) + */ + public DokkaOperation pluginsClasspath(Path... jars) { + return pluginsClasspathPaths(List.of(jars)); } /** @@ -695,12 +802,35 @@ public class DokkaOperation extends AbstractProcessOperation { * * @param jars the jars * @return this operation instance + * @see #pluginsClasspath(Collection) */ public DokkaOperation pluginsClasspath(Collection jars) { pluginsClasspath_.addAll(jars); return this; } + /** + * Sets the jars for Dokka plugins and their dependencies. + * + * @param jars the jars + * @return this operation instance + * @see #pluginsClasspath(Path...) + */ + public DokkaOperation pluginsClasspathPaths(Collection jars) { + return pluginsClasspath(jars.stream().map(Path::toFile).toList()); + } + + /** + * Sets the jars for Dokka plugins and their dependencies. + * + * @param jars the jars + * @return this operation instance + * @see #pluginsClasspath(String...) + */ + public DokkaOperation pluginsClasspathStrings(Collection jars) { + return pluginsClasspath(jars.stream().map(File::new).toList()); + } + /** * Sets the configurations for a source set. *

diff --git a/src/main/java/rife/bld/extension/dokka/AnalysisPlatform.java b/src/main/java/rife/bld/extension/dokka/AnalysisPlatform.java index dd6ff1a..0f6c1a4 100644 --- a/src/main/java/rife/bld/extension/dokka/AnalysisPlatform.java +++ b/src/main/java/rife/bld/extension/dokka/AnalysisPlatform.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/rife/bld/extension/dokka/DocumentedVisibility.java b/src/main/java/rife/bld/extension/dokka/DocumentedVisibility.java index dae65a4..76e368c 100644 --- a/src/main/java/rife/bld/extension/dokka/DocumentedVisibility.java +++ b/src/main/java/rife/bld/extension/dokka/DocumentedVisibility.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/rife/bld/extension/dokka/LoggingLevel.java b/src/main/java/rife/bld/extension/dokka/LoggingLevel.java index b493e11..1cac7ae 100644 --- a/src/main/java/rife/bld/extension/dokka/LoggingLevel.java +++ b/src/main/java/rife/bld/extension/dokka/LoggingLevel.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/rife/bld/extension/dokka/OutputFormat.java b/src/main/java/rife/bld/extension/dokka/OutputFormat.java index 0d4a2c0..a1a5f37 100644 --- a/src/main/java/rife/bld/extension/dokka/OutputFormat.java +++ b/src/main/java/rife/bld/extension/dokka/OutputFormat.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/rife/bld/extension/dokka/SourceSet.java b/src/main/java/rife/bld/extension/dokka/SourceSet.java index 2b5f24a..a6336e7 100644 --- a/src/main/java/rife/bld/extension/dokka/SourceSet.java +++ b/src/main/java/rife/bld/extension/dokka/SourceSet.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,8 +19,12 @@ package rife.bld.extension.dokka; import rife.bld.extension.DokkaOperation; import java.io.File; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentSkipListMap; import java.util.stream.Collectors; /** @@ -29,15 +33,16 @@ import java.util.stream.Collectors; * @author Erik C. Thauvin * @since 1.0 */ +@SuppressWarnings("PMD.UseConcurrentHashMap") public class SourceSet { private final Collection classpath_ = new ArrayList<>(); - private final Map dependentSourceSets_ = new ConcurrentHashMap<>(); + private final Map dependentSourceSets_ = new ConcurrentSkipListMap<>(); private final Collection documentedVisibilities_ = new ArrayList<>(); - private final Map externalDocumentationLinks_ = new ConcurrentHashMap<>(); + private final Map externalDocumentationLinks_ = new ConcurrentSkipListMap<>(); private final Collection includes_ = new ArrayList<>(); private final Collection perPackageOptions_ = new ArrayList<>(); private final Collection samples_ = new ArrayList<>(); - private final Map srcLinks_ = new ConcurrentHashMap<>(); + private final Map srcLinks_ = new ConcurrentSkipListMap<>(); private final Collection src_ = new ArrayList<>(); private final Collection suppressedFiles_ = new ArrayList<>(); private AnalysisPlatform analysisPlatform_; @@ -83,8 +88,7 @@ public class SourceSet { * @return this operation instance */ public SourceSet apiVersion(int apiVersion) { - apiVersion_ = String.valueOf(apiVersion); - return this; + return apiVersion(String.valueOf(apiVersion)); } /** @@ -236,10 +240,10 @@ public class SourceSet { * * @param files one or more file * @return this operation instance + * @see #classpath(Collection) */ public SourceSet classpath(File... files) { - classpath_.addAll(List.of(files)); - return this; + return classpath(List.of(files)); } /** @@ -251,10 +255,25 @@ public class SourceSet { * * @param files one or more file * @return this operation instance + * @see #classpathStrings(Collection) */ public SourceSet classpath(String... files) { - classpath_.addAll(Arrays.stream(files).map(File::new).toList()); - return this; + return classpathStrings(List.of(files)); + } + + /** + * Sets classpath for analysis and interactive samples. + *

+ * This is useful if some types that come from dependencies are not resolved/picked up automatically. + *

+ * This option accepts both {@code .jar} and {@code .klib} files. + * + * @param files one or more file + * @return this operation instance + * @see #classpathPaths(Collection) + */ + public SourceSet classpath(Path... files) { + return classpathPaths(List.of(files)); } /** @@ -266,6 +285,7 @@ public class SourceSet { * * @param files the collection of files * @return this operation instance + * @see #classpath(File...) */ public SourceSet classpath(Collection files) { classpath_.addAll(files); @@ -281,6 +301,36 @@ public class SourceSet { return classpath_; } + /** + * Sets classpath for analysis and interactive samples. + *

+ * This is useful if some types that come from dependencies are not resolved/picked up automatically. + *

+ * This option accepts both {@code .jar} and {@code .klib} files. + * + * @param files the collection of files + * @return this operation instance + * @see #classpath(Path...) + */ + public SourceSet classpathPaths(Collection files) { + return classpath(files.stream().map(Path::toFile).toList()); + } + + /** + * Sets classpath for analysis and interactive samples. + *

+ * This is useful if some types that come from dependencies are not resolved/picked up automatically. + *

+ * This option accepts both {@code .jar} and {@code .klib} files. + * + * @param files the collection of files + * @return this operation instance + * @see #classpath(String...) + */ + public SourceSet classpathStrings(Collection files) { + return classpath(files.stream().map(File::new).toList()); + } + /** * Sets the names of dependent source sets. * @@ -402,10 +452,10 @@ public class SourceSet { * * @param files one or more files * @return this operation instance + * @see #includes(Collection) */ public SourceSet includes(File... files) { - includes_.addAll(List.of(files)); - return this; + return includes(List.of(files)); } /** @@ -418,12 +468,29 @@ public class SourceSet { * * @param files one or more files * @return this operation instance + * @see #classpathStrings(Collection) */ public SourceSet includes(String... files) { - includes_.addAll(Arrays.stream(files).map(File::new).toList()); - return this; + return includesStrings(List.of(files)); } + /** + * Sets the Markdown files that contain module and package documentation. + *

+ * The Markdown files that contain module and package documentation. + *

+ * The contents of the specified files are parsed and embedded into documentation as module and package + * descriptions. + * + * @param files one or more files + * @return this operation instance + * @see #classpathPaths(Collection) + */ + public SourceSet includes(Path... files) { + return includesPaths(List.of(files)); + } + + /** * Retrieves the Markdown files that contain module and package documentation. * @@ -443,12 +510,45 @@ public class SourceSet { * * @param files the collection of files * @return this operation instance + * @see #includes(File...) */ public SourceSet includes(Collection files) { includes_.addAll(files); return this; } + /** + * Sets the Markdown files that contain module and package documentation. + *

+ * The Markdown files that contain module and package documentation. + *

+ * The contents of the specified files are parsed and embedded into documentation as module and package + * descriptions. + * + * @param files the collection of files + * @return this operation instance + * @see #includes(Path...) + */ + public SourceSet includesPaths(Collection files) { + return includes(files.stream().map(Path::toFile).toList()); + } + + /** + * Sets the Markdown files that contain module and package documentation. + *

+ * The Markdown files that contain module and package documentation. + *

+ * The contents of the specified files are parsed and embedded into documentation as module and package + * descriptions. + * + * @param files the collection of files + * @return this operation instance + * @see #classpath(String...) + */ + public SourceSet includesStrings(Collection files) { + return includes(files.stream().map(File::new).toList()); + } + /** * Sets the version of JDK to use for linking to JDK Javadocs. *

@@ -465,6 +565,15 @@ public class SourceSet { return this; } + /** + * Retrieves the version of the JDK to use for linking to JDK Javadocs. + * + * @return the JDK version. + */ + public String jdkVersion() { + return jdkVersion_; + } + /** * Sets the version of JDK to use for linking to JDK Javadocs. *

@@ -477,8 +586,7 @@ public class SourceSet { * @return this operation instance */ public SourceSet jdkVersion(int jdkVersion) { - jdkVersion_ = String.valueOf(jdkVersion); - return this; + return jdkVersion(String.valueOf(jdkVersion)); } /** @@ -499,8 +607,7 @@ public class SourceSet { * @return this operation instance */ public SourceSet languageVersion(int languageVersion) { - languageVersion_ = String.valueOf(languageVersion); - return this; + return languageVersion(String.valueOf(languageVersion)); } /** @@ -602,8 +709,7 @@ public class SourceSet { * @return this operation instance */ public SourceSet perPackageOptions(String... perPackageOptions) { - perPackageOptions_.addAll(List.of(perPackageOptions)); - return this; + return perPackageOptions(List.of(perPackageOptions)); } /** @@ -632,6 +738,7 @@ public class SourceSet { * * @param samples the samples * @return this operation instance + * @see #samples(File...) */ public SourceSet samples(Collection samples) { samples_.addAll(samples); @@ -655,10 +762,10 @@ public class SourceSet { * * @param samples nne or more samples * @return this operation instance + * @see #samples(Collection) */ public SourceSet samples(File... samples) { - samples_.addAll(List.of(samples)); - return this; + return samples(List.of(samples)); } /** @@ -669,10 +776,52 @@ public class SourceSet { * * @param samples nne or more samples * @return this operation instance + * @see #samplesStrings(Collection) */ public SourceSet samples(String... samples) { - samples_.addAll(Arrays.stream(samples).map(File::new).toList()); - return this; + return samplesStrings(List.of(samples)); + } + + /** + * Set the directories or files that contain sample functions. + *

+ * The directories or files that contain sample functions which are referenced via the {@code @sample} KDoc + * tag. + * + * @param samples nne or more samples + * @return this operation instance + * @see #samplesPaths(Collection) + */ + public SourceSet samples(Path... samples) { + return samplesPaths(List.of(samples)); + } + + /** + * Set the directories or files that contain sample functions. + *

+ * The directories or files that contain sample functions which are referenced via the {@code @sample} KDoc + * tag. + * + * @param samples the samples + * @return this operation instance + * @see #samples(Path...) + */ + public SourceSet samplesPaths(Collection samples) { + return samples(samples.stream().map(Path::toFile).toList()); + } + + /** + * Set the directories or files that contain sample functions. + *

+ * The directories or files that contain sample functions which are referenced via the {@code @sample} KDoc + * tag. + * + * @param samples the samples + * @return this operation instance + * @see #samples(String...) + */ + public SourceSet samplesStrings(Collection samples) { + return samples(samples.stream().map(File::new).toList()); } /** @@ -709,6 +858,7 @@ public class SourceSet { * * @param src the source code roots * @return this operation instance + * @see #src(File...) */ public SourceSet src(Collection src) { src_.addAll(src); @@ -723,10 +873,10 @@ public class SourceSet { * * @param src pne ore moe source code roots * @return this operation instance + * @see #src(Collection) */ public SourceSet src(File... src) { - src_.addAll(List.of(src)); - return this; + return src(List.of(src)); } /** @@ -737,10 +887,24 @@ public class SourceSet { * * @param src pne ore moe source code roots * @return this operation instance + * @see #srcStrings(Collection) */ public SourceSet src(String... src) { - src_.addAll(Arrays.stream(src).map(File::new).toList()); - return this; + return srcStrings(List.of(src)); + } + + /** + * Sets the source code roots to be analyzed and documented. + *

+ * The source code roots to be analyzed and documented. Acceptable inputs are directories and individual + * {@code .kt} / {@code .java} files. + * + * @param src pne ore moe source code roots + * @return this operation instance + * @see #srcPaths(Collection) + */ + public SourceSet src(Path... src) { + return srcPaths(List.of(src)); } /** @@ -774,8 +938,19 @@ public class SourceSet { * @return this operation instance */ public SourceSet srcLink(File srcPath, String remotePath, String lineSuffix) { - srcLinks_.put(srcPath.getAbsolutePath(), remotePath + lineSuffix); - return this; + return srcLink(srcPath.getAbsolutePath(), remotePath, lineSuffix); + } + + /** + * Sets the mapping between a source directory and a Web service for browsing the code. + * + * @param srcPath the source path + * @param remotePath the remote path + * @param lineSuffix the line suffix + * @return this operation instance + */ + public SourceSet srcLink(Path srcPath, String remotePath, String lineSuffix) { + return srcLink(srcPath.toFile().getAbsolutePath(), remotePath, lineSuffix); } /** @@ -787,6 +962,34 @@ public class SourceSet { return srcLinks_; } + /** + * Sets the source code roots to be analyzed and documented. + *

+ * The source code roots to be analyzed and documented. Acceptable inputs are directories and individual + * {@code .kt} / {@code .java} files. + * + * @param src the source code roots + * @return this operation instance + * @see #src(Path...) + */ + public SourceSet srcPaths(Collection src) { + return src(src.stream().map(Path::toFile).toList()); + } + + /** + * Sets the source code roots to be analyzed and documented. + *

+ * The source code roots to be analyzed and documented. Acceptable inputs are directories and individual + * {@code .kt} / {@code .java} files. + * + * @param src the source code roots + * @return this operation instance + * @see #src(String...) + */ + public SourceSet srcStrings(Collection src) { + return src(src.stream().map(File::new).toList()); + } + /** * Sets the paths to files to be suppressed. *

@@ -794,13 +997,13 @@ public class SourceSet { * * @param suppressedFiles the suppressed files * @return this operation instance + * @see #suppressedFiles(File...) */ public SourceSet suppressedFiles(Collection suppressedFiles) { suppressedFiles_.addAll(suppressedFiles); return this; } - /** * Retrieves the paths to files to be suppressed. * @@ -817,10 +1020,10 @@ public class SourceSet { * * @param suppressedFiles one or moe suppressed files * @return this operation instance + * @see #suppressedFilesStrings(Collection) */ public SourceSet suppressedFiles(String... suppressedFiles) { - suppressedFiles_.addAll(Arrays.stream(suppressedFiles).map(File::new).toList()); - return this; + return suppressedFilesStrings(List.of(suppressedFiles)); } /** @@ -830,9 +1033,48 @@ public class SourceSet { * * @param suppressedFiles one or moe suppressed files * @return this operation instance + * @see #suppressedFiles(Collection) */ public SourceSet suppressedFiles(File... suppressedFiles) { - suppressedFiles_.addAll(List.of(suppressedFiles)); - return this; + return suppressedFiles(List.of(suppressedFiles)); + } + + /** + * Sets the paths to files to be suppressed. + *

+ * The files to be suppressed when generating documentation. + * + * @param suppressedFiles one or moe suppressed files + * @return this operation instance + * @see #suppressedFilesPaths(Collection) + */ + public SourceSet suppressedFiles(Path... suppressedFiles) { + return suppressedFilesPaths(List.of(suppressedFiles)); + } + + /** + * Sets the paths to files to be suppressed. + *

+ * The files to be suppressed when generating documentation. + * + * @param suppressedFiles the suppressed files + * @return this operation instance + * @see #suppressedFiles(Path...) + */ + public SourceSet suppressedFilesPaths(Collection suppressedFiles) { + return suppressedFiles(suppressedFiles.stream().map(Path::toFile).toList()); + } + + /** + * Sets the paths to files to be suppressed. + *

+ * The files to be suppressed when generating documentation. + * + * @param suppressedFiles the suppressed files + * @return this operation instance + * @see #suppressedFiles(String...) + */ + public SourceSet suppressedFilesStrings(Collection suppressedFiles) { + return suppressedFiles(suppressedFiles.stream().map(File::new).toList()); } } diff --git a/src/test/java/rife/bld/extension/DokkaOperationTest.java b/src/test/java/rife/bld/extension/DokkaOperationTest.java index 11c2bca..cea3975 100644 --- a/src/test/java/rife/bld/extension/DokkaOperationTest.java +++ b/src/test/java/rife/bld/extension/DokkaOperationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,11 @@ package rife.bld.extension; +import org.assertj.core.api.AutoCloseableSoftAssertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledOnOs; +import org.junit.jupiter.api.condition.OS; import rife.bld.blueprints.BaseProjectBlueprint; import rife.bld.extension.dokka.LoggingLevel; import rife.bld.extension.dokka.OutputFormat; @@ -27,6 +30,7 @@ import rife.bld.operations.exceptions.ExitStatusException; import java.io.File; import java.io.IOException; import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; import java.util.List; @@ -67,6 +71,7 @@ class DokkaOperationTest { } @Test + @EnabledOnOs(OS.LINUX) void executeConstructProcessCommandListTest() throws IOException { var args = Files.readAllLines(Paths.get("src", "test", "resources", "dokka-args.txt")); @@ -76,7 +81,7 @@ class DokkaOperationTest { var op = new DokkaOperation() .delayTemplateSubstitution(true) .failOnWarning(true) - .fromProject(new BaseProjectBlueprint(EXAMPLES, "com.example", "Example")) + .fromProject(new BaseProjectBlueprint(EXAMPLES, "com.example", "example", "Example")) .globalLinks("s", "gLink1") .globalLinks(Map.of("s2", "gLink2")) .globalPackageOptions(OPTION_1, OPTION_2) @@ -106,27 +111,31 @@ class DokkaOperationTest { ))) .suppressInheritedMembers(true); - assertThat(op.globalLinks()).as("globalLinks").hasSize(2); - assertThat(op.globalPackageOptions()).as("globalPackageOptions").hasSize(4); - assertThat(op.globalSrcLink()).as("globalSrcLink").hasSize(4); - assertThat(op.includes()).as("includes").hasSize(4); - assertThat(op.pluginConfigurations()).as("pluginConfigurations").hasSize(3); - assertThat(op.pluginsClasspath()).as("pluginsClasspath").hasSize(9); + try (var softly = new AutoCloseableSoftAssertions()) { + softly.assertThat(op.globalLinks()).as("globalLinks").hasSize(2); + softly.assertThat(op.globalPackageOptions()).as("globalPackageOptions").hasSize(4); + softly.assertThat(op.globalSrcLink()).as("globalSrcLink").hasSize(4); + softly.assertThat(op.includes()).as("includes").hasSize(4); + softly.assertThat(op.pluginConfigurations()).as("pluginConfigurations").hasSize(3); + softly.assertThat(op.pluginsClasspath()).as("pluginsClasspath").hasSize(9); + } var params = op.executeConstructProcessCommandList(); - for (var p : args) { - var found = false; - for (var a : params) { - if (a.startsWith(p)) { - found = true; - break; + try (var softly = new AutoCloseableSoftAssertions()) { + for (var p : args) { + var found = false; + for (var a : params) { + if (a.startsWith(p)) { + found = true; + break; + } } + softly.assertThat(found).as(p + " not found.").isTrue(); } - assertThat(found).as(p + " not found.").isTrue(); } var path = EXAMPLES.getAbsolutePath(); - var dokkaJar = "1.9.20.jar"; + var dokkaJar = "2.0.0.jar"; var matches = List.of("java", "-cp", path + "/lib/bld/dokka-cli-" + dokkaJar, "org.jetbrains.dokka.MainKt", @@ -156,14 +165,17 @@ class DokkaOperationTest { assertThat(params).hasSize(matches.size()); - IntStream.range(0, params.size()).forEach(i -> { - if (params.get(i).contains(".jar;")) { - var jars = params.get(i).split(";"); - Arrays.stream(jars).forEach(jar -> assertThat(matches.get(i)).as(matches.get(i)).contains(jar)); - } else { - assertThat(params.get(i)).as(params.get(i)).isEqualTo(matches.get(i)); - } - }); + try (var softly = new AutoCloseableSoftAssertions()) { + IntStream.range(0, params.size()).forEach(i -> { + if (params.get(i).contains(".jar;")) { + var jars = params.get(i).split(";"); + Arrays.stream(jars).forEach(jar -> + softly.assertThat(matches.get(i)).as(matches.get(i)).contains(jar)); + } else { + softly.assertThat(params.get(i)).as(params.get(i)).isEqualTo(matches.get(i)); + } + }); + } } @Test @@ -176,9 +188,99 @@ class DokkaOperationTest { void executeTest() { var op = new DokkaOperation() .fromProject( - new BaseProjectBlueprint(EXAMPLES, "com.example", "examples")) + new BaseProjectBlueprint(EXAMPLES, "com.example", "examples", "Examples")) .outputDir("build/javadoc") .outputFormat(OutputFormat.JAVADOC); assertThatCode(op::execute).doesNotThrowAnyException(); } + + @Test + void includesTest() { + var op = new DokkaOperation(); + + op.includes(List.of(new File(FILE_1), new File(FILE_2))); + assertThat(op.includes()).as("List(File...)").containsExactly(new File(FILE_1), new File(FILE_2)); + op.includes().clear(); + + op.includes(new File(FILE_1), new File(FILE_2)); + assertThat(op.includes()).as("File...").containsExactly(new File(FILE_1), new File(FILE_2)); + op.includes().clear(); + + op.includes(FILE_1, FILE_2); + assertThat(op.includes()).as("String...") + .containsExactly(new File(FILE_1), new File(FILE_2)); + op.includes().clear(); + + op = op.includes(Path.of(FILE_1), Path.of(FILE_2)); + assertThat(op.includes()).as("Path...") + .containsExactly(new File(FILE_1), new File(FILE_2)); + op.includes().clear(); + + op.includesPaths(List.of(new File(FILE_1).toPath(), new File(FILE_2).toPath())); + assertThat(op.includes()).as("List(Path...)").containsExactly(new File(FILE_1), new File(FILE_2)); + op.includes().clear(); + + op.includesStrings(List.of(FILE_1, FILE_2)); + assertThat(op.includes()).as("List(String...)").containsExactly(new File(FILE_1), new File(FILE_2)); + op.includes().clear(); + } + + @Test + void jsonTest() { + var file1 = new File(FILE_1); + var op = new DokkaOperation().json(file1); + assertThat(op.json()).isEqualTo(file1); + + var file2 = Path.of(FILE_2); + op = op.json(file2); + assertThat(op.json()).isEqualTo(file2.toFile()); + + op = op.json(FILE_3); + assertThat(op.json()).isEqualTo(new File(FILE_3)); + } + + @Test + void outputDirTest() { + var javadoc = "build/javadoc"; + var op = new DokkaOperation().outputDir(javadoc); + assertThat(op.outputDir()).isEqualTo(new File(javadoc)); + + var build = "build"; + op = op.outputDir(Path.of(build)); + assertThat(op.outputDir()).isEqualTo(new File(build)); + + op = op.outputDir(new File(javadoc)); + assertThat(op.outputDir()).isEqualTo(new File(javadoc)); + } + + @Test + void pluginClasspathTest() { + var op = new DokkaOperation(); + + op.pluginsClasspath(List.of(new File(FILE_1), new File(FILE_2))); + assertThat(op.pluginsClasspath()).as("List(File...)").containsExactly(new File(FILE_1), new File(FILE_2)); + op.pluginsClasspath().clear(); + + op.pluginsClasspath(new File(FILE_1), new File(FILE_2)); + assertThat(op.pluginsClasspath()).as("File...").containsExactly(new File(FILE_1), new File(FILE_2)); + op.pluginsClasspath().clear(); + + op.pluginsClasspath(FILE_1, FILE_2); + assertThat(op.pluginsClasspath()).as("String...") + .containsExactly(new File(FILE_1), new File(FILE_2)); + op.pluginsClasspath().clear(); + + op = op.pluginsClasspath(Path.of(FILE_1), Path.of(FILE_2)); + assertThat(op.pluginsClasspath()).as("Path...") + .containsExactly(new File(FILE_1), new File(FILE_2)); + op.pluginsClasspath().clear(); + + op.pluginsClasspathPaths(List.of(new File(FILE_1).toPath(), new File(FILE_2).toPath())); + assertThat(op.pluginsClasspath()).as("List(Path...)").containsExactly(new File(FILE_1), new File(FILE_2)); + op.pluginsClasspath().clear(); + + op.pluginsClasspathStrings(List.of(FILE_1, FILE_2)); + assertThat(op.pluginsClasspath()).as("List(String...)").containsExactly(new File(FILE_1), new File(FILE_2)); + op.pluginsClasspath().clear(); + } } diff --git a/src/test/java/rife/bld/extension/TestUtils.java b/src/test/java/rife/bld/extension/TestUtils.java index 832d549..5c164bc 100644 --- a/src/test/java/rife/bld/extension/TestUtils.java +++ b/src/test/java/rife/bld/extension/TestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/rife/bld/extension/dokka/SourceSetTest.java b/src/test/java/rife/bld/extension/dokka/SourceSetTest.java index 95453c4..f6fd76e 100644 --- a/src/test/java/rife/bld/extension/dokka/SourceSetTest.java +++ b/src/test/java/rife/bld/extension/dokka/SourceSetTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,13 @@ package rife.bld.extension.dokka; +import org.assertj.core.api.AutoCloseableSoftAssertions; import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; import java.util.Map; @@ -29,6 +31,7 @@ import java.util.stream.IntStream; import static org.assertj.core.api.Assertions.assertThat; import static rife.bld.extension.TestUtils.localPath; +@SuppressWarnings("PMD.AvoidDuplicateLiterals") class SourceSetTest { private static final String CLASSPATH_1 = "classpath1"; private static final String CLASSPATH_2 = "classpath2"; @@ -40,6 +43,7 @@ class SourceSetTest { private static final String OPTION_2 = "option2"; private static final String PATH_1 = "path1"; private static final String PATH_2 = "path2"; + private static final String PATH_3 = "path3"; private static final String SAMPLES_1 = "samples1"; private static final String SAMPLES_2 = "samples2"; private static final String SAMPLES_3 = "samples3"; @@ -51,6 +55,104 @@ class SourceSetTest { private static final String SUP_2 = "sup2"; private static final String SUP_3 = "sup3"; + @Test + void classpathTest() { + var args = new SourceSet(); + + args.classpath(new File(CLASSPATH_1), new File(CLASSPATH_2)); + assertThat(args.classpath()).as("File...").containsExactly(new File(CLASSPATH_1), new File(CLASSPATH_2)); + args.classpath().clear(); + + args = args.classpath(Path.of(CLASSPATH_1), Path.of(CLASSPATH_2)); + assertThat(args.classpath()).as("Path...") + .containsExactly(new File(CLASSPATH_1), new File(CLASSPATH_2)); + args.classpath().clear(); + + args.classpath(CLASSPATH_1, CLASSPATH_2); + assertThat(args.classpath()).as("String...") + .containsExactly(new File(CLASSPATH_1), new File(CLASSPATH_2)); + args.classpath().clear(); + + args.classpath(List.of(new File(CLASSPATH_1), new File(CLASSPATH_2))); + assertThat(args.classpath()).as("File(List...)").containsExactly(new File(CLASSPATH_1), new File(CLASSPATH_2)); + args.classpath().clear(); + + args.classpathPaths(List.of(new File(CLASSPATH_1).toPath(), new File(CLASSPATH_2).toPath())); + assertThat(args.classpath()).as("List(Path...)").containsExactly(new File(CLASSPATH_1), new File(CLASSPATH_2)); + args.classpath().clear(); + + args.classpathStrings(List.of(CLASSPATH_1, CLASSPATH_2)); + assertThat(args.classpath()).as("List(String...)").containsExactly(new File(CLASSPATH_1), new File(CLASSPATH_2)); + args.classpath().clear(); + } + + @Test + void includesTest() { + var args = new SourceSet(); + + args.includes(new File(INCLUDES_1), new File(INCLUDES_2)); + assertThat(args.includes()).as("File...").containsExactly(new File(INCLUDES_1), new File(INCLUDES_2)); + args.includes().clear(); + + args = args.includes(Path.of(INCLUDES_1), Path.of(INCLUDES_2)); + assertThat(args.includes()).as("Path...").containsExactly(new File(INCLUDES_1), new File(INCLUDES_2)); + args.includes().clear(); + + args.includes(INCLUDES_1, INCLUDES_2); + assertThat(args.includes()).as("String...").containsExactly(new File(INCLUDES_1), new File(INCLUDES_2)); + args.includes().clear(); + + args.includes(List.of(new File(INCLUDES_1), new File(INCLUDES_2))); + assertThat(args.includes()).as("List(File...)").containsExactly(new File(INCLUDES_1), new File(INCLUDES_2)); + args.includes().clear(); + + args.includesPaths(List.of(new File(INCLUDES_1).toPath(), new File(INCLUDES_2).toPath())); + assertThat(args.includes()).as("List(Path...)").containsExactly(new File(INCLUDES_1), new File(INCLUDES_2)); + args.includes().clear(); + + args.includesStrings(List.of(INCLUDES_1, INCLUDES_2)); + assertThat(args.includes()).as("List(String...)").containsExactly(new File(INCLUDES_1), new File(INCLUDES_2)); + args.includes().clear(); + } + + @Test + void jdkVersionTest() { + var args = new SourceSet().jdkVersion("22"); + assertThat(args.jdkVersion()).isEqualTo("22"); + args = args.jdkVersion(19); + assertThat(args.jdkVersion()).isEqualTo("19"); + } + + @Test + void samplesTest() { + var args = new SourceSet(); + args.samples(new File(SAMPLES_1), new File(SAMPLES_2)); + assertThat(args.samples()).as("File...").containsExactly(new File(SAMPLES_1), new File(SAMPLES_2)); + args.samples().clear(); + + args = args.samples(Path.of(SAMPLES_1), Path.of(SAMPLES_2)); + assertThat(args.samples()).as("Path...") + .containsExactly(new File(SAMPLES_1), new File(SAMPLES_2)); + args.samples().clear(); + + args.samples(SAMPLES_1, SAMPLES_2); + assertThat(args.samples()).as("String...") + .containsExactly(new File(SAMPLES_1), new File(SAMPLES_2)); + args.samples().clear(); + + args.samples(List.of(new File(SAMPLES_1), new File(SAMPLES_2))); + assertThat(args.samples()).as("List(File...)").containsExactly(new File(SAMPLES_1), new File(SAMPLES_2)); + args.samples().clear(); + + args.samplesPaths(List.of(new File(SAMPLES_1).toPath(), new File(SAMPLES_2).toPath())); + assertThat(args.samples()).as("List(Path...)").containsExactly(new File(SAMPLES_1), new File(SAMPLES_2)); + args.samples().clear(); + + args.samplesStrings(List.of(SAMPLES_1, SAMPLES_2)); + assertThat(args.samples()).as("List(String...)").containsExactly(new File(SAMPLES_1), new File(SAMPLES_2)); + args.samples().clear(); + } + @Test void sourceSetCollectionsTest() { var args = new SourceSet() @@ -69,7 +171,7 @@ class SourceSetTest { var matches = List.of( "-classpath", localPath(PATH_1, PATH_2), "-dependentSourceSets", "set1/set2;set3/set4", - "-externalDocumentationLinks", "link3^link4^^link1^link2", + "-externalDocumentationLinks", "link1^link2^^link3^link4", "-perPackageOptions", OPTION_1 + ';' + OPTION_2, "-samples", localPath(SAMPLES_1, SAMPLES_2, SAMPLES_3), "-suppressedFiles", localPath(SUP_1, SUP_2, SUP_3) @@ -121,30 +223,35 @@ class SourceSetTest { .src(List.of(new File(SRC_4))) .srcLink(PATH_1, "remote1", "#suffix1") .srcLink(new File(PATH_2), "remote2", "#suffix2") + .srcLink(Path.of(PATH_3), "remote3", "#suffix3") .suppressedFiles(SUP_1, SUP_2); - assertThat(sourceSet.classpath()).as("classpath").hasSize(2); - assertThat(sourceSet.dependentSourceSets()).as("dependentSourceSets").hasSize(2); - assertThat(sourceSet.documentedVisibilities()).as("documentedVisibilities").hasSize(2); - assertThat(sourceSet.externalDocumentationLinks()).as("externalDocumentationLinks").hasSize(2); - assertThat(sourceSet.includes()).as("includes").hasSize(4); - assertThat(sourceSet.perPackageOptions()).as("perPackageOptions").hasSize(2); - assertThat(sourceSet.samples()).as("samples").hasSize(2); - assertThat(sourceSet.src()).as("src").hasSize(4); - assertThat(sourceSet.srcLinks()).as("srcLinks").hasSize(2); - assertThat(sourceSet.suppressedFiles()).as("suppressedFiles").hasSize(2); + try (var softly = new AutoCloseableSoftAssertions()) { + softly.assertThat(sourceSet.classpath()).as("classpath").hasSize(2); + softly.assertThat(sourceSet.dependentSourceSets()).as("dependentSourceSets").hasSize(2); + softly.assertThat(sourceSet.documentedVisibilities()).as("documentedVisibilities").hasSize(2); + softly.assertThat(sourceSet.externalDocumentationLinks()).as("externalDocumentationLinks").hasSize(2); + softly.assertThat(sourceSet.includes()).as("includes").hasSize(4); + softly.assertThat(sourceSet.perPackageOptions()).as("perPackageOptions").hasSize(2); + softly.assertThat(sourceSet.samples()).as("samples").hasSize(2); + softly.assertThat(sourceSet.src()).as("src").hasSize(4); + softly.assertThat(sourceSet.srcLinks()).as("srcLinks").hasSize(3); + softly.assertThat(sourceSet.suppressedFiles()).as("suppressedFiles").hasSize(2); + } var params = sourceSet.args(); - for (var p : args) { - var found = false; - for (var a : params) { - if (a.startsWith(p)) { - found = true; - break; + try (var softly = new AutoCloseableSoftAssertions()) { + for (var p : args) { + var found = false; + for (var a : params) { + if (a.startsWith(p)) { + found = true; + break; + } } + softly.assertThat(found).as(p + " not found.").isTrue(); } - assertThat(found).as(p + " not found.").isTrue(); } var matches = List.of( @@ -166,7 +273,8 @@ class SourceSetTest { "-samples", localPath(SAMPLES_1, SAMPLES_2), "-skipDeprecated", "-src", localPath(SRC_1, SRC_2, SRC_3, SRC_4), - "-srcLink", localPath(PATH_2) + "=remote2#suffix2;path1=remote1#suffix1", + "-srcLink", localPath(PATH_2) + "=remote2#suffix2;" + localPath(PATH_3) + "=remote3#suffix3;" + + "path1=remote1#suffix1", "-sourceSetName", "setName", "-suppressedFiles", localPath(SUP_1, SUP_2)); @@ -179,4 +287,67 @@ class SourceSetTest { IntStream.range(0, params.size()).forEach(i -> assertThat(params.get(i)).isEqualTo(matches.get(i))); } + + @Test + void srcTest() { + var src = "src"; + var main = "src/main"; + var test = "src/test"; + var srcFile = new File(src); + var mainFile = new File(main); + var testFile = new File(test); + + var args = new SourceSet().src(src, main); + assertThat(args.src()).as("String...").containsExactly(srcFile, mainFile); + args.src().clear(); + + args = new SourceSet().srcStrings(List.of(src, main)); + assertThat(args.src()).as("List(String...)").containsExactly(srcFile, mainFile); + args.src().clear(); + + args = args.src(srcFile.toPath(), mainFile.toPath()); + assertThat(args.src()).as("Path...").containsExactly(srcFile, mainFile); + args.src().clear(); + + args = args.srcPaths(List.of(srcFile.toPath(), testFile.toPath())); + assertThat(args.src()).as("List(Path...)").containsExactly(srcFile, testFile); + args.src().clear(); + + args = args.src(srcFile, mainFile); + assertThat(args.src()).as("File...").containsExactly(srcFile, mainFile); + args.src().clear(); + + args = args.src(List.of(srcFile, mainFile)); + assertThat(args.src()).as("List(File...)").containsExactly(srcFile, mainFile); + args.src().clear(); + } + + @Test + void suppressedFilesTest() { + var args = new SourceSet(); + + args.suppressedFiles(new File(SAMPLES_1), new File(SAMPLES_2)); + assertThat(args.suppressedFiles()).as("File...").containsExactly(new File(SAMPLES_1), new File(SAMPLES_2)); + args.suppressedFiles().clear(); + + args = args.suppressedFiles(Path.of(SAMPLES_1), Path.of(SAMPLES_2)); + assertThat(args.suppressedFiles()).as("Path...").containsExactly(new File(SAMPLES_1), new File(SAMPLES_2)); + args.suppressedFiles().clear(); + + args.suppressedFiles(SAMPLES_1, SAMPLES_2); + assertThat(args.suppressedFiles()).as("String...").containsExactly(new File(SAMPLES_1), new File(SAMPLES_2)); + args.suppressedFiles().clear(); + + args.suppressedFiles(List.of(new File(SAMPLES_1), new File(SAMPLES_2))); + assertThat(args.suppressedFiles()).as("List(File...)").containsExactly(new File(SAMPLES_1), new File(SAMPLES_2)); + args.suppressedFiles().clear(); + + args.suppressedFilesPaths(List.of(new File(SAMPLES_1).toPath(), new File(SAMPLES_2).toPath())); + assertThat(args.suppressedFiles()).as("List(Path...)").containsExactly(new File(SAMPLES_1), new File(SAMPLES_2)); + args.suppressedFiles().clear(); + + args.suppressedFilesStrings(List.of(SAMPLES_1, SAMPLES_2)); + assertThat(args.suppressedFiles()).as("List(String...)").containsExactly(new File(SAMPLES_1), new File(SAMPLES_2)); + args.suppressedFiles().clear(); + } }