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

Merge pull request #4123 from eed3si9n/wip/repl 

Re-fix console and JLine bug
This commit is contained in:
Dale Wijnand 2018-04-26 07:00:21 +01:00 committed by GitHub
parent 5bf1be1202 a798c4adff
commit bf8df381f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -9,7 +9,7 @@ def buildLevelSettings: Seq[Setting[_]] =
inThisBuild( inThisBuild(
Seq( Seq(
organization := "org.scala-sbt", organization := "org.scala-sbt",
version := "1.1.4-SNAPSHOT", version := "1.1.5-SNAPSHOT",
description := "sbt is an interactive build tool", description := "sbt is an interactive build tool",
bintrayOrganization := Some("sbt"), bintrayOrganization := Some("sbt"),
bintrayRepository := { bintrayRepository := {

3
main-actions/src/main/scala/sbt/Console.scala
View File

@ -41,7 +41,8 @@ final class Console(compiler: AnalyzingCompiler) {
implicit log: Logger): Try[Unit] = { implicit log: Logger): Try[Unit] = {
def console0() = def console0() =
compiler.console(classpath, options, initialCommands, cleanupCommands, log)(loader, bindings) compiler.console(classpath, options, initialCommands, cleanupCommands, log)(loader, bindings)
JLine.usingTerminal { _ => JLine.usingTerminal { t =>
t.init
Run.executeTrapExit(console0, log) Run.executeTrapExit(console0, log)
} }
} }