Compare commits
No commits in common. "f8e4354e35923df7a7e897536937bf4ba2a4eb92" and "cdf6294b39454ecdba4d8a48f7c1f22d6109191b" have entirely different histories.
f8e4354e35
...
cdf6294b39
5 changed files with 12 additions and 8 deletions
|
@ -1,6 +1,6 @@
|
|||
bld.downloadExtensionJavadoc=false
|
||||
bld.downloadExtensionSources=true
|
||||
bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.5
|
||||
bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.4
|
||||
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
|
||||
bld.downloadLocation=
|
||||
bld.sourceDirectories=
|
||||
|
|
|
@ -111,7 +111,6 @@ 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"))
|
||||
|
|
|
@ -33,7 +33,7 @@ public class CompileKotlinOperationBuild extends Project {
|
|||
public CompileKotlinOperationBuild() {
|
||||
pkg = "rife.bld.extension";
|
||||
name = "bld-kotlin";
|
||||
version = version(0, 9, 5);
|
||||
version = version(0, 9, 4);
|
||||
|
||||
javaRelease = 17;
|
||||
downloadSources = true;
|
||||
|
|
|
@ -131,11 +131,13 @@ 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_
|
||||
|
@ -186,11 +188,13 @@ 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
|
||||
|
@ -205,6 +209,7 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
|
|||
// -suppressInheritedMembers
|
||||
if (suppressInheritedMembers_) {
|
||||
args.add("-suppressInheritedMembers");
|
||||
args.add(String.valueOf(suppressInheritedMembers_));
|
||||
}
|
||||
|
||||
if (LOGGER.isLoggable(Level.FINE)) {
|
||||
|
|
|
@ -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",
|
||||
"-failOnWarning",
|
||||
"-delayTemplateSubstitution", "true",
|
||||
"-failOnWarning", "true",
|
||||
"-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",
|
||||
"-offlineMode",
|
||||
"-noSuppressObviousFunctions", "true",
|
||||
"-offlineMode", "true",
|
||||
"-pluginConfiguration", "{name}={\\\"json\\\"}^^{\\\"name2\\\"}={json2}",
|
||||
"-suppressInheritedMembers");
|
||||
"-suppressInheritedMembers", "true");
|
||||
|
||||
assertThat(args).hasSize(matches.size());
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue