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

Settings for Kobalt.

Browse source 
~/.kobalt/settings.xml.
This commit is contained in:
Cedric Beust 2016-01-12 23:40:48 +04:00
parent 24bd2c6299
commit 27d6332ea4
8 changed files with 81 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import com.beust.kobalt.app.ProjectGenerator
import com.beust.kobalt.app.UpdateKobalt
import com.beust.kobalt.app.remote.KobaltClient
import com.beust.kobalt.app.remote.KobaltServer
import com.beust.kobalt.internal.KobaltSettings
import com.beust.kobalt.internal.PluginInfo
import com.beust.kobalt.internal.TaskManager
import com.beust.kobalt.internal.build.BuildFile
@ -43,7 +44,7 @@ private fun parseArgs(argv: Array<String>): Main.RunInfo {
public fun mainNoExit(argv: Array<String>): Int {
val (jc, args) = parseArgs(argv)
Kobalt.INJECTOR = Guice.createInjector(MainModule(args))
Kobalt.INJECTOR = Guice.createInjector(MainModule(args, KobaltSettings.readSettingsXml()))
return Kobalt.INJECTOR.getInstance(Main::class.java).run(jc, args, argv)
}

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

@ -8,6 +8,7 @@ import com.beust.kobalt.api.Kobalt
import com.beust.kobalt.api.KobaltContext
import com.beust.kobalt.api.PluginProperties
import com.beust.kobalt.api.Project
import com.beust.kobalt.internal.KobaltSettings
import com.beust.kobalt.internal.PluginInfo
import com.beust.kobalt.internal.build.BuildFile
import com.beust.kobalt.internal.build.VersionFile
@ -30,7 +31,7 @@ import javax.inject.Inject
public class BuildFileCompiler @Inject constructor(@Assisted("buildFiles") val buildFiles: List<BuildFile>,
@Assisted val pluginInfo: PluginInfo, val files: KFiles, val plugins: Plugins,
val dependencyManager: DependencyManager, val pluginProperties: PluginProperties,
val executors: KobaltExecutors, val buildScriptUtil: BuildScriptUtil) {
val executors: KobaltExecutors, val buildScriptUtil: BuildScriptUtil, val settings: KobaltSettings) {
interface IFactory {
fun create(@Assisted("buildFiles") buildFiles: List<BuildFile>, pluginInfo: PluginInfo) : BuildFileCompiler
@ -47,6 +48,7 @@ public class BuildFileCompiler @Inject constructor(@Assisted("buildFiles") val b
context.pluginProperties = pluginProperties
context.dependencyManager = dependencyManager
context.executors = executors
context.settings = settings
Kobalt.context = context
//

7
src/main/kotlin/com/beust/kobalt/app/MainModule.kt
View file

@ -1,6 +1,7 @@
package com.beust.kobalt.app
import com.beust.kobalt.Args
import com.beust.kobalt.internal.KobaltSettings
import com.beust.kobalt.internal.PluginInfo
import com.beust.kobalt.maven.ArtifactFetcher
import com.beust.kobalt.maven.LocalRepo
@ -16,7 +17,7 @@ import com.google.inject.TypeLiteral
import com.google.inject.assistedinject.FactoryModuleBuilder
import java.util.concurrent.ExecutorService
public open class MainModule(val args: Args) : AbstractModule() {
public open class MainModule(val args: Args, val settings: KobaltSettings) : AbstractModule() {
val executors = KobaltExecutors()
open fun configureTest() {
@ -48,7 +49,9 @@ public open class MainModule(val args: Args) : AbstractModule() {
bind(PluginInfo::class.java).toProvider(Provider<PluginInfo> {
PluginInfo.readKobaltPluginXml()
}).`in`(Singleton::class.java)
bind(KobaltSettings::class.java).toProvider(Provider<KobaltSettings> {
settings
}).`in`(Singleton::class.java)
// bindListener(Matchers.any(), object: TypeListener {
// override fun <I> hear(typeLiteral: TypeLiteral<I>?, typeEncounter: TypeEncounter<I>?) {

14
src/test/kotlin/com/beust/kobalt/TestModule.kt
View file

@ -1,14 +1,20 @@
package com.beust.kobalt
import com.beust.kobalt.Args
import com.beust.kobalt.maven.LocalRepo
import com.beust.kobalt.app.MainModule
import com.beust.kobalt.internal.KobaltSettings
import com.beust.kobalt.internal.KobaltSettingsXml
import com.beust.kobalt.maven.LocalRepo
import com.google.inject.Scopes
import java.io.File
class TestLocalRepo: LocalRepo(localRepo = SystemProperties.homeDir + File.separatorChar + ".kobalt-test")
val TEST_KOBALT_SETTINGS = KobaltSettings(KobaltSettingsXml()).apply {
localRepo = SystemProperties.homeDir + File.separatorChar + "" +
".kobalt-test"
}
public class TestModule : MainModule(Args()) {
class TestLocalRepo: LocalRepo(TEST_KOBALT_SETTINGS)
public class TestModule : MainModule(Args(), TEST_KOBALT_SETTINGS) {
override fun configureTest() {
bind(LocalRepo::class.java).to(TestLocalRepo::class.java).`in`(Scopes.SINGLETON)
}