Cleanup parameter list of ScriptedTests.

All of `sbtVersion`, `defScalaVersion` and `buildScalaVersions` were
not used anymore. According to @harrah they are coming from really
old days of sbt and are not needed because of changes to how sbt
interacts with different Scala versions.
This commit is contained in:
Grzegorz Kossakowski
2012-12-14 12:57:47 -05:00
committed by Mark Harrah
parent 71f12fbcdb
commit ae211ee33e
3 changed files with 10 additions and 16 deletions
@@ -16,8 +16,6 @@ object ScriptedPlugin extends Plugin {
val sbtLauncher = SettingKey[File]("sbt-launcher")
val sbtTestDirectory = SettingKey[File]("sbt-test-directory")
val scriptedBufferLog = SettingKey[Boolean]("scripted-buffer-log")
final case class ScriptedScalas(build: String, versions: String)
val scriptedScalas = SettingKey[ScriptedScalas]("scripted-scalas")
val scriptedClasspath = TaskKey[PathFinder]("scripted-classpath")
val scriptedTests = TaskKey[AnyRef]("scripted-tests")
@@ -43,7 +41,6 @@ object ScriptedPlugin extends Plugin {
try {
scriptedRun.value.invoke(
scriptedTests.value, sbtTestDirectory.value, scriptedBufferLog.value: java.lang.Boolean,
scriptedSbt.value.toString, scriptedScalas.value.build, scriptedScalas.value.versions,
args.toArray, sbtLauncher.value, scriptedLaunchOpts.value.toArray)
}
catch { case e: java.lang.reflect.InvocationTargetException => throw e.getCause }
@@ -52,7 +49,6 @@ object ScriptedPlugin extends Plugin {
val scriptedSettings = Seq(
ivyConfigurations += scriptedConf,
scriptedSbt <<= (appConfiguration)(_.provider.id.version),
scriptedScalas <<= (scalaVersion) { (scala) => ScriptedScalas(scala, scala) },
libraryDependencies <<= (libraryDependencies, scriptedSbt) {(deps, version) => deps :+ "org.scala-sbt" % "scripted-sbt" % version % scriptedConf.toString },
sbtLauncher <<= (appConfiguration)(app => IO.classLocationFile(app.provider.scalaProvider.launcher.getClass)),
sbtTestDirectory <<= sourceDirectory / "sbt-test",