diff --git a/lm-core/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala b/lm-core/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala index 900c9af0e..4cbd69cdb 100644 --- a/lm-core/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala +++ b/lm-core/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala @@ -112,7 +112,7 @@ private[librarymanagement] abstract class ModuleReportExtra { private def calendarToString(c: ju.Calendar): String = { import sjsonnew.*, BasicJsonProtocol.* - implicitly[IsoString[ju.Calendar]] to c + implicitly[IsoString[ju.Calendar]].to(c) } def retrieve(f: (ModuleID, Artifact, File) => File): ModuleReport = diff --git a/lm-ivy/src/test/scala/sbt/internal/librarymanagement/DMSerializationSpec.scala b/lm-ivy/src/test/scala/sbt/internal/librarymanagement/DMSerializationSpec.scala index b207cf1ec..b6e221fe7 100644 --- a/lm-ivy/src/test/scala/sbt/internal/librarymanagement/DMSerializationSpec.scala +++ b/lm-ivy/src/test/scala/sbt/internal/librarymanagement/DMSerializationSpec.scala @@ -99,9 +99,9 @@ object DMSerializationSpec extends BasicTestSuite { } def roundtripBuilder[A: JsonReader: JsonWriter](a: A)(f: (A, A) => Unit): Unit = { - val json = isoString to (Converter toJsonUnsafe a) + val json = isoString.to(Converter.toJsonUnsafe(a)) println(json) - val obj = Converter.fromJsonUnsafe[A](isoString from json) + val obj = Converter.fromJsonUnsafe[A](isoString.from(json)) f(a, obj) } diff --git a/main/src/main/scala/sbt/internal/server/SettingQuery.scala b/main/src/main/scala/sbt/internal/server/SettingQuery.scala index 37075bcfe..dea9054e8 100644 --- a/main/src/main/scala/sbt/internal/server/SettingQuery.scala +++ b/main/src/main/scala/sbt/internal/server/SettingQuery.scala @@ -111,7 +111,7 @@ object SettingQuery { case NoJsonWriter() => Left(s"JsonWriter for ${key.tag} not found") } - def toJson[A: JsonWriter](x: A): JValue = Converter toJsonUnsafe x + def toJson[A: JsonWriter](x: A): JValue = Converter.toJsonUnsafe(x) def getSettingJsonValue[A]( structure: BuildStructure, diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 2fcaa7ff0..b2ec98c5a 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -67,7 +67,7 @@ object Dependencies { def addSbtZinc = addSbtModule(sbtZincPath, "zinc", zinc) def addSbtZincCompileCore = addSbtModule(sbtZincPath, "zincCompileCore", zincCompileCore) - lazy val sjsonNewVersion = "0.14.0-M2" + lazy val sjsonNewVersion = "0.14.0-M4" def sjsonNew(n: String) = Def.setting( "com.eed3si9n" %% n % sjsonNewVersion ) // contrabandSjsonNewVersion.value diff --git a/util-cache/src/main/scala/sbt/util/FileInfo.scala b/util-cache/src/main/scala/sbt/util/FileInfo.scala index 897c70b34..603064e2c 100644 --- a/util-cache/src/main/scala/sbt/util/FileInfo.scala +++ b/util-cache/src/main/scala/sbt/util/FileInfo.scala @@ -12,7 +12,8 @@ import java.io.File import scala.util.control.NonFatal import sbt.io.{ Hash, IO } -import sjsonnew.{ arrayFormat as _, * } +import sjsonnew.* +import sjsonnew.BasicJsonProtocol.given import sbt.nio.file.* import sbt.nio.file.syntax.*