Skip to content

Commit

Permalink
Updating deps, SN for circe and enumeratum.
Browse files Browse the repository at this point in the history
  • Loading branch information
luksow committed Oct 7, 2024
1 parent 1183c27 commit 3fe7d98
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
8 changes: 5 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def akkaHttpInExamples = {
}

val pekkoVersion = "1.1.1"
val pekkoHttpVersion = "1.0.1"
val pekkoHttpVersion = "1.1.0"
val pekkoHttpJsonV = "2.0.0"
val pekkoStream = "org.apache.pekko" %% "pekko-stream" % pekkoVersion
val pekkoStreamTestkit = "org.apache.pekko" %% "pekko-stream-testkit" % pekkoVersion
Expand Down Expand Up @@ -359,7 +359,7 @@ lazy val playJsonSupport = crossProject(JSPlatform, JVMPlatform)
crossScalaVersions := supportedScalaVersions
)

lazy val circeSupport = crossProject(JSPlatform, JVMPlatform)
lazy val circeSupport = crossProject(JSPlatform, NativePlatform, JVMPlatform)
.withoutSuffixFor(JVMPlatform)
.crossType(CrossType.Pure)
.in(file("circe"))
Expand Down Expand Up @@ -563,7 +563,7 @@ lazy val enumSupport = crossProject(JSPlatform, NativePlatform, JVMPlatform)
moduleName := "kebs-enum"
)

lazy val enumeratumSupport = crossProject(JSPlatform, JVMPlatform)
lazy val enumeratumSupport = crossProject(JSPlatform, NativePlatform, JVMPlatform)
.withoutSuffixFor(JVMPlatform)
.crossType(CrossType.Pure)
.in(file("enumeratum"))
Expand Down Expand Up @@ -604,6 +604,7 @@ lazy val kebs = project
playJsonSupport.js,
circeSupport.jvm,
circeSupport.js,
circeSupport.native,
jsonschemaSupport,
scalacheckSupport,
akkaHttpSupport,
Expand All @@ -623,6 +624,7 @@ lazy val kebs = project
enumSupport.native,
enumeratumSupport.jvm,
enumeratumSupport.js,
enumeratumSupport.native,
pureConfigSupport
)
.settings(baseSettings *)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import pl.iterators.kebs.instances.TimeInstances
import java.time._

class TimeInstancesTests extends AnyFunSuite with Matchers with KebsCirce with TimeInstances {
private def isScalaJS = System.getProperty("java.vm.name") == "Scala.js"
private def isScalaJS = System.getProperty("java.vm.name") == "Scala.js"
private def isScalaNative = System.getProperty("java.vm.name") == "Scala Native"
test("No ValueClassLike implicits derived") {

"implicitly[ValueClassLike[DayOfWeek, Int]]" shouldNot typeCheck
Expand Down Expand Up @@ -268,7 +269,7 @@ class TimeInstancesTests extends AnyFunSuite with Matchers with KebsCirce with T
}

test("ZoneId standard format") {
if (!isScalaJS) {
if (!isScalaJS && !isScalaNative) {
val encoder = implicitly[Encoder[ZoneId]]
val decoder = implicitly[Decoder[ZoneId]]
val value = "Europe/Warsaw"
Expand Down Expand Up @@ -304,7 +305,7 @@ class TimeInstancesTests extends AnyFunSuite with Matchers with KebsCirce with T
}

test("ZonedDateTime standard format") {
if (!isScalaJS) {
if (!isScalaJS && !isScalaNative) {
val encoder = implicitly[Encoder[ZonedDateTime]]
val decoder = implicitly[Decoder[ZonedDateTime]]
val value = "2011-12-03T10:15:30+01:00[Europe/Warsaw]"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import java.util.{Currency, Locale, UUID}

class UtilInstancesTests extends AnyFunSuite with Matchers with KebsCirce with UtilInstances {
private def isScalaJS = System.getProperty("java.vm.name") == "Scala.js"
private def isNative = System.getProperty("java.vm.name") == "Scala Native"
test("No ValueClassLike implicits derived") {

"implicitly[ValueClassLike[Currency, String]]" shouldNot typeCheck
Expand All @@ -21,7 +22,7 @@ class UtilInstancesTests extends AnyFunSuite with Matchers with KebsCirce with U
}

test("Currency standard format") {
if (!isScalaJS) {
if (!isScalaJS && !isNative) {
val encoder = implicitly[Encoder[Currency]]
val decoder = implicitly[Decoder[Currency]]
val value = "PLN"
Expand Down
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ logLevel := Level.Warn
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1")
addSbtPlugin("org.jmotor.sbt" % "sbt-dependency-updates" % "1.2.9")

addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
Expand Down

0 comments on commit 3fe7d98

Please sign in to comment.