From fa6820e440b9ed047b5d47c2dc856cca0085cab5 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Mon, 8 Aug 2016 17:37:14 -0700 Subject: [PATCH] Rename to ParallelLogger. --- .../src/main/kotlin/com/beust/kobalt/JarGenerator.kt | 4 ++-- .../src/main/kotlin/com/beust/kobalt/archive/Archives.kt | 4 ++-- .../beust/kobalt/internal/{KobaltLog.kt => ParallelLogger.kt} | 2 +- .../kotlin/com/beust/kobalt/internal/ParallelProjectRunner.kt | 2 +- .../src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt | 2 +- src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt | 4 ++-- .../kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt | 2 +- .../com/beust/kobalt/plugin/packaging/PackagingPlugin.kt | 4 ++-- .../kotlin/com/beust/kobalt/plugin/packaging/WarGenerator.kt | 4 ++-- .../kotlin/com/beust/kobalt/plugin/packaging/ZipGenerator.kt | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) rename modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/{KobaltLog.kt => ParallelLogger.kt} (98%) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/JarGenerator.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/JarGenerator.kt index 0fe2d18a..97a697ac 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/JarGenerator.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/JarGenerator.kt @@ -4,7 +4,7 @@ import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.Project import com.beust.kobalt.archive.Archives import com.beust.kobalt.archive.Jar -import com.beust.kobalt.internal.KobaltLog +import com.beust.kobalt.internal.ParallelLogger import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.aether.Scope import com.beust.kobalt.misc.* @@ -122,7 +122,7 @@ class JarGenerator @Inject constructor(val dependencyManager: DependencyManager) return result } - fun generateJar(project: Project, context: KobaltContext, jar: Jar, kobaltLog: KobaltLog) : File { + fun generateJar(project: Project, context: KobaltContext, jar: Jar, kobaltLog: ParallelLogger) : File { val includedFiles = findIncludedFiles(project, context, jar) // diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/archive/Archives.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/archive/Archives.kt index b7506b7c..8549d4ed 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/archive/Archives.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/archive/Archives.kt @@ -5,7 +5,7 @@ import com.beust.kobalt.IFileSpec import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.Project import com.beust.kobalt.api.annotation.ExportedProjectProperty -import com.beust.kobalt.internal.KobaltLog +import com.beust.kobalt.internal.ParallelLogger import com.beust.kobalt.misc.* import java.io.File import java.io.FileOutputStream @@ -29,7 +29,7 @@ class Archives { includedFiles: List, expandJarFiles : Boolean = false, outputStreamFactory: (OutputStream) -> ZipOutputStream = DEFAULT_STREAM_FACTORY, - kobaltLog: KobaltLog) : File { + kobaltLog: ParallelLogger) : File { val fullArchiveName = context.variant.archiveName(project, archiveName, suffix) val archiveDir = File(KFiles.libsDir(project)) val result = File(archiveDir.path, fullArchiveName) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KobaltLog.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ParallelLogger.kt similarity index 98% rename from modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KobaltLog.kt rename to modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ParallelLogger.kt index 2d8884c8..24174391 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KobaltLog.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ParallelLogger.kt @@ -21,7 +21,7 @@ import java.util.concurrent.ConcurrentLinkedQueue * Yes, this code was pretty painful to write and I'm pretty sure it still have a few bugs left. */ @Singleton -class KobaltLog @Inject constructor(val args: Args) { +class ParallelLogger @Inject constructor(val args: Args) { enum class Type { LOG, WARN, ERROR } class LogLine(val name: String? = null, val level: Int, val message: String, val type: Type) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ParallelProjectRunner.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ParallelProjectRunner.kt index f842a121..93dcc0f0 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ParallelProjectRunner.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ParallelProjectRunner.kt @@ -21,7 +21,7 @@ class ParallelProjectRunner(val tasksByNames: (Project) -> ListMultimap, val runBefore: TreeMultimap, val runAfter: TreeMultimap, val alwaysRunAfter: TreeMultimap, val args: Args, val pluginInfo: PluginInfo, - val kobaltLog: KobaltLog) + val kobaltLog: ParallelLogger) : BaseProjectRunner() { override fun runProjects(taskInfos: List, projects: List) : TaskManager .RunTargetResult { diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt index 41a2a1bf..94d62c32 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt @@ -17,7 +17,7 @@ import javax.inject.Singleton @Singleton class TaskManager @Inject constructor(val args: Args, val incrementalManagerFactory: IncrementalManager.IFactory, - val pluginInfo: PluginInfo, val kobaltLog: KobaltLog) { + val pluginInfo: PluginInfo, val kobaltLog: ParallelLogger) { private val dependsOn = TreeMultimap.create() private val reverseDependsOn = TreeMultimap.create() private val runBefore = TreeMultimap.create() diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt index fae8ce6e..4f984125 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt @@ -9,7 +9,7 @@ import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.Project import com.beust.kobalt.internal.ICompilerAction import com.beust.kobalt.internal.JvmCompiler -import com.beust.kobalt.internal.KobaltLog +import com.beust.kobalt.internal.ParallelLogger import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.Strings import com.beust.kobalt.misc.log @@ -24,7 +24,7 @@ import javax.tools.ToolProvider @Singleton class JavaCompiler @Inject constructor(val jvmCompiler: JvmCompiler, - val kobaltLog: KobaltLog) : ICompiler { + val kobaltLog: ParallelLogger) : ICompiler { fun compilerAction(executable: File) = object : ICompilerAction { override fun compile(projectName: String?, info: CompilerActionInfo): TaskResult { if (info.sourceFiles.isEmpty()) { diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt index 0e133d74..caf1d2df 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt @@ -36,7 +36,7 @@ class KotlinCompiler @Inject constructor( val settings: KobaltSettings, val jvmCompiler: JvmCompiler, val kotlinJarFiles: KotlinJarFiles, - val kobaltLog: KobaltLog) { + val kobaltLog: ParallelLogger) { val compilerAction = object: ICompilerAction { override fun compile(projectName: String?, info: CompilerActionInfo): TaskResult { 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 1d536547..d3540a41 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt @@ -9,7 +9,7 @@ import com.beust.kobalt.api.annotation.Task import com.beust.kobalt.archive.* import com.beust.kobalt.internal.IncrementalManager import com.beust.kobalt.internal.JvmCompilerPlugin -import com.beust.kobalt.internal.KobaltLog +import com.beust.kobalt.internal.ParallelLogger import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.PomGenerator import com.beust.kobalt.misc.KFiles @@ -24,7 +24,7 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana val incrementalManagerFactory: IncrementalManager.IFactory, val executors: KobaltExecutors, val jarGenerator: JarGenerator, val warGenerator: WarGenerator, val zipGenerator: ZipGenerator, val taskContributor: TaskContributor, - val kobaltLog: KobaltLog, + val kobaltLog: ParallelLogger, val pomFactory: PomGenerator.IFactory, val configActor: ConfigActor) : BasePlugin(), ITaskContributor, IIncrementalAssemblyContributor, IConfigActor by configActor { diff --git a/src/main/kotlin/com/beust/kobalt/plugin/packaging/WarGenerator.kt b/src/main/kotlin/com/beust/kobalt/plugin/packaging/WarGenerator.kt index ef09134a..fbd91ba3 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/packaging/WarGenerator.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/packaging/WarGenerator.kt @@ -7,7 +7,7 @@ import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.Project import com.beust.kobalt.archive.Archives import com.beust.kobalt.archive.War -import com.beust.kobalt.internal.KobaltLog +import com.beust.kobalt.internal.ParallelLogger import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.misc.From import com.beust.kobalt.misc.IncludedFile @@ -19,7 +19,7 @@ import java.io.OutputStream import java.nio.file.Paths import java.util.jar.JarOutputStream -class WarGenerator @Inject constructor(val dependencyManager: DependencyManager, val kobaltLog: KobaltLog) { +class WarGenerator @Inject constructor(val dependencyManager: DependencyManager, val kobaltLog: ParallelLogger) { companion object { val WEB_INF = "WEB-INF" diff --git a/src/main/kotlin/com/beust/kobalt/plugin/packaging/ZipGenerator.kt b/src/main/kotlin/com/beust/kobalt/plugin/packaging/ZipGenerator.kt index f2feaf55..6f9f5fc6 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/packaging/ZipGenerator.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/packaging/ZipGenerator.kt @@ -5,11 +5,11 @@ import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.Project import com.beust.kobalt.archive.Archives import com.beust.kobalt.archive.Zip -import com.beust.kobalt.internal.KobaltLog +import com.beust.kobalt.internal.ParallelLogger import com.beust.kobalt.maven.DependencyManager import com.google.inject.Inject -class ZipGenerator @Inject constructor(val dependencyManager: DependencyManager, val kobaltLog: KobaltLog) { +class ZipGenerator @Inject constructor(val dependencyManager: DependencyManager, val kobaltLog: ParallelLogger) { fun generateZip(project: Project, context: KobaltContext, zip: Zip) { val allFiles = JarGenerator.findIncludedFiles(project.directory, zip.includedFiles, zip.excludes) Archives.generateArchive(project, context, zip.name, ".zip", allFiles, kobaltLog = kobaltLog)