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

Fixes kotlinCompiler { version = … }

Browse source 
Fixes https://github.com/cbeust/kobalt/issues/317
This commit is contained in:
Cedric Beust 2017-04-06 09:59:09 -07:00
parent 03d4ca3861
commit 69560ca571
1 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
View file

@ -40,7 +40,7 @@ class KotlinCompiler @Inject constructor(
val compilerAction = object: ICompilerAction { val compilerAction = object: ICompilerAction {
override fun compile(project: Project?, info: CompilerActionInfo): TaskResult { override fun compile(project: Project?, info: CompilerActionInfo): TaskResult {
val projectName = project?.name val projectName = project?.name
val version = settings.kobaltCompilerVersion val version = kotlinVersion(project)
var filesToCompile = 0 var filesToCompile = 0
if (! info.outputDir.path.endsWith("ript.jar")) { if (! info.outputDir.path.endsWith("ript.jar")) {
// Don't display the message if compiling Build.kt // Don't display the message if compiling Build.kt
@ -84,9 +84,10 @@ class KotlinCompiler @Inject constructor(
// If the Kotlin compiler version in settings.xml is different from the default, we // If the Kotlin compiler version in settings.xml is different from the default, we
// need to spawn a Kotlin compiler in a separate process. Otherwise, we can just invoke // need to spawn a Kotlin compiler in a separate process. Otherwise, we can just invoke
// the K2JVMCompiler class directly // the K2JVMCompiler class directly
val actualVersion = kotlinConfig(project)?.version ?: settings.kobaltCompilerVersion val actualVersion = kotlinVersion(project)
if (settings.kobaltCompilerSeparateProcess || actualVersion != Constants.KOTLIN_COMPILER_VERSION) { if (settings.kobaltCompilerSeparateProcess || actualVersion != Constants.KOTLIN_COMPILER_VERSION) {
return invokeCompilerInSeparateProcess(classpath, info, project) return invokeCompilerInSeparateProcess(classpath, info, actualVersion, project)
} else { } else {
return invokeCompilerDirectly(projectName ?: "kobalt-" + Random().nextInt(), outputDir, return invokeCompilerDirectly(projectName ?: "kobalt-" + Random().nextInt(), outputDir,
@ -94,15 +95,12 @@ class KotlinCompiler @Inject constructor(
} }
} }
fun kotlinConfig(project: Project?)
= (Kobalt.findPlugin(KotlinPlugin.PLUGIN_NAME) as KotlinPlugin).configurationFor(project)
private fun invokeCompilerInSeparateProcess(classpath: String, info: CompilerActionInfo, private fun invokeCompilerInSeparateProcess(classpath: String, info: CompilerActionInfo,
project: Project?): TaskResult { compilerVersion: String, project: Project?): TaskResult {
val java = JavaInfo.create(File(SystemProperties.javaBase)).javaExecutable val java = JavaInfo.create(File(SystemProperties.javaBase)).javaExecutable
val compilerClasspath = compilerDep.jarFile.get().path + File.pathSeparator + val compilerClasspath = compilerDep(compilerVersion).jarFile.get().path + File.pathSeparator +
compilerEmbeddableDependencies(null).map { it.jarFile.get().path } compilerEmbeddableDependencies(null, compilerVersion).map { it.jarFile.get().path }
.joinToString(File.pathSeparator) .joinToString(File.pathSeparator)
val xFlagsString = listOf(kotlinConfig(project)?.args?.joinToString(" "), val xFlagsString = listOf(kotlinConfig(project)?.args?.joinToString(" "),
settings.kobaltCompilerFlags) settings.kobaltCompilerFlags)
@ -343,11 +341,17 @@ class KotlinCompiler @Inject constructor(
} }
} }
val compilerVersion = settings.kobaltCompilerVersion private fun kotlinConfig(project: Project?)
val compilerDep = dependencyManager.create("org.jetbrains.kotlin:kotlin-compiler-embeddable:$compilerVersion") = (Kobalt.findPlugin(KotlinPlugin.PLUGIN_NAME) as KotlinPlugin).configurationFor(project)
fun compilerEmbeddableDependencies(project: Project?): List<IClasspathDependency> { private fun kotlinVersion(project: Project?)
val deps = dependencyManager.transitiveClosure(listOf(compilerDep), requiredBy = project?.name ?: "") = kotlinConfig(project)?.version ?: settings.kobaltCompilerVersion ?: Constants.KOTLIN_COMPILER_VERSION
private fun compilerDep(version: String)
= dependencyManager.create("org.jetbrains" + ".kotlin:kotlin-compiler-embeddable:$version")
fun compilerEmbeddableDependencies(project: Project?, version: String): List<IClasspathDependency> {
val deps = dependencyManager.transitiveClosure(listOf(compilerDep(version)), requiredBy = project?.name ?: "")
return deps return deps
} }
@ -362,7 +366,7 @@ class KotlinCompiler @Inject constructor(
val executor = executors.newExecutor("KotlinCompiler", 10) val executor = executors.newExecutor("KotlinCompiler", 10)
// Force a download of the compiler dependencies // Force a download of the compiler dependencies
compilerEmbeddableDependencies(project).forEach { it.jarFile.get() } compilerEmbeddableDependencies(project, kotlinVersion(project)).forEach { it.jarFile.get() }
executor.shutdown() executor.shutdown()