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

Merge pull request #3363 from sbt/fport/3329 

[fport] Make scripted support sbt 1.0.0-RC1 or later
This commit is contained in:
eugene yokota 2017-07-24 22:20:36 -04:00 committed by GitHub
parent 26954994e2 696aacb31f
commit ac7b1498a9
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 sbt.internal.util.complete.{ Parser, DefaultParsers }
import sbt.internal.inc.classpath.ClasspathUtilities import sbt.internal.inc.classpath.ClasspathUtilities
import sbt.internal.inc.ModuleUtilities import sbt.internal.inc.ModuleUtilities
import java.lang.reflect.Method import java.lang.reflect.Method
import sbt.librarymanagement.CrossVersion.binarySbtVersion import sbt.librarymanagement.CrossVersion.partialVersion
object ScriptedPlugin extends AutoPlugin { object ScriptedPlugin extends AutoPlugin {
override def requires = plugins.JvmPlugin override def requires = plugins.JvmPlugin
@ -36,20 +36,18 @@ object ScriptedPlugin extends AutoPlugin {
scriptedSbt := (sbtVersion in pluginCrossBuild).value, scriptedSbt := (sbtVersion in pluginCrossBuild).value,
sbtLauncher := getJars(ScriptedLaunchConf).map(_.get.head).value, sbtLauncher := getJars(ScriptedLaunchConf).map(_.get.head).value,
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,
"org.scala-sbt" % "scripted-sbt" % scriptedSbt.value % ScriptedConf.toString, "org.scala-sbt" % "sbt-launch" % scriptedSbt.value % ScriptedLaunchConf
"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,
"org.scala-sbt" %% "scripted-sbt" % scriptedSbt.value % ScriptedConf.toString, "org.scala-sbt" % "sbt-launch" % scriptedSbt.value % ScriptedLaunchConf
"org.scala-sbt" % "sbt-launch" % scriptedSbt.value % ScriptedLaunchConf.toString )
) }),
}
},
scriptedBufferLog := true, scriptedBufferLog := true,
scriptedClasspath := getJars(ScriptedConf).value, scriptedClasspath := getJars(ScriptedConf).value,
scriptedTests := scriptedTestsTask.value, scriptedTests := scriptedTestsTask.value,