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

Revert.

Browse source
This commit is contained in:
Cedric Beust 2018-02-13 16:07:40 -08:00
parent 700a8fbca8
commit 03e94157c7
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -187,8 +187,8 @@ open class JvmCompilerPlugin @Inject constructor(
var done = false var done = false
// The directory where the classes get compiled // The directory where the classes get compiled
val buildDirectory = val buildDirectory =
if (isTest) File(KFiles.joinDir(project.directory, project.buildDirectory, KFiles.TEST_CLASSES_DIR)) if (isTest) File(KFiles.joinDir(project.buildDirectory, KFiles.TEST_CLASSES_DIR))
else File(KFiles.joinDir(project.directory, project.classesDir(context))) else File(KFiles.joinDir(project.classesDir(context)))
allCompilersSorted.doWhile({ ! done }) { compiler -> allCompilersSorted.doWhile({ ! done }) { compiler ->
val compilerResults = compilerUtils.invokeCompiler(project, context, compiler, val compilerResults = compilerUtils.invokeCompiler(project, context, compiler,

2
src/test/kotlin/com/beust/kobalt/VerifyKobaltZipTest.kt
View file

@ -67,7 +67,7 @@ class VerifyKobaltZipTest : KobaltTest() {
} else if (entry.name.endsWith("kobalt-wrapper.jar")) { } else if (entry.name.endsWith("kobalt-wrapper.jar")) {
val ins = zipFile.getInputStream(entry) val ins = zipFile.getInputStream(entry)
foundWrapperJar = true foundWrapperJar = true
assertExistence(ins, listOf("kobalt.properties")) assertExistence(ins, listOf("kobalt.properties", "com/beust/kobalt/wrapper/Main.class"))
} }
entry = stream.nextEntry entry = stream.nextEntry
} }