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.4.0

This commit is contained in:
Dale Wijnand 2018-03-12 15:18:42 +00:00
parent ed5a8c118b
commit dd4de14593
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
46 changed files with 108 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
build.sbt
View File

@ -203,6 +203,24 @@ lazy val testingProj = (project in file("testing"))
sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
contrabandFormatsForType in generateContrabands in Compile := ContrabandConfig.getFormats,
mimaSettings,
mimaBinaryIssueFilters ++= Seq(
// copy method was never meant to be public
exclude[DirectMissingMethodProblem]("sbt.protocol.testing.EndTestGroupErrorEvent.copy"),
exclude[DirectMissingMethodProblem]("sbt.protocol.testing.EndTestGroupErrorEvent.copy$default$*"),
exclude[DirectMissingMethodProblem]("sbt.protocol.testing.EndTestGroupEvent.copy"),
exclude[DirectMissingMethodProblem]("sbt.protocol.testing.EndTestGroupEvent.copy$default$*"),
exclude[DirectMissingMethodProblem]("sbt.protocol.testing.StartTestGroupEvent.copy"),
exclude[DirectMissingMethodProblem]("sbt.protocol.testing.StartTestGroupEvent.copy$default$*"),
exclude[DirectMissingMethodProblem]("sbt.protocol.testing.TestCompleteEvent.copy"),
exclude[DirectMissingMethodProblem]("sbt.protocol.testing.TestCompleteEvent.copy$default$*"),
exclude[DirectMissingMethodProblem]("sbt.protocol.testing.TestInitEvent.copy"),
exclude[DirectMissingMethodProblem]("sbt.protocol.testing.TestItemDetail.copy"),
exclude[DirectMissingMethodProblem]("sbt.protocol.testing.TestItemDetail.copy$default$*"),
exclude[DirectMissingMethodProblem]("sbt.protocol.testing.TestItemEvent.copy"),
exclude[DirectMissingMethodProblem]("sbt.protocol.testing.TestItemEvent.copy$default$*"),
exclude[DirectMissingMethodProblem]("sbt.protocol.testing.TestStringEvent.copy"),
exclude[DirectMissingMethodProblem]("sbt.protocol.testing.TestStringEvent.copy$default$1"),
)
)
.configure(addSbtIO, addSbtCompilerClasspath, addSbtUtilLogging)
@ -251,6 +269,17 @@ lazy val runProj = (project in file("run"))
baseDirectory.value / "src" / "main" / "contraband-scala",
sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
mimaSettings,
mimaBinaryIssueFilters ++= Seq(
// copy method was never meant to be public
exclude[DirectMissingMethodProblem]("sbt.ForkOptions.copy"),
exclude[DirectMissingMethodProblem]("sbt.ForkOptions.copy$default$*"),
exclude[DirectMissingMethodProblem]("sbt.OutputStrategy#BufferedOutput.copy"),
exclude[DirectMissingMethodProblem]("sbt.OutputStrategy#BufferedOutput.copy$default$*"),
exclude[DirectMissingMethodProblem]("sbt.OutputStrategy#CustomOutput.copy"),
exclude[DirectMissingMethodProblem]("sbt.OutputStrategy#CustomOutput.copy$default$*"),
exclude[DirectMissingMethodProblem]("sbt.OutputStrategy#LoggedOutput.copy"),
exclude[DirectMissingMethodProblem]("sbt.OutputStrategy#LoggedOutput.copy$default$*"),
)
)
.configure(addSbtIO, addSbtUtilLogging, addSbtCompilerClasspath)
@ -307,6 +336,31 @@ lazy val protocolProj = (project in file("protocol"))
sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
contrabandFormatsForType in generateContrabands in Compile := ContrabandConfig.getFormats,
mimaSettings,
mimaBinaryIssueFilters ++= Seq(
// copy method was never meant to be public
exclude[DirectMissingMethodProblem]("sbt.protocol.ChannelAcceptedEvent.copy"),
exclude[DirectMissingMethodProblem]("sbt.protocol.ChannelAcceptedEvent.copy$default$1"),
exclude[DirectMissingMethodProblem]("sbt.protocol.ExecCommand.copy"),
exclude[DirectMissingMethodProblem]("sbt.protocol.ExecCommand.copy$default$1"),
exclude[DirectMissingMethodProblem]("sbt.protocol.ExecCommand.copy$default$2"),
exclude[DirectMissingMethodProblem]("sbt.protocol.ExecStatusEvent.copy"),
exclude[DirectMissingMethodProblem]("sbt.protocol.ExecStatusEvent.copy$default$*"),
exclude[DirectMissingMethodProblem]("sbt.protocol.ExecutionEvent.copy"),
exclude[DirectMissingMethodProblem]("sbt.protocol.ExecutionEvent.copy$default$*"),
exclude[DirectMissingMethodProblem]("sbt.protocol.InitCommand.copy"),
exclude[DirectMissingMethodProblem]("sbt.protocol.InitCommand.copy$default$*"),
exclude[DirectMissingMethodProblem]("sbt.protocol.LogEvent.copy"),
exclude[DirectMissingMethodProblem]("sbt.protocol.LogEvent.copy$default$*"),
exclude[DirectMissingMethodProblem]("sbt.protocol.SettingQuery.copy"),
exclude[DirectMissingMethodProblem]("sbt.protocol.SettingQuery.copy$default$1"),
exclude[DirectMissingMethodProblem]("sbt.protocol.SettingQueryFailure.copy"),
exclude[DirectMissingMethodProblem]("sbt.protocol.SettingQueryFailure.copy$default$*"),
exclude[DirectMissingMethodProblem]("sbt.protocol.SettingQuerySuccess.copy"),
exclude[DirectMissingMethodProblem]("sbt.protocol.SettingQuerySuccess.copy$default$*"),
// ignore missing methods in sbt.internal
exclude[DirectMissingMethodProblem]("sbt.internal.*"),
)
)
.configure(addSbtUtilLogging)
@ -336,6 +390,12 @@ lazy val commandProj = (project in file("main-command"))
// Replace nailgun socket stuff
exclude[MissingClassProblem]("sbt.internal.NG*"),
exclude[MissingClassProblem]("sbt.internal.ReferenceCountedFileDescriptor"),
// copy method was never meant to be public
exclude[DirectMissingMethodProblem]("sbt.CommandSource.copy"),
exclude[DirectMissingMethodProblem]("sbt.CommandSource.copy$default$*"),
exclude[DirectMissingMethodProblem]("sbt.Exec.copy"),
exclude[DirectMissingMethodProblem]("sbt.Exec.copy$default$*"),
),
unmanagedSources in (Compile, headerCreate) := {
val old = (unmanagedSources in (Compile, headerCreate)).value

2
main-command/src/main/contraband-scala/sbt/CommandSource.scala
View File

@ -19,7 +19,7 @@ final class CommandSource private (
override def toString: String = {
"CommandSource(" + channelName + ")"
}
protected[this] def copy(channelName: String = channelName): CommandSource = {
private[this] def copy(channelName: String = channelName): CommandSource = {
new CommandSource(channelName)
}
def withChannelName(channelName: String): CommandSource = {

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

@ -21,7 +21,7 @@ final class Exec private (
override def toString: String = {
"Exec(" + commandLine + ", " + execId + ", " + source + ")"
}
protected[this] def copy(commandLine: String = commandLine, execId: Option[String] = execId, source: Option[sbt.CommandSource] = source): Exec = {
private[this] def copy(commandLine: String = commandLine, execId: Option[String] = execId, source: Option[sbt.CommandSource] = source): Exec = {
new Exec(commandLine, execId, source)
}
def withCommandLine(commandLine: String): Exec = {

3
main-command/src/main/scala/sbt/internal/server/Server.scala
View File

@ -63,7 +63,8 @@ private[sbt] object Server {
val maxSocketLength = new UnixDomainSocketLibrary.SockaddrUn().sunPath.length - 1
val path = socketfile.getAbsolutePath
if (path.length > maxSocketLength)
sys.error("socket file absolute path too long; " +
sys.error(
"socket file absolute path too long; " +
"either switch to another connection type " +
"or define a short \"SBT_GLOBAL_SERVER_DIR\" value. " +
s"Current path: ${path}")

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.3")
addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.4.0")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.8.0")

2
protocol/src/main/contraband-scala/sbt/internal/langserver/ClientCapabilities.scala
View File

@ -18,7 +18,7 @@ override def hashCode: Int = {
override def toString: String = {
"ClientCapabilities()"
}
protected[this] def copy(): ClientCapabilities = {
private[this] def copy(): ClientCapabilities = {
new ClientCapabilities()
}

2
protocol/src/main/contraband-scala/sbt/internal/langserver/Diagnostic.scala
View File

@ -38,7 +38,7 @@ final class Diagnostic private (
override def toString: String = {
"Diagnostic(" + range + ", " + severity + ", " + code + ", " + source + ", " + message + ")"
}
protected[this] def copy(range: sbt.internal.langserver.Range = range, severity: Option[Long] = severity, code: Option[String] = code, source: Option[String] = source, message: String = message): Diagnostic = {
private[this] def copy(range: sbt.internal.langserver.Range = range, severity: Option[Long] = severity, code: Option[String] = code, source: Option[String] = source, message: String = message): Diagnostic = {
new Diagnostic(range, severity, code, source, message)
}
def withRange(range: sbt.internal.langserver.Range): Diagnostic = {

2
protocol/src/main/contraband-scala/sbt/internal/langserver/InitializeParams.scala
View File

@ -25,7 +25,7 @@ final class InitializeParams private (
override def toString: String = {
"InitializeParams(" + processId + ", " + rootPath + ", " + rootUri + ", " + initializationOptions + ", " + capabilities + ", " + trace + ")"
}
protected[this] def copy(processId: Option[Long] = processId, rootPath: Option[String] = rootPath, rootUri: Option[String] = rootUri, initializationOptions: Option[sjsonnew.shaded.scalajson.ast.unsafe.JValue] = initializationOptions, capabilities: Option[sbt.internal.langserver.ClientCapabilities] = capabilities, trace: Option[String] = trace): InitializeParams = {
private[this] def copy(processId: Option[Long] = processId, rootPath: Option[String] = rootPath, rootUri: Option[String] = rootUri, initializationOptions: Option[sjsonnew.shaded.scalajson.ast.unsafe.JValue] = initializationOptions, capabilities: Option[sbt.internal.langserver.ClientCapabilities] = capabilities, trace: Option[String] = trace): InitializeParams = {
new InitializeParams(processId, rootPath, rootUri, initializationOptions, capabilities, trace)
}
def withProcessId(processId: Option[Long]): InitializeParams = {

2
protocol/src/main/contraband-scala/sbt/internal/langserver/InitializeResult.scala
View File

@ -20,7 +20,7 @@ final class InitializeResult private (
override def toString: String = {
"InitializeResult(" + capabilities + ")"
}
protected[this] def copy(capabilities: sbt.internal.langserver.ServerCapabilities = capabilities): InitializeResult = {
private[this] def copy(capabilities: sbt.internal.langserver.ServerCapabilities = capabilities): InitializeResult = {
new InitializeResult(capabilities)
}
def withCapabilities(capabilities: sbt.internal.langserver.ServerCapabilities): InitializeResult = {

2
protocol/src/main/contraband-scala/sbt/internal/langserver/Location.scala
View File

@ -21,7 +21,7 @@ final class Location private (
override def toString: String = {
"Location(" + uri + ", " + range + ")"
}
protected[this] def copy(uri: String = uri, range: sbt.internal.langserver.Range = range): Location = {
private[this] def copy(uri: String = uri, range: sbt.internal.langserver.Range = range): Location = {
new Location(uri, range)
}
def withUri(uri: String): Location = {

2
protocol/src/main/contraband-scala/sbt/internal/langserver/LogMessageParams.scala
View File

@ -22,7 +22,7 @@ final class LogMessageParams private (
override def toString: String = {
"LogMessageParams(" + `type` + ", " + message + ")"
}
protected[this] def copy(`type`: Long = `type`, message: String = message): LogMessageParams = {
private[this] def copy(`type`: Long = `type`, message: String = message): LogMessageParams = {
new LogMessageParams(`type`, message)
}
def withType(`type`: Long): LogMessageParams = {

2
protocol/src/main/contraband-scala/sbt/internal/langserver/Position.scala
View File

@ -26,7 +26,7 @@ final class Position private (
override def toString: String = {
"Position(" + line + ", " + character + ")"
}
protected[this] def copy(line: Long = line, character: Long = character): Position = {
private[this] def copy(line: Long = line, character: Long = character): Position = {
new Position(line, character)
}
def withLine(line: Long): Position = {

2
protocol/src/main/contraband-scala/sbt/internal/langserver/PublishDiagnosticsParams.scala
View File

@ -23,7 +23,7 @@ final class PublishDiagnosticsParams private (
override def toString: String = {
"PublishDiagnosticsParams(" + uri + ", " + diagnostics + ")"
}
protected[this] def copy(uri: String = uri, diagnostics: Vector[sbt.internal.langserver.Diagnostic] = diagnostics): PublishDiagnosticsParams = {
private[this] def copy(uri: String = uri, diagnostics: Vector[sbt.internal.langserver.Diagnostic] = diagnostics): PublishDiagnosticsParams = {
new PublishDiagnosticsParams(uri, diagnostics)
}
def withUri(uri: String): PublishDiagnosticsParams = {

2
protocol/src/main/contraband-scala/sbt/internal/langserver/Range.scala
View File

@ -26,7 +26,7 @@ final class Range private (
override def toString: String = {
"Range(" + start + ", " + end + ")"
}
protected[this] def copy(start: sbt.internal.langserver.Position = start, end: sbt.internal.langserver.Position = end): Range = {
private[this] def copy(start: sbt.internal.langserver.Position = start, end: sbt.internal.langserver.Position = end): Range = {
new Range(start, end)
}
def withStart(start: sbt.internal.langserver.Position): Range = {

2
protocol/src/main/contraband-scala/sbt/internal/langserver/SaveOptions.scala
View File

@ -20,7 +20,7 @@ final class SaveOptions private (
override def toString: String = {
"SaveOptions(" + includeText + ")"
}
protected[this] def copy(includeText: Option[Boolean] = includeText): SaveOptions = {
private[this] def copy(includeText: Option[Boolean] = includeText): SaveOptions = {
new SaveOptions(includeText)
}
def withIncludeText(includeText: Option[Boolean]): SaveOptions = {

2
protocol/src/main/contraband-scala/sbt/internal/langserver/SbtExecParams.scala
View File

@ -20,7 +20,7 @@ final class SbtExecParams private (
override def toString: String = {
"SbtExecParams(" + commandLine + ")"
}
protected[this] def copy(commandLine: String = commandLine): SbtExecParams = {
private[this] def copy(commandLine: String = commandLine): SbtExecParams = {
new SbtExecParams(commandLine)
}
def withCommandLine(commandLine: String): SbtExecParams = {

2
protocol/src/main/contraband-scala/sbt/internal/langserver/ServerCapabilities.scala
View File

@ -23,7 +23,7 @@ final class ServerCapabilities private (
override def toString: String = {
"ServerCapabilities(" + textDocumentSync + ", " + hoverProvider + ", " + definitionProvider + ")"
}
protected[this] def copy(textDocumentSync: Option[sbt.internal.langserver.TextDocumentSyncOptions] = textDocumentSync, hoverProvider: Option[Boolean] = hoverProvider, definitionProvider: Option[Boolean] = definitionProvider): ServerCapabilities = {
private[this] def copy(textDocumentSync: Option[sbt.internal.langserver.TextDocumentSyncOptions] = textDocumentSync, hoverProvider: Option[Boolean] = hoverProvider, definitionProvider: Option[Boolean] = definitionProvider): ServerCapabilities = {
new ServerCapabilities(textDocumentSync, hoverProvider, definitionProvider)
}
def withTextDocumentSync(textDocumentSync: Option[sbt.internal.langserver.TextDocumentSyncOptions]): ServerCapabilities = {

2
protocol/src/main/contraband-scala/sbt/internal/langserver/TextDocumentIdentifier.scala
View File

@ -21,7 +21,7 @@ final class TextDocumentIdentifier private (
override def toString: String = {
"TextDocumentIdentifier(" + uri + ")"
}
protected[this] def copy(uri: String = uri): TextDocumentIdentifier = {
private[this] def copy(uri: String = uri): TextDocumentIdentifier = {
new TextDocumentIdentifier(uri)
}
def withUri(uri: String): TextDocumentIdentifier = {

2
protocol/src/main/contraband-scala/sbt/internal/langserver/TextDocumentPositionParams.scala
View File

@ -23,7 +23,7 @@ final class TextDocumentPositionParams private (
override def toString: String = {
"TextDocumentPositionParams(" + textDocument + ", " + position + ")"
}
protected[this] def copy(textDocument: sbt.internal.langserver.TextDocumentIdentifier = textDocument, position: sbt.internal.langserver.Position = position): TextDocumentPositionParams = {
private[this] def copy(textDocument: sbt.internal.langserver.TextDocumentIdentifier = textDocument, position: sbt.internal.langserver.Position = position): TextDocumentPositionParams = {
new TextDocumentPositionParams(textDocument, position)
}
def withTextDocument(textDocument: sbt.internal.langserver.TextDocumentIdentifier): TextDocumentPositionParams = {

2
protocol/src/main/contraband-scala/sbt/internal/langserver/TextDocumentSyncOptions.scala
View File

@ -23,7 +23,7 @@ final class TextDocumentSyncOptions private (
override def toString: String = {
"TextDocumentSyncOptions(" + openClose + ", " + change + ", " + willSave + ", " + willSaveWaitUntil + ", " + save + ")"
}
protected[this] def copy(openClose: Option[Boolean] = openClose, change: Option[Long] = change, willSave: Option[Boolean] = willSave, willSaveWaitUntil: Option[Boolean] = willSaveWaitUntil, save: Option[sbt.internal.langserver.SaveOptions] = save): TextDocumentSyncOptions = {
private[this] def copy(openClose: Option[Boolean] = openClose, change: Option[Long] = change, willSave: Option[Boolean] = willSave, willSaveWaitUntil: Option[Boolean] = willSaveWaitUntil, save: Option[sbt.internal.langserver.SaveOptions] = save): TextDocumentSyncOptions = {
new TextDocumentSyncOptions(openClose, change, willSave, willSaveWaitUntil, save)
}
def withOpenClose(openClose: Option[Boolean]): TextDocumentSyncOptions = {

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

@ -19,7 +19,7 @@ final class InitializeOption private (
override def toString: String = {
"InitializeOption(" + token + ")"
}
protected[this] def copy(token: Option[String] = token): InitializeOption = {
private[this] def copy(token: Option[String] = token): InitializeOption = {
new InitializeOption(token)
}
def withToken(token: Option[String]): InitializeOption = {

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

@ -23,7 +23,7 @@ final class JsonRpcNotificationMessage private (
override def toString: String = {
s"""JsonRpcNotificationMessage($jsonrpc, $method, ${sbt.protocol.Serialization.compactPrintJsonOpt(params)})"""
}
protected[this] def copy(jsonrpc: String = jsonrpc, method: String = method, params: Option[sjsonnew.shaded.scalajson.ast.unsafe.JValue] = params): JsonRpcNotificationMessage = {
private[this] def copy(jsonrpc: String = jsonrpc, method: String = method, params: Option[sjsonnew.shaded.scalajson.ast.unsafe.JValue] = params): JsonRpcNotificationMessage = {
new JsonRpcNotificationMessage(jsonrpc, method, params)
}
def withJsonrpc(jsonrpc: String): JsonRpcNotificationMessage = {

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

@ -25,7 +25,7 @@ final class JsonRpcRequestMessage private (
override def toString: String = {
s"""JsonRpcRequestMessage($jsonrpc, $id, $method, ${sbt.protocol.Serialization.compactPrintJsonOpt(params)}})"""
}
protected[this] def copy(jsonrpc: String = jsonrpc, id: String = id, method: String = method, params: Option[sjsonnew.shaded.scalajson.ast.unsafe.JValue] = params): JsonRpcRequestMessage = {
private[this] def copy(jsonrpc: String = jsonrpc, id: String = id, method: String = method, params: Option[sjsonnew.shaded.scalajson.ast.unsafe.JValue] = params): JsonRpcRequestMessage = {
new JsonRpcRequestMessage(jsonrpc, id, method, params)
}
def withJsonrpc(jsonrpc: String): JsonRpcRequestMessage = {

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

@ -27,7 +27,7 @@ final class JsonRpcResponseError private (
override def toString: String = {
s"""JsonRpcResponseError($code, $message, ${sbt.protocol.Serialization.compactPrintJsonOpt(data)})"""
}
protected[this] def copy(code: Long = code, message: String = message, data: Option[sjsonnew.shaded.scalajson.ast.unsafe.JValue] = data): JsonRpcResponseError = {
private[this] def copy(code: Long = code, message: String = message, data: Option[sjsonnew.shaded.scalajson.ast.unsafe.JValue] = data): JsonRpcResponseError = {
new JsonRpcResponseError(code, message, data)
}
def withCode(code: Long): JsonRpcResponseError = {

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

@ -28,7 +28,7 @@ final class JsonRpcResponseMessage private (
override def toString: String = {
s"""JsonRpcResponseMessage($jsonrpc, $id, ${sbt.protocol.Serialization.compactPrintJsonOpt(result)}, $error)"""
}
protected[this] def copy(jsonrpc: String = jsonrpc, id: Option[String] = id, result: Option[sjsonnew.shaded.scalajson.ast.unsafe.JValue] = result, error: Option[sbt.internal.protocol.JsonRpcResponseError] = error): JsonRpcResponseMessage = {
private[this] def copy(jsonrpc: String = jsonrpc, id: Option[String] = id, result: Option[sjsonnew.shaded.scalajson.ast.unsafe.JValue] = result, error: Option[sbt.internal.protocol.JsonRpcResponseError] = error): JsonRpcResponseMessage = {
new JsonRpcResponseMessage(jsonrpc, id, result, error)
}
def withJsonrpc(jsonrpc: String): JsonRpcResponseMessage = {

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

@ -26,7 +26,7 @@ final class PortFile private (
override def toString: String = {
"PortFile(" + uri + ", " + tokenfilePath + ", " + tokenfileUri + ")"
}
protected[this] def copy(uri: String = uri, tokenfilePath: Option[String] = tokenfilePath, tokenfileUri: Option[String] = tokenfileUri): PortFile = {
private[this] def copy(uri: String = uri, tokenfilePath: Option[String] = tokenfilePath, tokenfileUri: Option[String] = tokenfileUri): PortFile = {
new PortFile(uri, tokenfilePath, tokenfileUri)
}
def withUri(uri: String): PortFile = {

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

@ -20,7 +20,7 @@ final class TokenFile private (
override def toString: String = {
"TokenFile(" + uri + ", " + token + ")"
}
protected[this] def copy(uri: String = uri, token: String = token): TokenFile = {
private[this] def copy(uri: String = uri, token: String = token): TokenFile = {
new TokenFile(uri, token)
}
def withUri(uri: String): TokenFile = {

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

@ -19,7 +19,7 @@ final class ChannelAcceptedEvent private (
override def toString: String = {
"ChannelAcceptedEvent(" + channelName + ")"
}
protected[this] def copy(channelName: String = channelName): ChannelAcceptedEvent = {
private[this] def copy(channelName: String = channelName): ChannelAcceptedEvent = {
new ChannelAcceptedEvent(channelName)
}
def withChannelName(channelName: String): ChannelAcceptedEvent = {

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

@ -21,7 +21,7 @@ final class ExecCommand private (
override def toString: String = {
"ExecCommand(" + commandLine + ", " + execId + ")"
}
protected[this] def copy(commandLine: String = commandLine, execId: Option[String] = execId): ExecCommand = {
private[this] def copy(commandLine: String = commandLine, execId: Option[String] = execId): ExecCommand = {
new ExecCommand(commandLine, execId)
}
def withCommandLine(commandLine: String): ExecCommand = {

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

@ -23,7 +23,7 @@ final class ExecStatusEvent private (
override def toString: String = {
"ExecStatusEvent(" + status + ", " + channelName + ", " + execId + ", " + commandQueue + ")"
}
protected[this] def copy(status: String = status, channelName: Option[String] = channelName, execId: Option[String] = execId, commandQueue: Vector[String] = commandQueue): ExecStatusEvent = {
private[this] def copy(status: String = status, channelName: Option[String] = channelName, execId: Option[String] = execId, commandQueue: Vector[String] = commandQueue): ExecStatusEvent = {
new ExecStatusEvent(status, channelName, execId, commandQueue)
}
def withStatus(status: String): ExecStatusEvent = {

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

@ -21,7 +21,7 @@ final class ExecutionEvent private (
override def toString: String = {
"ExecutionEvent(" + success + ", " + commandLine + ")"
}
protected[this] def copy(success: String = success, commandLine: String = commandLine): ExecutionEvent = {
private[this] def copy(success: String = success, commandLine: String = commandLine): ExecutionEvent = {
new ExecutionEvent(success, commandLine)
}
def withSuccess(success: String): ExecutionEvent = {

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

@ -20,7 +20,7 @@ final class InitCommand private (
override def toString: String = {
"InitCommand(" + token + ", " + execId + ")"
}
protected[this] def copy(token: Option[String] = token, execId: Option[String] = execId): InitCommand = {
private[this] def copy(token: Option[String] = token, execId: Option[String] = execId): InitCommand = {
new InitCommand(token, execId)
}
def withToken(token: Option[String]): InitCommand = {

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

@ -21,7 +21,7 @@ final class LogEvent private (
override def toString: String = {
"LogEvent(" + level + ", " + message + ")"
}
protected[this] def copy(level: String = level, message: String = message): LogEvent = {
private[this] def copy(level: String = level, message: String = message): LogEvent = {
new LogEvent(level, message)
}
def withLevel(level: String): LogEvent = {

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

@ -19,7 +19,7 @@ final class SettingQuery private (
override def toString: String = {
"SettingQuery(" + setting + ")"
}
protected[this] def copy(setting: String = setting): SettingQuery = {
private[this] def copy(setting: String = setting): SettingQuery = {
new SettingQuery(setting)
}
def withSetting(setting: String): SettingQuery = {

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

@ -19,7 +19,7 @@ final class SettingQueryFailure private (
override def toString: String = {
"SettingQueryFailure(" + message + ")"
}
protected[this] def copy(message: String = message): SettingQueryFailure = {
private[this] def copy(message: String = message): SettingQueryFailure = {
new SettingQueryFailure(message)
}
def withMessage(message: String): SettingQueryFailure = {

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

@ -20,7 +20,7 @@ final class SettingQuerySuccess private (
override def toString: String = {
"SettingQuerySuccess(" + value + ", " + contentType + ")"
}
protected[this] def copy(value: sjsonnew.shaded.scalajson.ast.unsafe.JValue = value, contentType: String = contentType): SettingQuerySuccess = {
private[this] def copy(value: sjsonnew.shaded.scalajson.ast.unsafe.JValue = value, contentType: String = contentType): SettingQuerySuccess = {
new SettingQuerySuccess(value, contentType)
}
def withValue(value: sjsonnew.shaded.scalajson.ast.unsafe.JValue): SettingQuerySuccess = {

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

@ -43,7 +43,7 @@ final class ForkOptions private (
override def toString: String = {
"ForkOptions(" + javaHome + ", " + outputStrategy + ", " + bootJars + ", " + workingDirectory + ", " + runJVMOptions + ", " + connectInput + ", " + envVars + ")"
}
protected[this] def copy(javaHome: Option[java.io.File] = javaHome, outputStrategy: Option[sbt.OutputStrategy] = outputStrategy, bootJars: Vector[java.io.File] = bootJars, workingDirectory: Option[java.io.File] = workingDirectory, runJVMOptions: Vector[String] = runJVMOptions, connectInput: Boolean = connectInput, envVars: scala.collection.immutable.Map[String, String] = envVars): ForkOptions = {
private[this] def copy(javaHome: Option[java.io.File] = javaHome, outputStrategy: Option[sbt.OutputStrategy] = outputStrategy, bootJars: Vector[java.io.File] = bootJars, workingDirectory: Option[java.io.File] = workingDirectory, runJVMOptions: Vector[String] = runJVMOptions, connectInput: Boolean = connectInput, envVars: scala.collection.immutable.Map[String, String] = envVars): ForkOptions = {
new ForkOptions(javaHome, outputStrategy, bootJars, workingDirectory, runJVMOptions, connectInput, envVars)
}
def withJavaHome(javaHome: Option[java.io.File]): ForkOptions = {

6
run/src/main/scala/sbt/OutputStrategy.scala
View File

@ -37,7 +37,7 @@ object OutputStrategy {
override def toString: String = {
"BufferedOutput(" + logger + ")"
}
protected[this] def copy(logger: Logger = logger): BufferedOutput = {
private[this] def copy(logger: Logger = logger): BufferedOutput = {
new BufferedOutput(logger)
}
def withLogger(logger: Logger): BufferedOutput = {
@ -63,7 +63,7 @@ object OutputStrategy {
override def toString: String = {
"LoggedOutput(" + logger + ")"
}
protected[this] def copy(logger: Logger = logger): LoggedOutput = {
private[this] def copy(logger: Logger = logger): LoggedOutput = {
new LoggedOutput(logger)
}
def withLogger(logger: Logger): LoggedOutput = {
@ -91,7 +91,7 @@ object OutputStrategy {
override def toString: String = {
"CustomOutput(" + output + ")"
}
protected[this] def copy(output: OutputStream = output): CustomOutput = {
private[this] def copy(output: OutputStream = output): CustomOutput = {
new CustomOutput(output)
}
def withOutput(output: OutputStream): CustomOutput = {

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

@ -21,7 +21,7 @@ final class EndTestGroupErrorEvent private (
override def toString: String = {
"EndTestGroupErrorEvent(" + name + ", " + error + ")"
}
protected[this] def copy(name: String = name, error: String = error): EndTestGroupErrorEvent = {
private[this] def copy(name: String = name, error: String = error): EndTestGroupErrorEvent = {
new EndTestGroupErrorEvent(name, error)
}
def withName(name: String): EndTestGroupErrorEvent = {

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

@ -21,7 +21,7 @@ final class EndTestGroupEvent private (
override def toString: String = {
"EndTestGroupEvent(" + name + ", " + result + ")"
}
protected[this] def copy(name: String = name, result: sbt.protocol.testing.TestResult = result): EndTestGroupEvent = {
private[this] def copy(name: String = name, result: sbt.protocol.testing.TestResult = result): EndTestGroupEvent = {
new EndTestGroupEvent(name, result)
}
def withName(name: String): EndTestGroupEvent = {

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

@ -20,7 +20,7 @@ final class StartTestGroupEvent private (
override def toString: String = {
"StartTestGroupEvent(" + name + ")"
}
protected[this] def copy(name: String = name): StartTestGroupEvent = {
private[this] def copy(name: String = name): StartTestGroupEvent = {
new StartTestGroupEvent(name)
}
def withName(name: String): StartTestGroupEvent = {

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

@ -20,7 +20,7 @@ final class TestCompleteEvent private (
override def toString: String = {
"TestCompleteEvent(" + result + ")"
}
protected[this] def copy(result: sbt.protocol.testing.TestResult = result): TestCompleteEvent = {
private[this] def copy(result: sbt.protocol.testing.TestResult = result): TestCompleteEvent = {
new TestCompleteEvent(result)
}
def withResult(result: sbt.protocol.testing.TestResult): TestCompleteEvent = {

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

@ -19,7 +19,7 @@ override def hashCode: Int = {
override def toString: String = {
"TestInitEvent()"
}
protected[this] def copy(): TestInitEvent = {
private[this] def copy(): TestInitEvent = {
new TestInitEvent()
}

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

@ -31,7 +31,7 @@ final class TestItemDetail private (
override def toString: String = {
"TestItemDetail(" + fullyQualifiedName + ", " + status + ", " + duration + ")"
}
protected[this] def copy(fullyQualifiedName: String = fullyQualifiedName, status: sbt.testing.Status = status, duration: Option[Long] = duration): TestItemDetail = {
private[this] def copy(fullyQualifiedName: String = fullyQualifiedName, status: sbt.testing.Status = status, duration: Option[Long] = duration): TestItemDetail = {
new TestItemDetail(fullyQualifiedName, status, duration)
}
def withFullyQualifiedName(fullyQualifiedName: String): TestItemDetail = {

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

@ -21,7 +21,7 @@ final class TestItemEvent private (
override def toString: String = {
"TestItemEvent(" + result + ", " + detail + ")"
}
protected[this] def copy(result: Option[sbt.protocol.testing.TestResult] = result, detail: Vector[sbt.protocol.testing.TestItemDetail] = detail): TestItemEvent = {
private[this] def copy(result: Option[sbt.protocol.testing.TestResult] = result, detail: Vector[sbt.protocol.testing.TestItemDetail] = detail): TestItemEvent = {
new TestItemEvent(result, detail)
}
def withResult(result: Option[sbt.protocol.testing.TestResult]): TestItemEvent = {

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

@ -19,7 +19,7 @@ final class TestStringEvent private (
override def toString: String = {
value
}
protected[this] def copy(value: String = value): TestStringEvent = {
private[this] def copy(value: String = value): TestStringEvent = {
new TestStringEvent(value)
}
def withValue(value: String): TestStringEvent = {