erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-25 07:57:12 -07:00
Code Releases Activity

Merge pull request #439 from ethauvin/master

Browse source 
Made doc run after clean
This commit is contained in:
Cedric Beust 2017-05-03 20:43:31 -07:00 • committed by GitHub
commit 2439da3545
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
View file

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

11
src/main/kotlin/com/beust/kobalt/plugin/java/JavadocConfig.kt
View file

@ -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 <a href="http://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#CHDIGGII">-group</a>
*/
fun group(groupHeading: String, packagePattern: String) = addOptions("group", groupHeading, packagePattern)
fun group(groupHeading: String, packagePattern: String) = addPair("group", groupHeading, packagePattern)
/**
* @see <a href="http://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#CHDFIIJH">-linkoffline</a>
*/
fun linkOffline(extdocURL: String, packagelistLoc: String) = addOptions("linkoffline", extdocURL, packagelistLoc)
fun linkOffline(extdocURL: String, packagelistLoc: String) = addPair("linkoffline", extdocURL, packagelistLoc)
/**
* @see <a href="http://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#CHDEDJFI">-link</a>
@ -582,6 +582,7 @@ fun main(args: Array<String>) {
}
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/")