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

Upgrade to contraband 0.3.3

This commit is contained in:
Dale Wijnand 2018-03-08 12:39:43 +00:00
parent 27bbde810d
commit ed5a8c118b
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main-command/src/main/contraband-scala/sbt/Exec.scala
View File

@ -42,8 +42,8 @@ final class Exec private (
}
object Exec {
def newExecId: String = java.util.UUID.randomUUID.toString
def apply(commandLine: String, source: Option[sbt.CommandSource]): Exec = new Exec(commandLine, None, source)
def apply(commandLine: String, source: sbt.CommandSource): Exec = new Exec(commandLine, None, Option(source))
def apply(commandLine: String, source: Option[sbt.CommandSource]): Exec = new Exec(commandLine, source)
def apply(commandLine: String, source: sbt.CommandSource): Exec = new Exec(commandLine, Option(source))
def apply(commandLine: String, execId: Option[String], source: Option[sbt.CommandSource]): Exec = new Exec(commandLine, execId, source)
def apply(commandLine: String, execId: String, source: sbt.CommandSource): Exec = new Exec(commandLine, Option(execId), Option(source))
}

2
project/plugins.sbt
View File

@ -2,6 +2,6 @@ scalaVersion := "2.12.4"
scalacOptions ++= Seq("-feature", "-language:postfixOps")
addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.5")
addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.2")
addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.3")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.8.0")

2
protocol/src/main/contraband-scala/sbt/protocol/ExecCommand.scala
View File

@ -36,7 +36,7 @@ final class ExecCommand private (
}
object ExecCommand {
def apply(commandLine: String): ExecCommand = new ExecCommand(commandLine, None)
def apply(commandLine: String): ExecCommand = new ExecCommand(commandLine)
def apply(commandLine: String, execId: Option[String]): ExecCommand = new ExecCommand(commandLine, execId)
def apply(commandLine: String, execId: String): ExecCommand = new ExecCommand(commandLine, Option(execId))
}

2
run/src/main/contraband-scala/sbt/ForkOptions.scala
View File

@ -79,7 +79,7 @@ final class ForkOptions private (
}
object ForkOptions {
def apply(): ForkOptions = new ForkOptions(None, None, Vector(), None, Vector(), false, Map())
def apply(): ForkOptions = new ForkOptions()
def apply(javaHome: Option[java.io.File], outputStrategy: Option[sbt.OutputStrategy], bootJars: Vector[java.io.File], workingDirectory: Option[java.io.File], runJVMOptions: Vector[String], connectInput: Boolean, envVars: scala.collection.immutable.Map[String, String]): ForkOptions = new ForkOptions(javaHome, outputStrategy, bootJars, workingDirectory, runJVMOptions, connectInput, envVars)
def apply(javaHome: java.io.File, outputStrategy: sbt.OutputStrategy, bootJars: Vector[java.io.File], workingDirectory: java.io.File, runJVMOptions: Vector[String], connectInput: Boolean, envVars: scala.collection.immutable.Map[String, String]): ForkOptions = new ForkOptions(Option(javaHome), Option(outputStrategy), bootJars, Option(workingDirectory), runJVMOptions, connectInput, envVars)
}