From cd5f633d5466ba46f038969a2980fa27dfe5c963 Mon Sep 17 00:00:00 2001 From: Artyom Olshevskiy Date: Mon, 25 Apr 2011 23:10:38 +0300 Subject: [PATCH] Adjusted scripted sbt dep to conform old code --- scripted/plugin/ScriptedPlugin.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripted/plugin/ScriptedPlugin.scala b/scripted/plugin/ScriptedPlugin.scala index 937c14c3d..7e72838c5 100644 --- a/scripted/plugin/ScriptedPlugin.scala +++ b/scripted/plugin/ScriptedPlugin.scala @@ -44,11 +44,11 @@ object ScriptedPlugin extends Plugin { val scriptedSettings = Seq( ivyConfigurations += scriptedConf, scriptedSbt <<= (appConfiguration)(_.provider.id.version), - libraryDependencies <<= (libraryDependencies, scriptedSbt) {(deps, version) => deps :+ "org.scala-tools.sbt" %% "scripted-sbt" % version % scriptedConf.toString }, + scriptedScalas <<= (scalaInstance) { (scala) => ScriptedScalas(scala.version, scala.version) }, + 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", scriptedBufferLog := true, - scriptedScalas <<= (scalaInstance) { (scala) => ScriptedScalas(scala.version, scala.version) }, scriptedClasspath <<= (classpathTypes, update) map { (ct, report) => Path.finder(Classpaths.managedJars(scriptedConf, ct, report).map(_.data)) }, scriptedTests <<= scriptedTestsTask, scriptedRun <<= scriptedRunTask,