mirror of https://github.com/sbt/sbt.git
Util 1.3.0-M5
This commit is contained in:
parent
3cd8cc4e86
commit
cd1d2e0994
|
|
@ -290,6 +290,9 @@ lazy val taskProj = (project in file("tasks"))
|
|||
testedBaseSettings,
|
||||
name := "Tasks",
|
||||
mimaSettings,
|
||||
mimaBinaryIssueFilters ++= Seq(
|
||||
exclude[ReversedMissingMethodProblem]("sbt.ExecuteProgress.stop")
|
||||
)
|
||||
)
|
||||
.configure(addSbtUtilControl)
|
||||
|
||||
|
|
|
|||
|
|
@ -138,6 +138,20 @@ object StandardMain {
|
|||
// This is to workaround https://github.com/sbt/io/issues/110
|
||||
sys.props.put("jna.nosys", "true")
|
||||
|
||||
ConsoleAppender.setTerminalWidth(JLine.usingTerminal(_.getWidth))
|
||||
ConsoleAppender.setShowProgress(
|
||||
ConsoleAppender.formatEnabledInEnv && sys.props
|
||||
.get("sbt.progress")
|
||||
.flatMap({ s =>
|
||||
ConsoleAppender.parseLogOption(s) match {
|
||||
case LogOption.Always => Some(true)
|
||||
case LogOption.Never => Some(false)
|
||||
case _ => None
|
||||
}
|
||||
})
|
||||
.getOrElse(true)
|
||||
)
|
||||
|
||||
import BasicCommandStrings.isEarlyCommand
|
||||
val userCommands = configuration.arguments.map(_.trim)
|
||||
val (earlyCommands, normalCommands) = (preCommands ++ userCommands).partition(isEarlyCommand)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ object Dependencies {
|
|||
|
||||
// sbt modules
|
||||
private val ioVersion = "1.3.0-M5"
|
||||
private val utilVersion = "1.3.0-M4"
|
||||
private val utilVersion = "1.3.0-M5"
|
||||
private val lmVersion =
|
||||
sys.props.get("sbt.build.lm.version") match {
|
||||
case Some(version) => version
|
||||
|
|
|
|||
Loading…
Reference in New Issue