From 46f847b90a416123e565431eef9e712940eb8720 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 15 Oct 2015 03:44:04 -0700 Subject: [PATCH] Logs. --- src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt | 2 +- .../kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt | 4 ++-- .../kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt | 2 +- .../com/beust/kobalt/plugin/packaging/PackagingPlugin.kt | 2 +- .../kotlin/com/beust/kobalt/plugin/publish/JCenterApi.kt | 8 +++----- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt b/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt index a67a47b6..736bf249 100644 --- a/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt +++ b/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt @@ -57,6 +57,6 @@ public class PomGenerator @Inject constructor(@Assisted val project: Project) { val pomFile = SimpleDep(project.group!!, project.artifactId!!, project.version!!).toPomFileName() val outputFile = File(outputDir, pomFile) outputFile.writeText(s.toString(), Charset.defaultCharset()) - log(1, "Wrote $outputFile") + log(1, " Wrote $outputFile") } } \ No newline at end of file diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt index 590c8cf5..40815f67 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt @@ -65,8 +65,8 @@ public class JavaPlugin @Inject constructor( // pb.redirectError(File("/tmp/kobalt-err")) // pb.redirectOutput(File("/tmp/kobalt-out")) val line = args.join(" ") - log(1, "Compiling ${sourceFiles.size()} files with classpath size ${cpList.size()}") - log(2, "Compiling ${project}:\n${line}") + log(1, " Compiling ${sourceFiles.size()} files with classpath size ${cpList.size()}") + log(2, " Compiling $project:\n$line") val process = pb.start() val errorCode = process.waitFor() diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt index 31dfe263..eb633546 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt @@ -83,7 +83,7 @@ public class KotlinPlugin @Inject constructor( outputDirectory: String): TaskResult { File(outputDirectory).mkdirs() - log(1, "Compiling ${sources.size()} files with classpath size ${cpList.size()}") + log(1, " Compiling ${sources.size()} files with classpath size ${cpList.size()}") return kotlinCompilePrivate { classpath(cpList.map { it.jarFile.get().absolutePath }) diff --git a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt index b9733db4..335e27e4 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt @@ -218,7 +218,7 @@ public class PackagingPlugin @Inject constructor(val dependencyManager : Depende log(2, "Added ${includedFiles.size()} files to ${result}") outStream.flush() outStream.close() - log(1, "Created ${result}") + log(1, " Created ${result}") return result } diff --git a/src/main/kotlin/com/beust/kobalt/plugin/publish/JCenterApi.kt b/src/main/kotlin/com/beust/kobalt/plugin/publish/JCenterApi.kt index 985a3eb7..80b7b74e 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/publish/JCenterApi.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/publish/JCenterApi.kt @@ -2,7 +2,6 @@ package com.beust.kobalt.plugin.publish import com.beust.klaxon.* import com.beust.kobalt.api.Project -import com.beust.kobalt.dots import com.beust.kobalt.internal.TaskResult import com.beust.kobalt.maven.Gpg import com.beust.kobalt.maven.Http @@ -15,7 +14,6 @@ import org.jetbrains.annotations.Nullable import java.io.ByteArrayInputStream import java.io.File import java.nio.charset.Charset -import java.util.concurrent.Callable import javax.inject.Inject data class JCenterPackage(val jo: JsonObject) { @@ -137,7 +135,7 @@ public class JCenterApi @Inject constructor (@Nullable @Assisted("username") val // val fileCount = filesToUpload.size() if (fileCount > 0) { - log(1, "Found $fileCount artifacts to upload: " + filesToUpload.get(0) + log(1, " Found $fileCount artifacts to upload: " + filesToUpload.get(0) + if (fileCount > 1) "..." else "") var i = 1 val errorMessages = arrayListOf() @@ -158,12 +156,12 @@ public class JCenterApi @Inject constructor (@Nullable @Assisted("username") val errorMessages.add(jo.string("message") ?: "No message found") }) val end = if (i >= fileCount) "\n" else "" - log(1, " Uploading " + (i++) + " / $fileCount$end " + dots(fileCount, results), false) + log(1, " Uploading " + (i++) + " / $fileCount$end " + dots(fileCount, results), false) } if (errorMessages.isEmpty()) { return TaskResult() } else { - error("Errors while uploading:\n" + errorMessages.map { " $it" }.join("\n")) + error("Errors while uploading:\n" + errorMessages.map { " $it" }.join("\n")) return TaskResult(false, errorMessages.join("\n")) } } else {