Merge pull request #8209 from eed3si9n/wip/bump-sjson-new

[2.x] Bump to sjson-new 0.14.0-M4

.github/workflows/ci.yml

@@ -159,7 +159,7 @@ jobs:
         run: |
           ./sbt -v --client "scripted dependency-graph/*"
           ./sbt -v --client "scripted dependency-management/* project-load/* project-matrix/* java/* run/*"
-          # ./sbt -v --client "scripted plugins/*"
+          ./sbt -v --client "scripted plugins/*"
           # ./sbt -v --client "scripted nio/*"
       - name: Build and test (4)
         if: ${{ matrix.jobtype == 4 }}

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 =

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)
   }
 

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,

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

sbt-app/src/sbt-test/plugins/dotty/LICENSE

@@ -1,25 +0,0 @@
-Copyright (c) 2015 The dotty-example-project contributors.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

sbt-app/src/sbt-test/plugins/dotty/README.md

@@ -1 +0,0 @@
-Cut-n-pasted from https://github.com/lampepfl/dotty-example-project/tree/a753b14e281bbaa6c69f26298913ad6feba969c7

sbt-app/src/sbt-test/plugins/dotty/build.sbt

@@ -1 +0,0 @@
-ThisBuild / scalaVersion := "3.3.4"

sbt-app/src/sbt-test/plugins/dotty/src/main/scala-3/Main.scala

@@ -1,16 +0,0 @@
-
-object Main {
-
-  def main(args: Array[String]): Unit = {
-
-    runExample("Trait Params")(TraitParams.test)
-
-  }
-
-  private def runExample(name: String)(f: => Unit) = {
-    println(Console.MAGENTA + s"$name example:" + Console.RESET)
-    f
-    println()
-  }
-
-}

sbt-app/src/sbt-test/plugins/dotty/src/main/scala-3/TraitParams.scala

@@ -1,21 +0,0 @@
-/**
-  * Trait Parameters: https://dotty.epfl.ch/docs/reference/other-new-features/trait-parameters.html
-  */
-object TraitParams {
-
-  trait Base(val msg: String)
-  class A extends Base("Hello")
-  class B extends Base("Dotty!")
-
-  // Union types only exist in Dotty, so there's no chance that this will accidentally be compiled with Scala 2
-  private def printMessages(msgs: (A | B)*) = println(msgs.map(_.msg).mkString(" "))
-
-  def test: Unit = {
-
-    printMessages(new A, new B)
-
-    // Sanity check the classpath: this won't run if the dotty jar is not present.
-    val x: Int => Int = z => z
-    x(1)
-  }
-}

sbt-app/src/sbt-test/plugins/dotty/test

@@ -1 +0,0 @@
-> run

sbt-app/src/sbt-test/plugins/pgp/build.sbt

@@ -0,0 +1 @@
+scalaVersion := "3.7.2"

sbt-app/src/sbt-test/plugins/pgp/project/plugins.sbt

@@ -0,0 +1,2 @@
+// addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
+libraryDependencies += Defaults.sbtPluginExtra("com.github.sbt" % "sbt-pgp" % "2.3.1", "2", "3.7.2")

sbt-app/src/sbt-test/plugins/pgp/src/main/scala/Foo.scala

@@ -0,0 +1 @@
+class Foo

sbt-app/src/sbt-test/plugins/pgp/test

@@ -0,0 +1 @@
+> plugins

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