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

Warning.

Browse source
This commit is contained in:
Cedric Beust 2015-11-30 18:47:58 -08:00
parent fcfa0653a2
commit 639c0249a4
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/com/beust/kobalt/internal/BuildGenerator.kt
View file

@ -24,7 +24,7 @@ abstract class BuildGenerator : IInitContributor<File> {
} }
} }
override fun affinity(dir: File) = KFiles.findRecursively(dir, fileMatch).size override fun affinity(arg: File) = KFiles.findRecursively(arg, fileMatch).size
private fun importPom(pomFile: File, mainDeps: ArrayList<Pom.Dependency>, testDeps: ArrayList<Pom.Dependency>, private fun importPom(pomFile: File, mainDeps: ArrayList<Pom.Dependency>, testDeps: ArrayList<Pom.Dependency>,
map: HashMap<String, Any?>) { map: HashMap<String, Any?>) {

4
src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt
View file

@ -17,7 +17,7 @@ abstract class GenericTestRunner : ITestRunnerContributor {
abstract fun args(project: Project, classpath: List<IClasspathDependency>) : List<String> abstract fun args(project: Project, classpath: List<IClasspathDependency>) : List<String>
override fun run(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>) override fun run(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>)
= TaskResult(runTests(project, context, classpath)) = TaskResult(runTests(project, classpath))
protected fun findTestClasses(project: Project, classpath: List<IClasspathDependency>): List<String> { protected fun findTestClasses(project: Project, classpath: List<IClasspathDependency>): List<String> {
@ -46,7 +46,7 @@ abstract class GenericTestRunner : ITestRunnerContributor {
/** /**
* @return true if all the tests passed * @return true if all the tests passed
*/ */
fun runTests(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>) : Boolean { fun runTests(project: Project, classpath: List<IClasspathDependency>) : Boolean {
val jvm = JavaInfo.create(File(SystemProperties.javaBase)) val jvm = JavaInfo.create(File(SystemProperties.javaBase))
val java = jvm.javaExecutable val java = jvm.javaExecutable
val args = args(project, classpath) val args = args(project, classpath)

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

@ -113,6 +113,7 @@ abstract class JvmCompilerPlugin @Inject constructor(
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) {
@Suppress("UNCHECKED_CAST")
return result as List<String> return result as List<String>
} else { } else {
return emptyList() return emptyList()