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

Use the correct directory for javadoc.

Browse source
This commit is contained in:
Cedric Beust 2017-01-05 10:22:17 -08:00
parent f563d274dd
commit 5d31e55a4a
3 changed files with 3 additions and 3 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

@ -221,7 +221,7 @@ open class JvmCompilerPlugin @Inject constructor(
fun taskJavadoc(project: Project): TaskResult { fun taskJavadoc(project: Project): TaskResult {
val docGenerator = ActorUtils.selectAffinityActor(project, context, context.pluginInfo.docContributors) val docGenerator = ActorUtils.selectAffinityActor(project, context, context.pluginInfo.docContributors)
if (docGenerator != null) { if (docGenerator != null) {
val buildDirectory = File(project.buildDirectory, KFiles.JAVADOC_DIR) val buildDirectory = File(project.buildDirectory, JvmCompilerPlugin.DOCS_DIRECTORY)
val contributors = val contributors =
ActorUtils.selectAffinityActors(project, context, context.pluginInfo.compilerContributors) ActorUtils.selectAffinityActors(project, context, context.pluginInfo.compilerContributors)
var result: TaskResult? = null var result: TaskResult? = null

1
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt
View file

@ -71,7 +71,6 @@ class KFiles {
private val SRC = "src" private val SRC = "src"
val TEST_CLASSES_DIR : String = "test-classes" val TEST_CLASSES_DIR : String = "test-classes"
val JAVADOC_DIR: String = "docs/javadoc"
val NATIVES_DIR : String = "native" val NATIVES_DIR : String = "native"

3
src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt
View file

@ -222,7 +222,8 @@ class PackageConfig(val project: Project) : AttributeHolder {
} }
jar { jar {
name = "${project.name}-${project.version}-javadoc.jar" name = "${project.name}-${project.version}-javadoc.jar"
include(from(JvmCompilerPlugin.DOCS_DIRECTORY), to(""), glob("**")) val fromDir = KFiles.joinDir(project.buildDirectory, JvmCompilerPlugin.DOCS_DIRECTORY)
include(from(fromDir), to(""), glob("**"))
} }
mainJarAttributes.forEach { mainJarAttributes.forEach {