diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt index 6771ffd4..26884af3 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt @@ -222,7 +222,7 @@ open class JvmCompilerPlugin @Inject constructor( } @Task(name = "doc", description = "Generate the documentation for the project", group = GROUP_DOCUMENTATION, - runBefore = arrayOf("assemble")) + runBefore = arrayOf("assemble"), runAfter = arrayOf("clean")) fun taskJavadoc(project: Project): TaskResult { val docGenerator = ActorUtils.selectAffinityActor(project, context, context.pluginInfo.docContributors) if (docGenerator != null) { diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavadocConfig.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavadocConfig.kt index f1f94b61..7129dcaa 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavadocConfig.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavadocConfig.kt @@ -62,7 +62,7 @@ class JavadocConfig(val project: Project) { } } - private fun addOptions(option: String, first: String, second: String) { + private fun addPair(option: String, first: String, second: String) { if (first.isNotEmpty() && second.isNotEmpty()) { args.add("-$option") args.add("\"$first\"") @@ -320,8 +320,8 @@ class JavadocConfig(val project: Project) { */ var title: String = "" set(value) { - addString("windowtitle", value) - addString("doctitle", value) + windowTitle = value + docTitle = value } /** @@ -543,12 +543,12 @@ class JavadocConfig(val project: Project) { /** * @see -group */ - fun group(groupHeading: String, packagePattern: String) = addOptions("group", groupHeading, packagePattern) + fun group(groupHeading: String, packagePattern: String) = addPair("group", groupHeading, packagePattern) /** * @see -linkoffline */ - fun linkOffline(extdocURL: String, packagelistLoc: String) = addOptions("linkoffline", extdocURL, packagelistLoc) + fun linkOffline(extdocURL: String, packagelistLoc: String) = addPair("linkoffline", extdocURL, packagelistLoc) /** * @see -link @@ -582,6 +582,7 @@ fun main(args: Array) { } val config = JavadocConfig(Project()) + config.title = "This is a test." config.verbose = true config.quiet = false config.links("http://docs.oracle.com/javase/8/docs/api/")