diff --git a/build.sbt b/build.sbt index 29fe547..09fbd23 100644 --- a/build.sbt +++ b/build.sbt @@ -2,8 +2,6 @@ sbtPlugin := true scalacOptions := Seq("-deprecation", "-encoding", "utf8") -crossSbtVersions := Vector("1.2.8", "0.13.18") - // Scripted test options. scriptedSettings diff --git a/src/main/scala-sbt-0.13/spray/revolver/SbtCompat.scala b/src/main/scala-sbt-0.13/spray/revolver/SbtCompat.scala deleted file mode 100644 index 132578d..0000000 --- a/src/main/scala-sbt-0.13/spray/revolver/SbtCompat.scala +++ /dev/null @@ -1,15 +0,0 @@ -package spray.revolver - -import sbt.ForkOptions - -object SbtCompat { - type Process = sbt.Process - - implicit class ForkOptionsCompatOps(val underlying: ForkOptions) extends AnyVal { - def withRunJVMOptions(runJVMOptions: Seq[String]): ForkOptions = - underlying.copy(runJVMOptions = runJVMOptions) - - def withOutputStrategy(outputStrategy: sbt.OutputStrategy): ForkOptions = - underlying.copy(outputStrategy = Option(outputStrategy)) - } -} diff --git a/src/main/scala-sbt-1.0/spray/revolver/SbtCompat.scala b/src/main/scala-sbt-1.0/spray/revolver/SbtCompat.scala deleted file mode 100644 index 9cc1cbc..0000000 --- a/src/main/scala-sbt-1.0/spray/revolver/SbtCompat.scala +++ /dev/null @@ -1,7 +0,0 @@ -package spray.revolver - -import sbt.ForkOptions - -object SbtCompat { - type Process = scala.sys.process.Process -} diff --git a/src/main/scala/spray/revolver/Actions.scala b/src/main/scala/spray/revolver/Actions.scala index f9b9d6b..35ee891 100644 --- a/src/main/scala/spray/revolver/Actions.scala +++ b/src/main/scala/spray/revolver/Actions.scala @@ -19,7 +19,7 @@ package spray.revolver import sbt.Keys._ import sbt.{Fork, ForkOptions, LoggedOutput, Logger, Path, ProjectRef, State, complete} import java.io.File -import SbtCompat._ +import scala.sys.process.Process object Actions { import Utilities._ diff --git a/src/main/scala/spray/revolver/AppProcess.scala b/src/main/scala/spray/revolver/AppProcess.scala index 4d7cd24..5abd677 100644 --- a/src/main/scala/spray/revolver/AppProcess.scala +++ b/src/main/scala/spray/revolver/AppProcess.scala @@ -17,8 +17,9 @@ package spray.revolver import java.lang.{Runtime => JRuntime} -import sbt.{ProjectRef, Logger} -import SbtCompat._ +import sbt.{Logger, ProjectRef} + +import scala.sys.process.Process /** * A token which we put into the SBT state to hold the Process of an application running in the background.