1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00

Rename to ParallelLogger.

This commit is contained in:
Cedric Beust 2016-08-08 17:37:14 -07:00
parent e639c72b2f
commit fa6820e440
10 changed files with 16 additions and 16 deletions

View file

@ -4,7 +4,7 @@ import com.beust.kobalt.api.KobaltContext
import com.beust.kobalt.api.Project import com.beust.kobalt.api.Project
import com.beust.kobalt.archive.Archives import com.beust.kobalt.archive.Archives
import com.beust.kobalt.archive.Jar 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.DependencyManager
import com.beust.kobalt.maven.aether.Scope import com.beust.kobalt.maven.aether.Scope
import com.beust.kobalt.misc.* import com.beust.kobalt.misc.*
@ -122,7 +122,7 @@ class JarGenerator @Inject constructor(val dependencyManager: DependencyManager)
return result 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) val includedFiles = findIncludedFiles(project, context, jar)
// //

View file

@ -5,7 +5,7 @@ import com.beust.kobalt.IFileSpec
import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.KobaltContext
import com.beust.kobalt.api.Project import com.beust.kobalt.api.Project
import com.beust.kobalt.api.annotation.ExportedProjectProperty 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 com.beust.kobalt.misc.*
import java.io.File import java.io.File
import java.io.FileOutputStream import java.io.FileOutputStream
@ -29,7 +29,7 @@ class Archives {
includedFiles: List<IncludedFile>, includedFiles: List<IncludedFile>,
expandJarFiles : Boolean = false, expandJarFiles : Boolean = false,
outputStreamFactory: (OutputStream) -> ZipOutputStream = DEFAULT_STREAM_FACTORY, outputStreamFactory: (OutputStream) -> ZipOutputStream = DEFAULT_STREAM_FACTORY,
kobaltLog: KobaltLog) : File { kobaltLog: ParallelLogger) : File {
val fullArchiveName = context.variant.archiveName(project, archiveName, suffix) val fullArchiveName = context.variant.archiveName(project, archiveName, suffix)
val archiveDir = File(KFiles.libsDir(project)) val archiveDir = File(KFiles.libsDir(project))
val result = File(archiveDir.path, fullArchiveName) val result = File(archiveDir.path, fullArchiveName)

View file

@ -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. * Yes, this code was pretty painful to write and I'm pretty sure it still have a few bugs left.
*/ */
@Singleton @Singleton
class KobaltLog @Inject constructor(val args: Args) { class ParallelLogger @Inject constructor(val args: Args) {
enum class Type { LOG, WARN, ERROR } enum class Type { LOG, WARN, ERROR }
class LogLine(val name: String? = null, val level: Int, val message: String, val type: Type) class LogLine(val name: String? = null, val level: Int, val message: String, val type: Type)

View file

@ -21,7 +21,7 @@ class ParallelProjectRunner(val tasksByNames: (Project) -> ListMultimap<String,
val reverseDependsOn: TreeMultimap<String, String>, val runBefore: TreeMultimap<String, String>, val reverseDependsOn: TreeMultimap<String, String>, val runBefore: TreeMultimap<String, String>,
val runAfter: TreeMultimap<String, String>, val runAfter: TreeMultimap<String, String>,
val alwaysRunAfter: TreeMultimap<String, String>, val args: Args, val pluginInfo: PluginInfo, val alwaysRunAfter: TreeMultimap<String, String>, val args: Args, val pluginInfo: PluginInfo,
val kobaltLog: KobaltLog) val kobaltLog: ParallelLogger)
: BaseProjectRunner() { : BaseProjectRunner() {
override fun runProjects(taskInfos: List<TaskManager.TaskInfo>, projects: List<Project>) override fun runProjects(taskInfos: List<TaskManager.TaskInfo>, projects: List<Project>)
: TaskManager .RunTargetResult { : TaskManager .RunTargetResult {

View file

@ -17,7 +17,7 @@ import javax.inject.Singleton
@Singleton @Singleton
class TaskManager @Inject constructor(val args: Args, class TaskManager @Inject constructor(val args: Args,
val incrementalManagerFactory: IncrementalManager.IFactory, val incrementalManagerFactory: IncrementalManager.IFactory,
val pluginInfo: PluginInfo, val kobaltLog: KobaltLog) { val pluginInfo: PluginInfo, val kobaltLog: ParallelLogger) {
private val dependsOn = TreeMultimap.create<String, String>() private val dependsOn = TreeMultimap.create<String, String>()
private val reverseDependsOn = TreeMultimap.create<String, String>() private val reverseDependsOn = TreeMultimap.create<String, String>()
private val runBefore = TreeMultimap.create<String, String>() private val runBefore = TreeMultimap.create<String, String>()

View file

@ -9,7 +9,7 @@ import com.beust.kobalt.api.KobaltContext
import com.beust.kobalt.api.Project import com.beust.kobalt.api.Project
import com.beust.kobalt.internal.ICompilerAction import com.beust.kobalt.internal.ICompilerAction
import com.beust.kobalt.internal.JvmCompiler 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.KFiles
import com.beust.kobalt.misc.Strings import com.beust.kobalt.misc.Strings
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
@ -24,7 +24,7 @@ import javax.tools.ToolProvider
@Singleton @Singleton
class JavaCompiler @Inject constructor(val jvmCompiler: JvmCompiler, class JavaCompiler @Inject constructor(val jvmCompiler: JvmCompiler,
val kobaltLog: KobaltLog) : ICompiler { val kobaltLog: ParallelLogger) : ICompiler {
fun compilerAction(executable: File) = object : ICompilerAction { fun compilerAction(executable: File) = object : ICompilerAction {
override fun compile(projectName: String?, info: CompilerActionInfo): TaskResult { override fun compile(projectName: String?, info: CompilerActionInfo): TaskResult {
if (info.sourceFiles.isEmpty()) { if (info.sourceFiles.isEmpty()) {

View file

@ -36,7 +36,7 @@ class KotlinCompiler @Inject constructor(
val settings: KobaltSettings, val settings: KobaltSettings,
val jvmCompiler: JvmCompiler, val jvmCompiler: JvmCompiler,
val kotlinJarFiles: KotlinJarFiles, val kotlinJarFiles: KotlinJarFiles,
val kobaltLog: KobaltLog) { val kobaltLog: ParallelLogger) {
val compilerAction = object: ICompilerAction { val compilerAction = object: ICompilerAction {
override fun compile(projectName: String?, info: CompilerActionInfo): TaskResult { override fun compile(projectName: String?, info: CompilerActionInfo): TaskResult {

View file

@ -9,7 +9,7 @@ import com.beust.kobalt.api.annotation.Task
import com.beust.kobalt.archive.* import com.beust.kobalt.archive.*
import com.beust.kobalt.internal.IncrementalManager import com.beust.kobalt.internal.IncrementalManager
import com.beust.kobalt.internal.JvmCompilerPlugin 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.DependencyManager
import com.beust.kobalt.maven.PomGenerator import com.beust.kobalt.maven.PomGenerator
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
@ -24,7 +24,7 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana
val incrementalManagerFactory: IncrementalManager.IFactory, val incrementalManagerFactory: IncrementalManager.IFactory,
val executors: KobaltExecutors, val jarGenerator: JarGenerator, val warGenerator: WarGenerator, val executors: KobaltExecutors, val jarGenerator: JarGenerator, val warGenerator: WarGenerator,
val zipGenerator: ZipGenerator, val taskContributor: TaskContributor, val zipGenerator: ZipGenerator, val taskContributor: TaskContributor,
val kobaltLog: KobaltLog, val kobaltLog: ParallelLogger,
val pomFactory: PomGenerator.IFactory, val configActor: ConfigActor<InstallConfig>) val pomFactory: PomGenerator.IFactory, val configActor: ConfigActor<InstallConfig>)
: BasePlugin(), ITaskContributor, IIncrementalAssemblyContributor, : BasePlugin(), ITaskContributor, IIncrementalAssemblyContributor,
IConfigActor<InstallConfig> by configActor { IConfigActor<InstallConfig> by configActor {

View file

@ -7,7 +7,7 @@ import com.beust.kobalt.api.KobaltContext
import com.beust.kobalt.api.Project import com.beust.kobalt.api.Project
import com.beust.kobalt.archive.Archives import com.beust.kobalt.archive.Archives
import com.beust.kobalt.archive.War 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.maven.DependencyManager
import com.beust.kobalt.misc.From import com.beust.kobalt.misc.From
import com.beust.kobalt.misc.IncludedFile import com.beust.kobalt.misc.IncludedFile
@ -19,7 +19,7 @@ import java.io.OutputStream
import java.nio.file.Paths import java.nio.file.Paths
import java.util.jar.JarOutputStream 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 { companion object {
val WEB_INF = "WEB-INF" val WEB_INF = "WEB-INF"

View file

@ -5,11 +5,11 @@ import com.beust.kobalt.api.KobaltContext
import com.beust.kobalt.api.Project import com.beust.kobalt.api.Project
import com.beust.kobalt.archive.Archives import com.beust.kobalt.archive.Archives
import com.beust.kobalt.archive.Zip 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.beust.kobalt.maven.DependencyManager
import com.google.inject.Inject 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) { fun generateZip(project: Project, context: KobaltContext, zip: Zip) {
val allFiles = JarGenerator.findIncludedFiles(project.directory, zip.includedFiles, zip.excludes) val allFiles = JarGenerator.findIncludedFiles(project.directory, zip.includedFiles, zip.excludes)
Archives.generateArchive(project, context, zip.name, ".zip", allFiles, kobaltLog = kobaltLog) Archives.generateArchive(project, context, zip.name, ".zip", allFiles, kobaltLog = kobaltLog)