From 84c2474ffc23e73f99a871f66ed50ccdbe912a61 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 19 May 2024 02:35:39 -0700 Subject: [PATCH 1/2] Fixed boolean-type functions producing invalid parameters. Closes #1 --- examples/src/bld/java/com/example/ExampleBuild.java | 1 + .../java/rife/bld/extension/dokka/DokkaOperation.java | 5 ----- .../rife/bld/extension/dokka/DokkaOperationTest.java | 10 +++++----- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/examples/src/bld/java/com/example/ExampleBuild.java b/examples/src/bld/java/com/example/ExampleBuild.java index d4ef292..71edf27 100644 --- a/examples/src/bld/java/com/example/ExampleBuild.java +++ b/examples/src/bld/java/com/example/ExampleBuild.java @@ -111,6 +111,7 @@ public class ExampleBuild extends Project { public void javadoc() throws ExitStatusException, IOException, InterruptedException { new DokkaOperation() .fromProject(this) + .failOnWarning(true) .loggingLevel(LoggingLevel.INFO) // Create build/javadoc .outputDir(new File(buildDirectory(), "javadoc")) diff --git a/src/main/java/rife/bld/extension/dokka/DokkaOperation.java b/src/main/java/rife/bld/extension/dokka/DokkaOperation.java index 0b0936e..6d51006 100644 --- a/src/main/java/rife/bld/extension/dokka/DokkaOperation.java +++ b/src/main/java/rife/bld/extension/dokka/DokkaOperation.java @@ -131,13 +131,11 @@ public class DokkaOperation extends AbstractProcessOperation { // -delayTemplateSubstitution if (delayTemplateSubstitution_) { args.add("-delayTemplateSubstitution"); - args.add(String.valueOf(delayTemplateSubstitution_)); } // -failOnWarning if (failOnWarning_) { args.add("-failOnWarning"); - args.add(String.valueOf(failOnWarning_)); } // -globalLinks_ @@ -188,13 +186,11 @@ public class DokkaOperation extends AbstractProcessOperation { // -noSuppressObviousFunctions if (noSuppressObviousFunctions_) { args.add("-noSuppressObviousFunctions"); - args.add(String.valueOf(noSuppressObviousFunctions_)); } // -offlineMode if (offlineMode_) { args.add("-offlineMode"); - args.add(String.valueOf(offlineMode_)); } // -pluginConfiguration @@ -209,7 +205,6 @@ public class DokkaOperation extends AbstractProcessOperation { // -suppressInheritedMembers if (suppressInheritedMembers_) { args.add("-suppressInheritedMembers"); - args.add(String.valueOf(suppressInheritedMembers_)); } if (LOGGER.isLoggable(Level.FINE)) { diff --git a/src/test/java/rife/bld/extension/dokka/DokkaOperationTest.java b/src/test/java/rife/bld/extension/dokka/DokkaOperationTest.java index fbdac6d..864d6fa 100644 --- a/src/test/java/rife/bld/extension/dokka/DokkaOperationTest.java +++ b/src/test/java/rife/bld/extension/dokka/DokkaOperationTest.java @@ -68,8 +68,8 @@ class DokkaOperationTest { path + "/lib/bld/kotlin-as-java-plugin-" + dokkaJar + ";path1;path2;path3;path4", "-sourceSet", "-src " + path + "/src/main/kotlin", "-outputDir", path + "/build", - "-delayTemplateSubstitution", "true", - "-failOnWarning", "true", + "-delayTemplateSubstitution", + "-failOnWarning", "-globalLinks", "s^link^^s2^link2", "-globalPackageOptions", "option1;option2;option3;option4", "-globalSrcLinks_", "link1;link2;link3;link4", @@ -77,10 +77,10 @@ class DokkaOperationTest { "-loggingLevel", "debug", "-moduleName", "name", "-moduleVersion", "1.0", - "-noSuppressObviousFunctions", "true", - "-offlineMode", "true", + "-noSuppressObviousFunctions", + "-offlineMode", "-pluginConfiguration", "{name}={\\\"json\\\"}^^{\\\"name2\\\"}={json2}", - "-suppressInheritedMembers", "true"); + "-suppressInheritedMembers"); assertThat(args).hasSize(matches.size()); From f8e4354e35923df7a7e897536937bf4ba2a4eb92 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 19 May 2024 03:46:45 -0700 Subject: [PATCH 2/2] Version 0.9.5 --- examples/lib/bld/bld-wrapper.properties | 2 +- .../java/rife/bld/extension/CompileKotlinOperationBuild.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties index 113b890..81004ac 100644 --- a/examples/lib/bld/bld-wrapper.properties +++ b/examples/lib/bld/bld-wrapper.properties @@ -1,6 +1,6 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true -bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.4 +bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.5 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.downloadLocation= bld.sourceDirectories= diff --git a/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java b/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java index 1d413fb..f24da97 100644 --- a/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java +++ b/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java @@ -33,7 +33,7 @@ public class CompileKotlinOperationBuild extends Project { public CompileKotlinOperationBuild() { pkg = "rife.bld.extension"; name = "bld-kotlin"; - version = version(0, 9, 4); + version = version(0, 9, 5); javaRelease = 17; downloadSources = true;