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

Rename to BuildFileCompiler.

Browse source
This commit is contained in:
Cedric Beust 2015-10-20 21:56:24 -07:00
parent 53610049ff
commit 0b704315d2
5 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/kotlin/com/beust/kobalt/Main.kt
View file

@ -8,7 +8,7 @@ import com.beust.kobalt.internal.*
import com.beust.kobalt.kotlin.BuildFile import com.beust.kobalt.kotlin.BuildFile
import com.beust.kobalt.maven.* import com.beust.kobalt.maven.*
import com.beust.kobalt.misc.* import com.beust.kobalt.misc.*
import com.beust.kobalt.kotlin.ScriptCompiler2 import com.beust.kobalt.kotlin.BuildFileCompiler
import com.beust.kobalt.wrapper.Wrapper import com.beust.kobalt.wrapper.Wrapper
import com.google.inject.Guice import com.google.inject.Guice
import java.io.File import java.io.File
@ -38,7 +38,7 @@ public fun mainNoExit(argv: Array<String>) : Int {
} }
private class Main @Inject constructor( private class Main @Inject constructor(
val buildFileCompilerFactory: ScriptCompiler2.IFactory, val buildFileCompilerFactory: BuildFileCompiler.IFactory,
val plugins: Plugins, val plugins: Plugins,
val taskManager: TaskManager, val taskManager: TaskManager,
val http: Http, val http: Http,

4
src/main/kotlin/com/beust/kobalt/internal/KobaltClient.kt
View file

@ -2,7 +2,7 @@ package com.beust.kobalt.internal
import com.beust.kobalt.Args import com.beust.kobalt.Args
import com.beust.kobalt.SystemProperties import com.beust.kobalt.SystemProperties
import com.beust.kobalt.kotlin.ScriptCompiler2 import com.beust.kobalt.kotlin.BuildFileCompiler
import com.beust.kobalt.mainNoExit import com.beust.kobalt.mainNoExit
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
import com.google.gson.JsonObject import com.google.gson.JsonObject
@ -54,7 +54,7 @@ public class KobaltClient @Inject constructor() : Runnable {
} }
} }
fun sendInfo(info: ScriptCompiler2.BuildScriptInfo) { fun sendInfo(info: BuildFileCompiler.BuildScriptInfo) {
outgoing!!.println("Sending info with project count: " + info.projects.size()) outgoing!!.println("Sending info with project count: " + info.projects.size())
} }
} }

7
src/main/kotlin/com/beust/kobalt/internal/KobaltServer.kt
View file

@ -1,9 +1,8 @@
package com.beust.kobalt.internal package com.beust.kobalt.internal
import com.beust.klaxon.json
import com.beust.kobalt.Args import com.beust.kobalt.Args
import com.beust.kobalt.kotlin.BuildFile import com.beust.kobalt.kotlin.BuildFile
import com.beust.kobalt.kotlin.ScriptCompiler2 import com.beust.kobalt.kotlin.BuildFileCompiler
import com.beust.kobalt.maven.IClasspathDependency import com.beust.kobalt.maven.IClasspathDependency
import com.beust.kobalt.maven.MavenDependency import com.beust.kobalt.maven.MavenDependency
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors
@ -20,7 +19,7 @@ import java.net.SocketException
import java.nio.file.Paths import java.nio.file.Paths
public class KobaltServer @Inject constructor(val args: Args, val executors: KobaltExecutors, public class KobaltServer @Inject constructor(val args: Args, val executors: KobaltExecutors,
val buildFileCompilerFactory: ScriptCompiler2.IFactory) : Runnable { val buildFileCompilerFactory: BuildFileCompiler.IFactory) : Runnable {
var outgoing: PrintWriter? = null var outgoing: PrintWriter? = null
val pending = arrayListOf<String>() val pending = arrayListOf<String>()
@ -90,7 +89,7 @@ public class KobaltServer @Inject constructor(val args: Args, val executors: Kob
class GetDependenciesData(val projects: List<ProjectData>) class GetDependenciesData(val projects: List<ProjectData>)
private fun toJson(info: ScriptCompiler2.BuildScriptInfo) : String { private fun toJson(info: BuildFileCompiler.BuildScriptInfo) : String {
val executor = executors.miscExecutor val executor = executors.miscExecutor
val projects = arrayListOf<ProjectData>() val projects = arrayListOf<ProjectData>()

4
src/main/kotlin/com/beust/kobalt/kotlin/ScriptCompiler2.kt → src/main/kotlin/com/beust/kobalt/kotlin/BuildFileCompiler.kt
View file

@ -24,11 +24,11 @@ import java.nio.file.Paths
import java.util.jar.JarInputStream import java.util.jar.JarInputStream
import javax.inject.Inject import javax.inject.Inject
public class ScriptCompiler2 @Inject constructor(@Assisted("buildFiles") val buildFiles: List<BuildFile>, public class BuildFileCompiler @Inject constructor(@Assisted("buildFiles") val buildFiles: List<BuildFile>,
val files: KFiles, val plugins: Plugins) { val files: KFiles, val plugins: Plugins) {
interface IFactory { interface IFactory {
fun create(@Assisted("buildFiles") buildFiles: List<BuildFile>) : ScriptCompiler2 fun create(@Assisted("buildFiles") buildFiles: List<BuildFile>) : BuildFileCompiler
} }
val observable = PublishSubject.create<BuildScriptInfo>() val observable = PublishSubject.create<BuildScriptInfo>()

4
src/main/kotlin/com/beust/kobalt/misc/MainModule.kt
View file

@ -1,7 +1,7 @@
package com.beust.kobalt.misc package com.beust.kobalt.misc
import com.beust.kobalt.Args import com.beust.kobalt.Args
import com.beust.kobalt.kotlin.ScriptCompiler2 import com.beust.kobalt.kotlin.BuildFileCompiler
import com.beust.kobalt.maven.ArtifactFetcher import com.beust.kobalt.maven.ArtifactFetcher
import com.beust.kobalt.maven.LocalRepo import com.beust.kobalt.maven.LocalRepo
import com.beust.kobalt.maven.Pom import com.beust.kobalt.maven.Pom
@ -40,7 +40,7 @@ public open class MainModule(val args: Args) : AbstractModule() {
PomGenerator.IFactory::class.java, PomGenerator.IFactory::class.java,
JCenterApi.IFactory::class.java, JCenterApi.IFactory::class.java,
Pom.IFactory::class.java, Pom.IFactory::class.java,
ScriptCompiler2.IFactory::class.java, BuildFileCompiler.IFactory::class.java,
ArtifactFetcher.IFactory::class.java) ArtifactFetcher.IFactory::class.java)
.forEach { .forEach {
install(builder.build(it)) install(builder.build(it))