checkcliargs.sh

@@ -3,15 +3,12 @@
 TMPNEW=/tmp/checkcliargs-new
 TMPOLD=/tmp/checkcliargs-old
 
-java -cp "lib/compile/*" -jar lib/compile/dokka-cli-*.jar -h >$TMPNEW
+cd lib/compile
-java -cp "/examples/lib/bld*" -jar examples/lib/bld/dokka-cli-*.jar -h >$TMPOLD
+java -cp "*" -jar dokka-cli-*.jar -h >$TMPNEW
+
+cd ../../examples/lib/bld
+java -cp "*" -jar dokka-cli-*.jar -h >$TMPOLD
 
 diff $TMPOLD $TMPNEW
 
-java -cp "lib/compile/*" -jar lib/compile/dokka-cli-*.jar -sourceSet -h >$TMPNEW
-java -cp "/examples/lib/bld*" -jar examples/lib/bld/dokka-cli-*.jar -sourceSet -h >$TMPOLD
-
-diff $TMPOLD $TMPNEW
-
-
 rm -rf $TMPNEW $TMPOLD

src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java

@@ -56,7 +56,7 @@ public class CompileKotlinOperationBuild extends Project {
         scope(test)
                 .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2)))
                 .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2)))
-                .include(dependency("org.assertj", "assertj-core", version(3, 26, 0)));
+                .include(dependency("org.assertj", "assertj-core", version(3, 25, 3)));
 
         javadocOperation()
                 .javadocOptions()

src/main/java/rife/bld/extension/dokka/DokkaOperation.java

@@ -54,7 +54,6 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
     private final Map<String, String> pluginsConfiguration_ = new ConcurrentHashMap<>();
     private boolean delayTemplateSubstitution_;
     private boolean failOnWarning_;
-    private File json;
     private LoggingLevel loggingLevel_;
     private String moduleName_;
     private String moduleVersion_;
@@ -217,11 +216,6 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
             args.add("-suppressInheritedMembers");
         }
 
-        // json
-        if (json != null) {
-            args.add(json.getAbsolutePath());
-        }
-
         if (LOGGER.isLoggable(Level.FINE)) {
             LOGGER.fine(String.join(" ", args));
         }
@@ -387,16 +381,6 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
         return this;
     }
 
-    /**
-     * JSON configuration file path.
-     *
-     * @param configuration the configuration file path
-     */
-    public DokkaOperation json(File configuration) {
-        json = configuration;
-        return this;
-    }
-
     /**
      * Sets the logging level.
      *

src/test/java/rife/bld/extension/dokka/DokkaOperationTest.java

@@ -31,25 +31,7 @@ class DokkaOperationTest {
     @Test
     @SuppressWarnings({"ExtractMethodRecommender", "PMD.AvoidDuplicateLiterals"})
     void executeConstructProcessCommandListTest() {
-        var params = List.of(
-                "-moduleName",
-                "-moduleVersion",
-                "-outputDir",
-                "-sourceSet",
-                "-pluginsConfiguration",
-                "-pluginsClasspath",
-                "-offlineMode",
-                "-failOnWarning",
-                "-delayTemplateSubstitution",
-                "-noSuppressObviousFunctions",
-                "-includes",
-                "-suppressInheritedMembers",
-                "-globalPackageOptions",
-                "-globalLinks",
-                "-globalSrcLink",
-                "-loggingLevel");
         var examples = new File("examples");
-        var jsonConf = new File("config.json");
         var args = new DokkaOperation()
                 .fromProject(new BaseProjectBlueprint(examples, "com.example", "Example"))
                 .globalLinks("s", "link")
@@ -59,7 +41,6 @@ class DokkaOperationTest {
                 .globalSrcLink("link1", "link2")
                 .globalSrcLink(List.of("link3", "link4"))
                 .includes("file1", "file2")
-                .includes(List.of("file3", "file4"))
                 .pluginConfigurations("name", "{\"json\"}")
                 .pluginConfigurations(Map.of("{\"name2\"}", "json2", "name3}", "{json3"))
                 .pluginsClasspath("path1", "path2")
@@ -79,20 +60,8 @@ class DokkaOperationTest {
                                 new File("examples/foo.jar"),
                                 new File("examples/bar.jar")
                         )))
-                .json(jsonConf)
                 .executeConstructProcessCommandList();
 
-        for (var p : params) {
-            var found = false;
-            for (var a : args) {
-                if (a.startsWith(p)) {
-                    found = true;
-                    break;
-                }
-            }
-            assertThat(found).as(p + " not found.").isTrue();
-        }
-
         var path = examples.getAbsolutePath();
         var dokkaJar = "1.9.20.jar";
         var matches = List.of("java",
@@ -109,15 +78,14 @@ class DokkaOperationTest {
                 "-globalLinks", "s^link^^s2^link2",
                 "-globalPackageOptions", "option1;option2;option3;option4",
                 "-globalSrcLinks_", "link1;link2;link3;link4",
-                "-includes", "file1;file2;file3;file4",
+                "-includes", "file1;file2",
                 "-loggingLevel", "debug",
                 "-moduleName", "name",
                 "-moduleVersion", "1.0",
                 "-noSuppressObviousFunctions",
                 "-offlineMode",
                 "-pluginsConfiguration", "{\\\"name2\\\"}={json2}^^{name}={\\\"json\\\"}^^{name3}}={{json3}",
-                "-suppressInheritedMembers",
+                "-suppressInheritedMembers");
-                jsonConf.getAbsolutePath());
 
         assertThat(args).hasSize(matches.size());
 

src/test/java/rife/bld/extension/dokka/SourceSetTest.java

@@ -53,29 +53,6 @@ class SourceSetTest {
     @Test
     @SuppressWarnings("PMD.AvoidDuplicateLiterals")
     void sourceSetTest() {
-        var params = List.of(
-                "-sourceSetName",
-                "-displayName",
-                "-classpath",
-                "-src",
-                "-dependentSourceSets",
-                "-samples",
-                "-includes",
-                "-documentedVisibilities",
-                "-reportUndocumented",
-                "-noSkipEmptyPackages",
-                "-skipDeprecated",
-                "-jdkVersion",
-                "-languageVersion",
-                "-apiVersion",
-                "-noStdlibLink",
-                "-noJdkLink",
-                "-suppressedFiles",
-                "-analysisPlatform",
-                "-perPackageOptions",
-                "-externalDocumentationLinks",
-                "-srcLink"
-        );
         var sourceSet = new SourceSet()
                 .classpath("classpath1", "classpath2")
                 .dependentSourceSets("moduleName", "sourceSetName")
@@ -103,17 +80,6 @@ class SourceSetTest {
 
         var args = sourceSet.args();
 
-        for (var p : params) {
-            var found = false;
-            for (var a : args) {
-                if (a.startsWith(p)) {
-                    found = true;
-                    break;
-                }
-            }
-            assertThat(found).as(p + " not found.").isTrue();
-        }
-
         var matches = List.of(
                 "-analysisPlatform", "jvm",
                 "-apiVersion", "1.0",