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

Introducing JvmCompiler.

Browse source
This commit is contained in:
Cedric Beust 2015-10-30 11:31:24 -07:00
parent 5d9fa17087
commit d568507624
6 changed files with 118 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@ import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.misc.log
import java.io.File
import java.util.ArrayList
import java.util.*
import javax.inject.Inject
import javax.inject.Singleton
@ -20,7 +20,8 @@ abstract class JvmCompilerPlugin @Inject constructor(
open val files: KFiles,
open val depFactory: DepFactory,
open val dependencyManager: DependencyManager,
open val executors: KobaltExecutors) : BasePlugin() {
open val executors: KobaltExecutors,
open val jvmCompiler: JvmCompiler) : BasePlugin() {
companion object {
const val TASK_CLEAN = "clean"
@ -37,16 +38,6 @@ abstract class JvmCompilerPlugin @Inject constructor(
}
}
}
private fun runClasspathContributors(context: KobaltContext?, project: Project) :
Collection<IClasspathDependency> {
val result = arrayListOf<IClasspathDependency>()
context!!.classpathContributors.forEach {
result.addAll(it.entriesFor(project))
}
return result
}
}
/**
@ -63,21 +54,8 @@ abstract class JvmCompilerPlugin @Inject constructor(
}
/**
* @return the classpath for this project, including the IClasspathContributors.
* @return the test dependencies for this project, including the contributors.
*/
fun calculateClasspath(project: Project?, vararg allDependencies: List<IClasspathDependency>):
List<IClasspathDependency> {
var result = arrayListOf<IClasspathDependency>()
allDependencies.forEach { dependencies ->
result.addAll(dependencyManager.transitiveClosure(dependencies))
}
if (project != null) {
result.addAll(runClasspathContributors(context, project))
}
return result
}
protected fun testDependencies(project: Project) : List<IClasspathDependency> {
val result = arrayListOf<IClasspathDependency>()
result.add(FileDependency(makeOutputDir(project).absolutePath))
@ -85,7 +63,7 @@ abstract class JvmCompilerPlugin @Inject constructor(
with(project) {
arrayListOf(compileDependencies, compileProvidedDependencies, testDependencies,
testProvidedDependencies).forEach {
result.addAll(calculateClasspath(project, it))
result.addAll(jvmCompiler.calculateDependencies(project, context!!, it))
}
}
return dependencyManager.reorderDependencies(result)
@ -145,7 +123,6 @@ abstract class JvmCompilerPlugin @Inject constructor(
}
}
class TestConfig(val project: Project) {
fun args(vararg arg: String) {
project.testArgs.addAll(arg)