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

Clean up.

Browse source
This commit is contained in:
Cedric Beust 2015-11-29 10:31:23 -08:00
parent 7824dbc9a4
commit 73d73af0a7
3 changed files with 44 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
View file

@ -110,8 +110,6 @@ abstract class JvmCompilerPlugin @Inject constructor(
} }
} }
private val compilerArgs = hashMapOf<String, List<String>>()
protected fun compilerArgsFor(project: Project) : List<String> { protected fun compilerArgsFor(project: Project) : List<String> {
val result = project.projectProperties.get(COMPILER_ARGS) val result = project.projectProperties.get(COMPILER_ARGS)
if (result != null) { if (result != null) {
@ -175,7 +173,6 @@ abstract class JvmCompilerPlugin @Inject constructor(
return result return result
} }
abstract fun doCompile(project: Project, cai: CompilerActionInfo) : TaskResult
abstract fun doJavadoc(project: Project, cai: CompilerActionInfo) : TaskResult abstract fun doJavadoc(project: Project, cai: CompilerActionInfo) : TaskResult
} }

26
src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt
View file

@ -52,22 +52,11 @@ class JavaPlugin @Inject constructor(
} }
override fun doJavadoc(project: Project, cai: CompilerActionInfo) : TaskResult { override fun doJavadoc(project: Project, cai: CompilerActionInfo) : TaskResult {
val result =
if (cai.sourceFiles.size > 0) {
javaCompiler.javadoc(project, context, cai.copy(compilerArgs = compilerArgsFor(project)))
} else {
warn("Couldn't find any source files to run Javadoc on")
TaskResult()
}
return result
}
override fun doCompile(project: Project, cai: CompilerActionInfo) : TaskResult {
val result = val result =
if (cai.sourceFiles.size > 0) { if (cai.sourceFiles.size > 0) {
javaCompiler.compile(project, context, cai.copy(compilerArgs = compilerArgsFor(project))) javaCompiler.javadoc(project, context, cai.copy(compilerArgs = compilerArgsFor(project)))
} else { } else {
warn("Couldn't find any source files to compile") warn("Couldn't find any source files to run Javadoc on")
TaskResult() TaskResult()
} }
return result return result
@ -95,7 +84,16 @@ class JavaPlugin @Inject constructor(
override fun affinity(project: Project, context: KobaltContext) = override fun affinity(project: Project, context: KobaltContext) =
if (project.sourceSuffix == ".java") 1 else 0 if (project.sourceSuffix == ".java") 1 else 0
override fun compile(project: Project, context: KobaltContext, info: CompilerActionInfo) = doCompile(project, info) override fun compile(project: Project, context: KobaltContext, info: CompilerActionInfo) : TaskResult {
val result =
if (info.sourceFiles.size > 0) {
javaCompiler.compile(project, context, info.copy(compilerArgs = compilerArgsFor(project)))
} else {
warn("Couldn't find any source files to compile")
TaskResult()
}
return result
}
} }
@Directive @Directive

67
src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt
View file

@ -39,21 +39,7 @@ class KotlinPlugin @Inject constructor(
override fun accept(project: Project) = project is KotlinProject override fun accept(project: Project) = project is KotlinProject
override fun doCompile(project: Project, cai: CompilerActionInfo) : TaskResult { override fun doJavadoc(project: Project, cai: CompilerActionInfo): TaskResult {
val result =
if (cai.sourceFiles.size > 0) {
compilePrivate(project, cai.dependencies, cai.sourceFiles, cai.outputDir)
} else {
warn("Couldn't find any source files")
TaskResult()
}
lp(project, "Compilation " + if (result.success) "succeeded" else "failed")
return result
}
override fun doJavadoc(project: Project, cai: CompilerActionInfo) : TaskResult {
warn("javadoc task not implemented for Kotlin, call the dokka task instead") warn("javadoc task not implemented for Kotlin, call the dokka task instead")
return TaskResult() return TaskResult()
} }
@ -64,18 +50,18 @@ class KotlinPlugin @Inject constructor(
val projectDir = File(project.directory) val projectDir = File(project.directory)
val sourceFiles = files.findRecursively(projectDir, project.sourceDirectoriesTest.map { File(it) }) val sourceFiles = files.findRecursively(projectDir, project.sourceDirectoriesTest.map { File(it) })
{ it: String -> it.endsWith(project.sourceSuffix) } { it: String -> it.endsWith(project.sourceSuffix) }
.map { File(projectDir, it).absolutePath } .map { File(projectDir, it).absolutePath }
val result = val result =
if (sourceFiles.size > 0) { if (sourceFiles.size > 0) {
compilePrivate(project, dependencyManager.testDependencies(project, context, projects()), compilePrivate(project, dependencyManager.testDependencies(project, context, projects()),
sourceFiles, sourceFiles,
KFiles.makeOutputTestDir(project)) KFiles.makeOutputTestDir(project))
} else { } else {
warn("Couldn't find any test files") warn("Couldn't find any test files")
TaskResult() TaskResult()
} }
lp(project, "Compilation of tests succeeded") lp(project, "Compilation of tests succeeded")
return result return result
@ -91,7 +77,7 @@ class KotlinPlugin @Inject constructor(
}.compile(project, context) }.compile(project, context)
} }
private fun getKotlinCompilerJar(name: String) : String { private fun getKotlinCompilerJar(name: String): String {
val id = "org.jetbrains.kotlin:$name:${KotlinCompiler.KOTLIN_VERSION}" val id = "org.jetbrains.kotlin:$name:${KotlinCompiler.KOTLIN_VERSION}"
val dep = MavenDependency.create(id, executors.miscExecutor) val dep = MavenDependency.create(id, executors.miscExecutor)
val result = dep.jarFile.get().absolutePath val result = dep.jarFile.get().absolutePath
@ -100,21 +86,32 @@ class KotlinPlugin @Inject constructor(
// interface IClasspathContributor // interface IClasspathContributor
override fun entriesFor(project: Project?) : List<IClasspathDependency> = override fun entriesFor(project: Project?): List<IClasspathDependency> =
if (project == null || project is KotlinProject) { if (project == null || project is KotlinProject) {
// All Kotlin projects automatically get the Kotlin runtime added to their class path // All Kotlin projects automatically get the Kotlin runtime added to their class path
listOf(getKotlinCompilerJar("kotlin-stdlib"), getKotlinCompilerJar("kotlin-runtime")) listOf(getKotlinCompilerJar("kotlin-stdlib"), getKotlinCompilerJar("kotlin-runtime"))
.map { FileDependency(it) } .map { FileDependency(it) }
} else { } else {
listOf() listOf()
} }
// ICompilerContributor // ICompilerContributor
override fun affinity(project: Project, context: KobaltContext) = override fun affinity(project: Project, context: KobaltContext) =
if (project.sourceSuffix == ".kt") 1 else 0 if (project.sourceSuffix == ".kt") 1 else 0
override fun compile(project: Project, context: KobaltContext, info: CompilerActionInfo) = doCompile(project, info) override fun compile(project: Project, context: KobaltContext, info: CompilerActionInfo) : TaskResult {
val result =
if (info.sourceFiles.size > 0) {
compilePrivate(project, info.dependencies, info.sourceFiles, info.outputDir)
} else {
warn("Couldn't find any source files")
TaskResult()
}
lp(project, "Compilation " + if (result.success) "succeeded" else "failed")
return result
}
} }
/** /**