rife2/bld-kotlin
rife2/bld-kotlin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed boolean-type functions producing invalid parameters. Closes #1

Browse source
This commit is contained in:
Erik C. Thauvin 2024-05-19 02:35:39 -07:00
parent cdf6294b39
commit 84c2474ffc
Signed by: erik
GPG key ID: 776702A6A2DA330E
3 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
examples/src/bld/java/com/example/ExampleBuild.java
View file

@ -111,6 +111,7 @@ public class ExampleBuild extends Project {
public void javadoc() throws ExitStatusException, IOException, InterruptedException { public void javadoc() throws ExitStatusException, IOException, InterruptedException {
new DokkaOperation() new DokkaOperation()
.fromProject(this) .fromProject(this)
.failOnWarning(true)
.loggingLevel(LoggingLevel.INFO) .loggingLevel(LoggingLevel.INFO)
// Create build/javadoc // Create build/javadoc
.outputDir(new File(buildDirectory(), "javadoc")) .outputDir(new File(buildDirectory(), "javadoc"))

5
src/main/java/rife/bld/extension/dokka/DokkaOperation.java
View file

@ -131,13 +131,11 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
// -delayTemplateSubstitution // -delayTemplateSubstitution
if (delayTemplateSubstitution_) { if (delayTemplateSubstitution_) {
args.add("-delayTemplateSubstitution"); args.add("-delayTemplateSubstitution");
args.add(String.valueOf(delayTemplateSubstitution_));
} }
// -failOnWarning // -failOnWarning
if (failOnWarning_) { if (failOnWarning_) {
args.add("-failOnWarning"); args.add("-failOnWarning");
args.add(String.valueOf(failOnWarning_));
} }
// -globalLinks_ // -globalLinks_
@ -188,13 +186,11 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
// -noSuppressObviousFunctions // -noSuppressObviousFunctions
if (noSuppressObviousFunctions_) { if (noSuppressObviousFunctions_) {
args.add("-noSuppressObviousFunctions"); args.add("-noSuppressObviousFunctions");
args.add(String.valueOf(noSuppressObviousFunctions_));
} }
// -offlineMode // -offlineMode
if (offlineMode_) { if (offlineMode_) {
args.add("-offlineMode"); args.add("-offlineMode");
args.add(String.valueOf(offlineMode_));
} }
// -pluginConfiguration // -pluginConfiguration
@ -209,7 +205,6 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
// -suppressInheritedMembers // -suppressInheritedMembers
if (suppressInheritedMembers_) { if (suppressInheritedMembers_) {
args.add("-suppressInheritedMembers"); args.add("-suppressInheritedMembers");
args.add(String.valueOf(suppressInheritedMembers_));
} }
if (LOGGER.isLoggable(Level.FINE)) { if (LOGGER.isLoggable(Level.FINE)) {

10
src/test/java/rife/bld/extension/dokka/DokkaOperationTest.java
View file

@ -68,8 +68,8 @@ class DokkaOperationTest {
path + "/lib/bld/kotlin-as-java-plugin-" + dokkaJar + ";path1;path2;path3;path4", path + "/lib/bld/kotlin-as-java-plugin-" + dokkaJar + ";path1;path2;path3;path4",
"-sourceSet", "-src " + path + "/src/main/kotlin", "-sourceSet", "-src " + path + "/src/main/kotlin",
"-outputDir", path + "/build", "-outputDir", path + "/build",
"-delayTemplateSubstitution", "true", "-delayTemplateSubstitution",
"-failOnWarning", "true", "-failOnWarning",
"-globalLinks", "s^link^^s2^link2", "-globalLinks", "s^link^^s2^link2",
"-globalPackageOptions", "option1;option2;option3;option4", "-globalPackageOptions", "option1;option2;option3;option4",
"-globalSrcLinks_", "link1;link2;link3;link4", "-globalSrcLinks_", "link1;link2;link3;link4",
@ -77,10 +77,10 @@ class DokkaOperationTest {
"-loggingLevel", "debug", "-loggingLevel", "debug",
"-moduleName", "name", "-moduleName", "name",
"-moduleVersion", "1.0", "-moduleVersion", "1.0",
"-noSuppressObviousFunctions", "true", "-noSuppressObviousFunctions",
"-offlineMode", "true", "-offlineMode",
"-pluginConfiguration", "{name}={\\\"json\\\"}^^{\\\"name2\\\"}={json2}", "-pluginConfiguration", "{name}={\\\"json\\\"}^^{\\\"name2\\\"}={json2}",
"-suppressInheritedMembers", "true"); "-suppressInheritedMembers");
assertThat(args).hasSize(matches.size()); assertThat(args).hasSize(matches.size());