Compare commits

..

2 commits

5 changed files with 8 additions and 12 deletions

View file

@ -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=

View file

@ -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"))

View file

@ -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;

View file

@ -131,13 +131,11 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
// -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<DokkaOperation> {
// -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<DokkaOperation> {
// -suppressInheritedMembers
if (suppressInheritedMembers_) {
args.add("-suppressInheritedMembers");
args.add(String.valueOf(suppressInheritedMembers_));
}
if (LOGGER.isLoggable(Level.FINE)) {

View file

@ -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());