cross publish for Scala 3, except for play-json-generic (#36)

* cross publish for Scala 3, except for play-json-generic * update Scala.js to 1.16.0 to be able to build for Scala 2.13.14 --------- Co-authored-by: jmast <jmast@evolution.com>
evolution-gaming · May 8, 2024 · 24f1f6c · 24f1f6c
1 parent d894ccf
commit 24f1f6c
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,9 +10,9 @@ jobs:
     strategy:
       matrix:
         scala:
-          - 2.13.12
-          - 2.12.18
-          - 3.3.1
+          - 2.13.14
+          - 2.12.19
+          - 3.3.3
 
     steps:
       - uses: actions/checkout@v3

diff --git a/README.md b/README.md
@@ -10,6 +10,8 @@
 3. `play-json-jsoniter` — provides the fastest way to convert an instance of `play.api.libs.json.JsValue` to byte array and read it back.
 4. `play-json-circe` — provides conversions to/from `circe` codecs to ease transitions from one library to another. Examples in [CirceToPlayConversionsSpec](play-json-circe/src/test/scala/com/evolution/playjson/circe/CirceToPlayConversionsSpec.scala) and [PlayToCirceConversionsSpec](play-json-circe/src/test/scala/com/evolution/playjson/circe/PlayToCirceConversionsSpec.scala).
 
+All modules are available for Scala 2.12, 2.13 and 3, except for `play-json-generic`, which has no Scala 3 version yet.
+
 ## Setup
 
 ```scala

diff --git a/build.sbt b/build.sbt
@@ -1,9 +1,9 @@
 import Dependencies._
 import ReleaseTransformations._
 
-val Scala213 = "2.13.12"
-val Scala212 = "2.12.18"
-val Scala3   = "3.3.1"
+val Scala213 = "2.13.14"
+val Scala212 = "2.12.19"
+val Scala3   = "3.3.3"
 
 val commonSettings = Seq(
   homepage := Some(new URL("https://github.com/evolution-gaming/play-json-tools")),
@@ -16,7 +16,7 @@ val commonSettings = Seq(
   description := "Set of implicit helper classes for transforming various objects to and from JSON",
   startYear := Some(2017),
   scalaVersion := Scala213,
-  crossScalaVersions := Seq(scalaVersion.value, Scala212),
+  crossScalaVersions := Seq(scalaVersion.value, Scala212, Scala3),
   scalacOptions ++= {
     CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((2, v)) if v >= 13 =>
@@ -72,12 +72,13 @@ lazy val `play-json-generic` = crossProject(JVMPlatform, JSPlatform)
   .crossType(CrossType.Pure)
   .settings(
     commonSettings,
+    crossScalaVersions -= Scala3,
     scalacOptsFailOnWarn := Some(false),
     libraryDependencies ++= Seq(
       shapeless,
       playJson,
       scalaTest % Test
-    ).map(excludeLog4j)
+    ).map(excludeLog4j),
   )
 
 lazy val `play-json-tools` = project
@@ -98,7 +99,6 @@ lazy val `play-json-jsoniter` = crossProject(JVMPlatform, JSPlatform)
   .crossType(CrossType.Full)
   .settings(
     commonSettings,
-    crossScalaVersions := crossScalaVersions.value ++ Seq(Scala3),
     libraryDependencies ++= (Seq(
       playJson,
       jsoniter,

diff --git a/play-json-circe/src/main/scala/com/evolution/playjson/circe/PlayCirceAstConversions.scala b/play-json-circe/src/main/scala/com/evolution/playjson/circe/PlayCirceAstConversions.scala
@@ -14,7 +14,7 @@ object PlayCirceAstConversions {
       json.flatMap(_.fold(
         jsonNull = Eval.now(PlayJson.JsNull),
         jsonBoolean = b => Eval.now(PlayJson.JsBoolean(b)),
-        jsonNumber = n => Eval.now(n.toBigDecimal.map(PlayJson.JsNumber).getOrElse(PlayJson.JsNumber(n.toDouble))),
+        jsonNumber = n => Eval.now(n.toBigDecimal.map(PlayJson.JsNumber.apply).getOrElse(PlayJson.JsNumber(n.toDouble))),
         jsonString = s => Eval.now(PlayJson.JsString(s)),
         jsonArray = as =>
           Eval

diff --git a/play-json-tools/src/main/scala/com/evolution/playjson/tools/PlayJsonHelper.scala b/play-json-tools/src/main/scala/com/evolution/playjson/tools/PlayJsonHelper.scala
@@ -3,7 +3,7 @@ package com.evolution.playjson.tools
 import com.evolutiongaming.nel.Nel
 import play.api.libs.json._
 
-import java.net.URL
+import java.net.{URI, URL}
 import java.time.format.{DateTimeFormatter, DateTimeParseException}
 import java.time.{Instant, LocalTime, ZoneOffset}
 import scala.concurrent.duration._
@@ -17,7 +17,7 @@ object PlayJsonHelper {
 
     def reads(json: JsValue): JsResult[URL] = for {
       s <- json.validate[String]
-      url <- Try(new URL(s)) match {
+      url <- Try(new URI(s).toURL) match {
         case Success(x) => JsSuccess(x)
         case Failure(t) => JsError(t.toString)
       }

diff --git a/play-json-tools/src/test/scala/com/evolution/playjson/tools/FlatFormatSpec.scala b/play-json-tools/src/test/scala/com/evolution/playjson/tools/FlatFormatSpec.scala
@@ -1,5 +1,6 @@
 package com.evolution.playjson.tools
 
+import com.evolution.playjson.tools.FlatFormatSpec.{Inner, Outer}
 import com.evolution.playjson.tools.PlayJsonHelper.FlatFormat
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
@@ -30,13 +31,17 @@ class FlatFormatSpec extends AnyFunSuite with Matchers {
       FlatFormat("inner2", Json.format[Outer])
     }
   }
+}
 
+object FlatFormatSpec {
   case class Inner(inner: String)
+
   object Inner {
     implicit val JsonFormat: Format[Inner] = Json.format[Inner]
   }
 
   case class Outer(outer: String, inner: Inner)
+
   object Outer {
     implicit val JsonFormat: Format[Outer] = FlatFormat("inner", Json.format[Outer])
   }

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -3,9 +3,9 @@ import sbt._
 object Dependencies {
 
   val shapeless = "com.chuusai"         %% "shapeless" % "2.3.10"
-  val nel       = "com.evolutiongaming" %% "nel"       % "1.3.4"
+  val nel       = "com.evolutiongaming" %% "nel"       % "1.3.5"
   val playJson  = "com.typesafe.play"   %% "play-json" % "2.10.2"
-  val scalaTest = "org.scalatest"       %% "scalatest" % "3.2.15"
+  val scalaTest = "org.scalatest"       %% "scalatest" % "3.2.18"
   val jsoniter  = "com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-core"  % "2.23.0"
   val jsonGenerator = "com.github.imrafaelmerino" %% "json-scala-values-generator" % "1.0.0"
   val collectionCompact = "org.scala-lang.modules" %% "scala-collection-compat" % "2.10.0"

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.2
+sbt.version=1.10.0
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,12 +1,12 @@
 externalResolvers += Resolver.bintrayIvyRepo("evolutiongaming", "sbt-plugins")
 
-val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.13.0")
+val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.16.0")
 
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")
 
 addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.11")