Update scala3-library to 3.3.1 (#164)

paoloboni · Sep 10, 2023 · a2e7231 · a2e7231
1 parent 2bd0ce2
commit a2e7231
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 14 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -5,13 +5,13 @@ pull_request_rules:
       - title~=^Update\s.*
       - "status-success=test (adopt@1.8, 2.12.18)"
       - "status-success=test (adopt@1.8, 2.13.11)"
-      - "status-success=test (adopt@1.8, 3.2.2)"
+      - "status-success=test (adopt@1.8, 3.3.1)"
       - "status-success=test (openjdk@1.11, 2.12.18)"
       - "status-success=test (openjdk@1.11, 2.13.11)"
-      - "status-success=test (openjdk@1.11, 3.2.2)"
+      - "status-success=test (openjdk@1.11, 3.3.1)"
       - "status-success=test (openjdk@1.17, 2.12.18)"
       - "status-success=test (openjdk@1.17, 2.13.11)"
-      - "status-success=test (openjdk@1.17, 3.2.2)"
+      - "status-success=test (openjdk@1.17, 3.3.1)"
     actions:
       merge:
         method: squash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
         scala:
           - 2.12.18
           - 2.13.11
-          - 3.2.2
+          - 3.3.1
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/build.sbt b/build.sbt
@@ -4,7 +4,7 @@ name := "spray-json-derived-codecs"
 
 lazy val scala212               = "2.12.18"
 lazy val scala213               = "2.13.11"
-lazy val scala3                 = "3.2.2"
+lazy val scala3                 = "3.3.1"
 lazy val supportedScalaVersions = List(scala212, scala213, scala3)
 
 ThisBuild / scalafmtOnCompile := false
@@ -13,7 +13,7 @@ ThisBuild / startYear         := Some(2020)
 
 lazy val root = (project in file("."))
   .settings(
-    scalaVersion                  := scala213,
+    scalaVersion                  := scala3,
     releaseCrossBuild             := true,
     releasePublishArtifactsAction := PgpKeys.publishSigned.value,
     crossScalaVersions            := supportedScalaVersions,

diff --git a/src/main/scala-3/spray/json/derived/MkJsonFormat.scala b/src/main/scala-3/spray/json/derived/MkJsonFormat.scala
@@ -18,6 +18,4 @@ package spray
 package json
 package derived
 
-import scala.annotation.implicitNotFound
-
 class MkJsonFormat[T](val value: Context => JsonFormat[T]) extends AnyVal
diff --git a/src/main/scala-3/spray/json/derived/derivation.scala b/src/main/scala-3/spray/json/derived/derivation.scala
@@ -18,10 +18,6 @@ package spray
 package json
 package derived
 
-import spray.json.{JsString, JsValue, JsonFormat}
-
-import spray.json.derived.MkJsonFormat
-
 import scala.deriving._
 import scala.compiletime._
 
@@ -56,7 +52,6 @@ object LazyMk {
     val pElem = obj.asInstanceOf[Product]
     (pElem.productElementNames.toList zip pElem.productIterator.toList zip formats)
       .map { case ((label, elem), format) =>
-        val encoded = format.asInstanceOf[JsonFormat[Any]].write(elem)
         elem match {
           case None if !configuration.renderNullOptions =>
             JsObject.empty

diff --git a/src/test/scala-3/spray/json/derived/DerivedCodecsSpec.scala b/src/test/scala-3/spray/json/derived/DerivedCodecsSpec.scala
@@ -48,7 +48,6 @@ class DerivedCodecsSpec
 
     Scenario("tuple type") {
       import spray.json.DefaultJsonProtocol._
-      import spray.json.derived.auto._
 
       type Cat = (String, Int)
       val cat: Cat = ("Oliver", 7)