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

Refactor.

Browse source
This commit is contained in:
Cedric Beust 2016-06-02 21:29:51 -08:00
parent 7b8b0bbfc1
commit 814eb57396
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,9 +15,10 @@ import java.util.*
class CompilerUtils @Inject constructor(val files: KFiles, class CompilerUtils @Inject constructor(val files: KFiles,
val dependencyManager: DependencyManager) { val dependencyManager: DependencyManager) {
class CompilerResult(val successResults: List<TaskResult>, val failedResult: TaskResult?)
fun invokeCompiler(project: Project, context: KobaltContext, compiler: ICompiler, fun invokeCompiler(project: Project, context: KobaltContext, compiler: ICompiler,
sourceDirectories: List<File>, isTest: Boolean): sourceDirectories: List<File>, isTest: Boolean): CompilerResult {
Pair<List<TaskResult>, TaskResult?> {
val results = arrayListOf<TaskResult>() val results = arrayListOf<TaskResult>()
var failedResult: TaskResult? = null var failedResult: TaskResult? = null
val contributedSourceDirs = val contributedSourceDirs =
@ -42,7 +43,7 @@ class CompilerUtils @Inject constructor(val files: KFiles,
log(2, "Compiler $compiler not running on ${project.name} since no source files were found") log(2, "Compiler $compiler not running on ${project.name} since no source files were found")
} }
return Pair(results, failedResult) return CompilerResult(results, failedResult)
} }
/** /**

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

@ -164,8 +164,8 @@ open class JvmCompilerPlugin @Inject constructor(
allCompilers.forEach { compiler -> allCompilers.forEach { compiler ->
val compilerResults = compilerUtils.invokeCompiler(project, context, compiler, val compilerResults = compilerUtils.invokeCompiler(project, context, compiler,
sourceDirectories(project, context), isTest) sourceDirectories(project, context), isTest)
results.addAll(compilerResults.first) results.addAll(compilerResults.successResults)
if (failedResult == null) failedResult = compilerResults.second if (failedResult == null) failedResult = compilerResults.failedResult
} }
return if (failedResult != null) failedResult!! return if (failedResult != null) failedResult!!
else if (results.size > 0) results[0] else if (results.size > 0) results[0]