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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Erik C. Thauvin 2017-03-27 21:53:40 -07:00
commit 726ddc37d5
22 changed files with 354 additions and 491 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/test/kotlin/com/beust/kobalt/BaseTest.kt
View file

@ -6,7 +6,7 @@ import com.beust.kobalt.app.BuildFileCompiler
import com.beust.kobalt.internal.JvmCompilerPlugin
import com.beust.kobalt.internal.KobaltPluginXml
import com.beust.kobalt.internal.PluginInfo
import com.beust.kobalt.internal.build.BuildFile
import com.beust.kobalt.internal.build.SingleFileBuildSources
import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.log
import org.testng.annotations.BeforeClass
@ -70,11 +70,11 @@ open class BaseTest(val compilerFactory: BuildFileCompiler.IFactory? = null) {
val actualBuildFile = createBuildFile(projectDirectory)
val tmpBuildFile = createBuildFile(Files.createTempDirectory("").toFile().absolutePath)
val thisBuildFile = BuildFile(Paths.get(tmpBuildFile.absolutePath), "Build.kt",
Paths.get(actualBuildFile.absolutePath))
Kobalt.context?.log(2, "About to compile build file "
+ thisBuildFile.path + " " + thisBuildFile.realPath
+ ".kobaltDir: " + thisBuildFile.dotKobaltDir)
val thisBuildFile = SingleFileBuildSources(tmpBuildFile)
// , "Build.kt",
// Paths.get(actualBuildFile.absolutePath))
Kobalt.context?.log(2, "About to compile build file $thisBuildFile"
+ ".kobaltDir: " + KFiles.dotKobaltDir)
args.apply {
buildFile = actualBuildFile.absolutePath
noIncremental = true
@ -84,7 +84,7 @@ open class BaseTest(val compilerFactory: BuildFileCompiler.IFactory? = null) {
val pluginInfo = PluginInfo(KobaltPluginXml(), null, null).apply {
projectContributors.add(jvmCompilerPlugin)
}
return compilerFactory!!.create(listOf(thisBuildFile), pluginInfo).compileBuildFiles(args,
return compilerFactory!!.create(thisBuildFile, pluginInfo).compileBuildFiles(args,
forceRecompile = true)
}