luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-09-03 07:33:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bump underlying modules to latest

Browse Source
This commit is contained in:
Eugene Yokota
2017-03-23 12:41:24 -04:00
parent cb756f5443
commit 180bdfd129
27 changed files with 97 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
+3 -3
View File
@@ -11,7 +11,7 @@ import java.util.concurrent.atomic.{ AtomicBoolean, AtomicReference }
import scala.collection.mutable.ListBuffer
import scala.util.control.NonFatal
import sbt.protocol._
import sbt.internal.util.{ JLine, ChannelLogEntry, ConsoleAppender }
import sbt.internal.util.{ JLine, StringEvent, ConsoleAppender }
import sbt.util.Level
class NetworkClient(arguments: List[String]) { self =>
@@ -47,7 +47,7 @@ class NetworkClient(arguments: List[String]) { self =>
val socket = new Socket(InetAddress.getByName(host), port)
new ServerConnection(socket) {
override def onEvent(event: EventMessage): Unit = self.onEvent(event)
override def onLogEntry(event: ChannelLogEntry): Unit = self.onLogEntry(event)
override def onLogEntry(event: StringEvent): Unit = self.onLogEntry(event)
override def onShutdown(): Unit =
{
running.set(false)
@@ -55,7 +55,7 @@ class NetworkClient(arguments: List[String]) { self =>
}
}
def onLogEntry(event: ChannelLogEntry): Unit =
def onLogEntry(event: StringEvent): Unit =
{
val level = event.level match {
case "debug" => Level.Debug
main-command/src/main/scala/sbt/internal/client/ServerConnection.scala
+4 -4
View File
@@ -8,7 +8,7 @@ package client
import java.net.{ SocketTimeoutException, Socket }
import java.util.concurrent.atomic.AtomicBoolean
import sbt.protocol._
import sbt.internal.util.ChannelLogEntry
import sbt.internal.util.StringEvent
abstract class ServerConnection(connection: Socket) {
@@ -41,8 +41,8 @@ abstract class ServerConnection(connection: Socket) {
println(s"Got invalid chunk from server: $s \n" + errorDesc)
},
_ match {
case event: EventMessage => onEvent(event)
case event: ChannelLogEntry => onLogEntry(event)
case event: EventMessage => onEvent(event)
case event: StringEvent => onLogEntry(event)
}
)
}
@@ -65,7 +65,7 @@ abstract class ServerConnection(connection: Socket) {
}
def onEvent(event: EventMessage): Unit
def onLogEntry(event: ChannelLogEntry): Unit
def onLogEntry(event: StringEvent): Unit
def onShutdown(): Unit