luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hidden service Scripted sbt config and added resource for correct plugin discovery

This commit is contained in:
Artyom Olshevskiy 2011-04-28 06:01:53 +03:00
parent 6c6eccea4f
commit 53c8967441
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripted/plugin/ScriptedPlugin.scala
View File

@ -10,7 +10,7 @@ import java.lang.reflect.Method
import java.util.Properties import java.util.Properties
object ScriptedPlugin extends Plugin { object ScriptedPlugin extends Plugin {
def scriptedConf = config("scripted-sbt") def scriptedConf = config("scripted-sbt") hide
val scriptedSbt = SettingKey[String]("scripted-sbt") val scriptedSbt = SettingKey[String]("scripted-sbt")
val sbtLauncher = SettingKey[File]("sbt-launcher") val sbtLauncher = SettingKey[File]("sbt-launcher")
@ -47,7 +47,7 @@ object ScriptedPlugin extends Plugin {
val scriptedSettings = Seq( val scriptedSettings = Seq(
ivyConfigurations += scriptedConf, ivyConfigurations += scriptedConf,
scriptedSbt <<= (appConfiguration)(_.provider.id.version), scriptedSbt <<= (appConfiguration)(_.provider.id.version),
scriptedScalas <<= (scalaInstance) { (scala) => ScriptedScalas(scala.version, scala.version) }, scriptedScalas <<= (scalaVersion) { (scala) => ScriptedScalas(scala, scala) },
libraryDependencies <<= (libraryDependencies, scriptedScalas, scriptedSbt) {(deps, scalas, version) => deps :+ "org.scala-tools.sbt" % ("scripted-sbt_" + scalas.build) % version % scriptedConf.toString }, libraryDependencies <<= (libraryDependencies, scriptedScalas, scriptedSbt) {(deps, scalas, version) => deps :+ "org.scala-tools.sbt" % ("scripted-sbt_" + scalas.build) % version % scriptedConf.toString },
sbtLauncher <<= (appConfiguration)(app => IO.classLocationFile(app.provider.scalaProvider.launcher.getClass)), sbtLauncher <<= (appConfiguration)(app => IO.classLocationFile(app.provider.scalaProvider.launcher.getClass)),
sbtTestDirectory <<= sourceDirectory / "sbt-test", sbtTestDirectory <<= sourceDirectory / "sbt-test",

1
scripted/plugin/src/main/resources/sbt/sbt.plugins Normal file
View File

@ -0,0 +1 @@
ScriptedPlugin