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

Fix plurals.

Browse source
This commit is contained in:
Cedric Beust 2016-04-11 10:01:12 -07:00
parent 9ff5b52a7d
commit 3dc039e956
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt
View file

@ -57,7 +57,7 @@ class JavaCompiler @Inject constructor(val jvmCompiler: JvmCompiler) {
command = "javac " + allArgs.joinToString(" ") + " " + info.sourceFiles.joinToString(" ")
log(2, "Launching\n$command")
log(1, " Java compiling " + Strings.pluralizeAll("file", info.sourceFiles.size))
log(1, " Java compiling " + Strings.pluralizeAll(info.sourceFiles.size, "file"))
val result = task.call()
errorMessage = dc.diagnostics.joinToString("\n")
result
@ -78,7 +78,7 @@ class JavaCompiler @Inject constructor(val jvmCompiler: JvmCompiler) {
val pb = ProcessBuilder(allArgs)
pb.inheritIO()
val line = allArgs.joinToString(" ")
log(1, " Java compiling " + Strings.pluralizeAll("file", info.sourceFiles.size))
log(1, " Java compiling " + Strings.pluralizeAll(info.sourceFiles.size, "file"))
log(2, " Java compiling $line")
command = allArgs.joinToString(" ") + " " + info.sourceFiles.joinToString(" ")

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

@ -39,7 +39,8 @@ class KotlinCompiler @Inject constructor(
val compilerAction = object: ICompilerAction {
override fun compile(projectName: String?, info: CompilerActionInfo): TaskResult {
val version = settings.kobaltCompilerVersion
log(1, " Kotlin $version compiling " + Strings.pluralizeAll("file", info.sourceFiles.size))
log(1, " Kotlin $version compiling "
+ Strings.pluralizeAll(info.sourceFiles.size, "directory", "directories" ))
val cp = compilerFirst(info.dependencies.map {it.jarFile.get()})
val infoDir = info.directory
val outputDir = if (infoDir != null) {