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

Make scripted support sbt 1.0.0-RC1 or later 

Fixes #3325
This commit is contained in:
Dale Wijnand 2017-07-17 16:01:22 +01:00
parent 6ce09cfed6
commit d71678faa9
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scripted/plugin/src/main/scala/sbt/ScriptedPlugin.scala
View File

@ -9,7 +9,7 @@ import complete.{ Parser, DefaultParsers }
import classpath.ClasspathUtilities import classpath.ClasspathUtilities
import java.lang.reflect.{ InvocationTargetException, Method } import java.lang.reflect.{ InvocationTargetException, Method }
import java.util.Properties import java.util.Properties
import CrossVersion.binarySbtVersion import CrossVersion.partialVersion
object ScriptedPlugin extends Plugin { object ScriptedPlugin extends Plugin {
def scriptedConf = config("scripted-sbt") hide def scriptedConf = config("scripted-sbt") hide
@ -101,20 +101,18 @@ object ScriptedPlugin extends Plugin {
scriptedSbt := (sbtVersion in pluginCrossBuild).value, scriptedSbt := (sbtVersion in pluginCrossBuild).value,
sbtLauncher <<= getJars(scriptedLaunchConf).map(_.get.head), sbtLauncher <<= getJars(scriptedLaunchConf).map(_.get.head),
sbtTestDirectory := sourceDirectory.value / "sbt-test", sbtTestDirectory := sourceDirectory.value / "sbt-test",
libraryDependencies ++= { libraryDependencies ++= (partialVersion(scriptedSbt.value) match {
binarySbtVersion(scriptedSbt.value) match { case Some((0, 13)) =>
case "0.13" => Seq(
Seq( "org.scala-sbt" % "scripted-sbt" % scriptedSbt.value % scriptedConf.toString,
"org.scala-sbt" % "scripted-sbt" % scriptedSbt.value % scriptedConf.toString, "org.scala-sbt" % "sbt-launch" % scriptedSbt.value % scriptedLaunchConf.toString
"org.scala-sbt" % "sbt-launch" % scriptedSbt.value % scriptedLaunchConf.toString )
) case Some((1, _)) =>
case sv if sv startsWith "1.0." => Seq(
Seq( "org.scala-sbt" %% "scripted-sbt" % scriptedSbt.value % scriptedConf.toString,
"org.scala-sbt" %% "scripted-sbt" % scriptedSbt.value % scriptedConf.toString, "org.scala-sbt" % "sbt-launch" % scriptedSbt.value % scriptedLaunchConf.toString
"org.scala-sbt" % "sbt-launch" % scriptedSbt.value % scriptedLaunchConf.toString )
) }),
}
},
scriptedBufferLog := true, scriptedBufferLog := true,
scriptedClasspath := getJars(scriptedConf).value, scriptedClasspath := getJars(scriptedConf).value,
scriptedTests <<= scriptedTestsTask, scriptedTests <<= scriptedTestsTask,