mirror of
https://github.com/sbt/sbt.git
synced 2026-09-01 18:47:14 +02:00
Adjust to upstream changes
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
// DO NOT EDIT MANUALLY
|
||||
package sbt.protocol
|
||||
final class SettingQuerySuccess private (
|
||||
val value: scalajson.ast.unsafe.JValue,
|
||||
val value: sjsonnew.shaded.scalajson.ast.unsafe.JValue,
|
||||
val contentType: String) extends sbt.protocol.SettingQueryResponse() with Serializable {
|
||||
|
||||
|
||||
@@ -20,10 +20,10 @@ final class SettingQuerySuccess private (
|
||||
override def toString: String = {
|
||||
"SettingQuerySuccess(" + value + ", " + contentType + ")"
|
||||
}
|
||||
protected[this] def copy(value: scalajson.ast.unsafe.JValue = value, contentType: String = contentType): SettingQuerySuccess = {
|
||||
protected[this] def copy(value: sjsonnew.shaded.scalajson.ast.unsafe.JValue = value, contentType: String = contentType): SettingQuerySuccess = {
|
||||
new SettingQuerySuccess(value, contentType)
|
||||
}
|
||||
def withValue(value: scalajson.ast.unsafe.JValue): SettingQuerySuccess = {
|
||||
def withValue(value: sjsonnew.shaded.scalajson.ast.unsafe.JValue): SettingQuerySuccess = {
|
||||
copy(value = value)
|
||||
}
|
||||
def withContentType(contentType: String): SettingQuerySuccess = {
|
||||
@@ -32,5 +32,5 @@ final class SettingQuerySuccess private (
|
||||
}
|
||||
object SettingQuerySuccess {
|
||||
|
||||
def apply(value: scalajson.ast.unsafe.JValue, contentType: String): SettingQuerySuccess = new SettingQuerySuccess(value, contentType)
|
||||
def apply(value: sjsonnew.shaded.scalajson.ast.unsafe.JValue, contentType: String): SettingQuerySuccess = new SettingQuerySuccess(value, contentType)
|
||||
}
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ implicit lazy val SettingQuerySuccessFormat: JsonFormat[sbt.protocol.SettingQuer
|
||||
jsOpt match {
|
||||
case Some(js) =>
|
||||
unbuilder.beginObject(js)
|
||||
val value = unbuilder.readField[scalajson.ast.unsafe.JValue]("value")
|
||||
val value = unbuilder.readField[sjsonnew.shaded.scalajson.ast.unsafe.JValue]("value")
|
||||
val contentType = unbuilder.readField[String]("contentType")
|
||||
unbuilder.endObject()
|
||||
sbt.protocol.SettingQuerySuccess(value, contentType)
|
||||
|
||||
@@ -43,7 +43,7 @@ type ExecStatusEvent implements EventMessage {
|
||||
interface SettingQueryResponse implements EventMessage {}
|
||||
|
||||
type SettingQuerySuccess implements SettingQueryResponse {
|
||||
value: scalajson.ast.unsafe.JValue!
|
||||
value: sjsonnew.shaded.scalajson.ast.unsafe.JValue!
|
||||
contentType: String!
|
||||
}
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ package protocol
|
||||
|
||||
import sjsonnew.JsonFormat
|
||||
import sjsonnew.support.scalajson.unsafe.{ Parser, Converter, CompactPrinter }
|
||||
import scalajson.ast.unsafe.{ JValue, JObject, JString }
|
||||
import sjsonnew.shaded.scalajson.ast.unsafe.{ JValue, JObject, JString }
|
||||
import java.nio.ByteBuffer
|
||||
import scala.util.{ Success, Failure }
|
||||
import sbt.internal.util.StringEvent
|
||||
|
||||
Reference in New Issue
Block a user