diff --git a/scripted/plugin/ScriptedPlugin.scala b/scripted/plugin/ScriptedPlugin.scala index fe119cf13..b83e8c7dd 100644 --- a/scripted/plugin/ScriptedPlugin.scala +++ b/scripted/plugin/ScriptedPlugin.scala @@ -10,7 +10,7 @@ import java.lang.reflect.Method import java.util.Properties object ScriptedPlugin extends Plugin { - def scriptedConf = config("scripted-sbt") + def scriptedConf = config("scripted-sbt") hide val scriptedSbt = SettingKey[String]("scripted-sbt") val sbtLauncher = SettingKey[File]("sbt-launcher") @@ -47,7 +47,7 @@ object ScriptedPlugin extends Plugin { val scriptedSettings = Seq( ivyConfigurations += scriptedConf, 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 }, sbtLauncher <<= (appConfiguration)(app => IO.classLocationFile(app.provider.scalaProvider.launcher.getClass)), sbtTestDirectory <<= sourceDirectory / "sbt-test", diff --git a/scripted/plugin/src/main/resources/sbt/sbt.plugins b/scripted/plugin/src/main/resources/sbt/sbt.plugins new file mode 100644 index 000000000..c4c4234d0 --- /dev/null +++ b/scripted/plugin/src/main/resources/sbt/sbt.plugins @@ -0,0 +1 @@ +ScriptedPlugin \ No newline at end of file