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

If kapt{} detected, run javac before kotlinc.

Browse source
This commit is contained in:
Cedric Beust 2016-06-03 02:06:23 -08:00
parent e891025928
commit 5645d54e35
2 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,7 @@ import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
import com.beust.kobalt.misc.warn import com.beust.kobalt.misc.warn
import java.io.File import java.io.File
import java.util.*
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton
@ -161,12 +162,32 @@ open class JvmCompilerPlugin @Inject constructor(
throw KobaltException("Couldn't find any compiler for project ${project.name}") throw KobaltException("Couldn't find any compiler for project ${project.name}")
} else { } else {
val allCompilers = compilerContributors.flatMap { it.compilersFor(project, context)}.sorted() val allCompilers = compilerContributors.flatMap { it.compilersFor(project, context)}.sorted()
allCompilers.forEach { compiler ->
/**
* Swap the Java and Kotlin compilers from the list.
*/
fun swapJavaAndKotlin(allCompilers: List<ICompiler>): List<ICompiler> {
val result = ArrayList(allCompilers)
var ik = -1
var ij = -1
allCompilers.withIndex().forEach { wi ->
if (wi.value.sourceSuffixes.contains("java")) ij = wi.index
if (wi.value.sourceSuffixes.contains("kt")) ik = wi.index
}
Collections.swap(result, ik, ij)
return result
}
// If this project has a kapt{} directive, we want to run the Java compiler first
val hasKapt = project.projectProperties.get("kaptConfig") != null
var finalAllCompilers = if (hasKapt) swapJavaAndKotlin(allCompilers) else allCompilers
finalAllCompilers.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.successResults) results.addAll(compilerResults.successResults)
if (failedResult == null) failedResult = compilerResults.failedResult 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]
else TaskResult(true) else TaskResult(true)

6
src/main/kotlin/com/beust/kobalt/plugin/apt/AptPlugin.kt
View file

@ -47,6 +47,7 @@ class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, va
companion object { companion object {
const val PLUGIN_NAME = "Apt" const val PLUGIN_NAME = "Apt"
const val KAPT_CONFIG = "kaptConfig"
} }
override val name = PLUGIN_NAME override val name = PLUGIN_NAME
@ -125,7 +126,10 @@ class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, va
private val kaptConfigs: HashMap<String, KaptConfig> = hashMapOf() private val kaptConfigs: HashMap<String, KaptConfig> = hashMapOf()
fun addKaptConfig(project: Project, kapt: KaptConfig) = kaptConfigs.put(project.name, kapt) fun addKaptConfig(project: Project, kapt: KaptConfig) {
project.projectProperties.put(KAPT_CONFIG, kapt)
kaptConfigs.put(project.name, kapt)
}
} }
class AptConfig(var outputDir: String = "generated/source/apt") class AptConfig(var outputDir: String = "generated/source/apt")