Skip to content

Commit

Permalink
Update scala3-library to 3.3.1 (#164)
Browse files Browse the repository at this point in the history
  • Loading branch information
paoloboni committed Sep 10, 2023
1 parent 2bd0ce2 commit a2e7231
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ pull_request_rules:
- title~=^Update\s.*
- "status-success=test ([email protected], 2.12.18)"
- "status-success=test ([email protected], 2.13.11)"
- "status-success=test ([email protected], 3.2.2)"
- "status-success=test ([email protected], 3.3.1)"
- "status-success=test ([email protected], 2.12.18)"
- "status-success=test ([email protected], 2.13.11)"
- "status-success=test ([email protected], 3.2.2)"
- "status-success=test ([email protected], 3.3.1)"
- "status-success=test ([email protected], 2.12.18)"
- "status-success=test ([email protected], 2.13.11)"
- "status-success=test ([email protected], 3.2.2)"
- "status-success=test ([email protected], 3.3.1)"
actions:
merge:
method: squash
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions src/main/scala-3/spray/json/derived/MkJsonFormat.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,4 @@ package spray
package json
package derived

import scala.annotation.implicitNotFound

class MkJsonFormat[T](val value: Context => JsonFormat[T]) extends AnyVal
5 changes: 0 additions & 5 deletions src/main/scala-3/spray/json/derived/derivation.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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._

Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit a2e7231

Please sign in to comment.