Skip to content

Commit a2e7231

Browse files
authored
Update scala3-library to 3.3.1 (#164)
1 parent 2bd0ce2 commit a2e7231

File tree

6 files changed

+6
-14
lines changed

6 files changed

+6
-14
lines changed

.github/mergify.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ pull_request_rules:
55
- title~=^Update\s.*
66
- "status-success=test (adopt@1.8, 2.12.18)"
77
- "status-success=test (adopt@1.8, 2.13.11)"
8-
- "status-success=test (adopt@1.8, 3.2.2)"
8+
- "status-success=test (adopt@1.8, 3.3.1)"
99
- "status-success=test (openjdk@1.11, 2.12.18)"
1010
- "status-success=test (openjdk@1.11, 2.13.11)"
11-
- "status-success=test (openjdk@1.11, 3.2.2)"
11+
- "status-success=test (openjdk@1.11, 3.3.1)"
1212
- "status-success=test (openjdk@1.17, 2.12.18)"
1313
- "status-success=test (openjdk@1.17, 2.13.11)"
14-
- "status-success=test (openjdk@1.17, 3.2.2)"
14+
- "status-success=test (openjdk@1.17, 3.3.1)"
1515
actions:
1616
merge:
1717
method: squash

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
scala:
1717
- 2.12.18
1818
- 2.13.11
19-
- 3.2.2
19+
- 3.3.1
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name := "spray-json-derived-codecs"
44

55
lazy val scala212 = "2.12.18"
66
lazy val scala213 = "2.13.11"
7-
lazy val scala3 = "3.2.2"
7+
lazy val scala3 = "3.3.1"
88
lazy val supportedScalaVersions = List(scala212, scala213, scala3)
99

1010
ThisBuild / scalafmtOnCompile := false
@@ -13,7 +13,7 @@ ThisBuild / startYear := Some(2020)
1313

1414
lazy val root = (project in file("."))
1515
.settings(
16-
scalaVersion := scala213,
16+
scalaVersion := scala3,
1717
releaseCrossBuild := true,
1818
releasePublishArtifactsAction := PgpKeys.publishSigned.value,
1919
crossScalaVersions := supportedScalaVersions,

src/main/scala-3/spray/json/derived/MkJsonFormat.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,4 @@ package spray
1818
package json
1919
package derived
2020

21-
import scala.annotation.implicitNotFound
22-
2321
class MkJsonFormat[T](val value: Context => JsonFormat[T]) extends AnyVal

src/main/scala-3/spray/json/derived/derivation.scala

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ package spray
1818
package json
1919
package derived
2020

21-
import spray.json.{JsString, JsValue, JsonFormat}
22-
23-
import spray.json.derived.MkJsonFormat
24-
2521
import scala.deriving._
2622
import scala.compiletime._
2723

@@ -56,7 +52,6 @@ object LazyMk {
5652
val pElem = obj.asInstanceOf[Product]
5753
(pElem.productElementNames.toList zip pElem.productIterator.toList zip formats)
5854
.map { case ((label, elem), format) =>
59-
val encoded = format.asInstanceOf[JsonFormat[Any]].write(elem)
6055
elem match {
6156
case None if !configuration.renderNullOptions =>
6257
JsObject.empty

src/test/scala-3/spray/json/derived/DerivedCodecsSpec.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ class DerivedCodecsSpec
4848

4949
Scenario("tuple type") {
5050
import spray.json.DefaultJsonProtocol._
51-
import spray.json.derived.auto._
5251

5352
type Cat = (String, Int)
5453
val cat: Cat = ("Oliver", 7)

0 commit comments

Comments
 (0)