Kebs 2.0 cross platform (#389)

* Circe, instances, play-json, enum x ScalaJS * tagged-meta, http4s x ScalaJS * Missing files * ScalaJS for http4s and stir * Some compat changes, Scala 3 releases, version bumps and first Scala Native package. * ScalaNative for enum & opaque. * Instances Scala Native * tagged, taggedMeta native * Fixin deps for circe & play-json.
theiterators · Sep 13, 2024 · e668595 · e668595
1 parent f75647a
commit e668595
Show file tree

Hide file tree

Showing 35 changed files with 213 additions and 148 deletions.
diff --git a/akka-http/src/main/scala/pl/iterators/kebs/akkahttp/matchers/KebsAkkaHttpMatchers.scala b/akka-http/src/main/scala/pl/iterators/kebs/akkahttp/matchers/KebsAkkaHttpMatchers.scala
@@ -1,11 +1,11 @@
 package pl.iterators.kebs.akkahttp.matchers
 
-import akka.http.scaladsl.server.{PathMatcher1, PathMatchers}
+import akka.http.scaladsl.server.PathMatcher1
 import pl.iterators.kebs.core.enums.{EnumLike, ValueEnumLike, ValueEnumLikeEntry}
 import pl.iterators.kebs.core.instances.InstanceConverter
 import pl.iterators.kebs.core.macros.ValueClassLike
 
-trait KebsAkkaHttpMatchers extends PathMatchers {
+trait KebsAkkaHttpMatchers extends akka.http.scaladsl.server.PathMatchers {
   implicit class SegmentIsomorphism[U](segment: PathMatcher1[U]) {
     def as[T](implicit rep: ValueClassLike[T, U]): PathMatcher1[T]                                = segment.map(rep.apply)
     def asValueEnum[T <: ValueEnumLikeEntry[U]](implicit e: ValueEnumLike[U, T]): PathMatcher1[T] = segment.map(e.withValue)

diff --git a/build.sbt b/build.sbt
diff --git a/circe/src/test/scala/pl/iterators/kebs/circe/instances/TimeInstancesTests.scala b/circe/src/test/scala/pl/iterators/kebs/circe/instances/TimeInstancesTests.scala
@@ -9,7 +9,7 @@ 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"
   test("No ValueClassLike implicits derived") {
 
     "implicitly[ValueClassLike[DayOfWeek, Int]]" shouldNot typeCheck
@@ -268,13 +268,15 @@ class TimeInstancesTests extends AnyFunSuite with Matchers with KebsCirce with T
   }
 
   test("ZoneId standard format") {
-    val encoder = implicitly[Encoder[ZoneId]]
-    val decoder = implicitly[Decoder[ZoneId]]
-    val value   = "Europe/Warsaw"
-    val obj     = ZoneId.of(value)
+    if (!isScalaJS) {
+      val encoder = implicitly[Encoder[ZoneId]]
+      val decoder = implicitly[Decoder[ZoneId]]
+      val value   = "Europe/Warsaw"
+      val obj     = ZoneId.of(value)
 
-    encoder(obj) shouldBe Json.fromString(value)
-    decoder(Json.fromString(value).hcursor) shouldBe Right(obj)
+      encoder(obj) shouldBe Json.fromString(value)
+      decoder(Json.fromString(value).hcursor) shouldBe Right(obj)
+    }
   }
 
   test("ZoneId wrong format exception") {
@@ -302,13 +304,15 @@ class TimeInstancesTests extends AnyFunSuite with Matchers with KebsCirce with T
   }
 
   test("ZonedDateTime standard format") {
-    val encoder = implicitly[Encoder[ZonedDateTime]]
-    val decoder = implicitly[Decoder[ZonedDateTime]]
-    val value   = "2011-12-03T10:15:30+01:00[Europe/Warsaw]"
-    val obj     = ZonedDateTime.parse(value)
-
-    encoder(obj) shouldBe Json.fromString(value)
-    decoder(Json.fromString(value).hcursor) shouldBe Right(obj)
+    if (!isScalaJS) {
+      val encoder = implicitly[Encoder[ZonedDateTime]]
+      val decoder = implicitly[Decoder[ZonedDateTime]]
+      val value   = "2011-12-03T10:15:30+01:00[Europe/Warsaw]"
+      val obj     = ZonedDateTime.parse(value)
+
+      encoder(obj) shouldBe Json.fromString(value)
+      decoder(Json.fromString(value).hcursor) shouldBe Right(obj)
+    }
   }
 
   test("ZonedDateTime wrong format exception") {

diff --git a/circe/src/test/scala/pl/iterators/kebs/circe/instances/UtilInstancesTests.scala b/circe/src/test/scala/pl/iterators/kebs/circe/instances/UtilInstancesTests.scala
@@ -9,7 +9,7 @@ import pl.iterators.kebs.instances.UtilInstances
 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"
   test("No ValueClassLike implicits derived") {
 
     "implicitly[ValueClassLike[Currency, String]]" shouldNot typeCheck
@@ -21,13 +21,15 @@ class UtilInstancesTests extends AnyFunSuite with Matchers with KebsCirce with U
   }
 
   test("Currency standard format") {
-    val encoder = implicitly[Encoder[Currency]]
-    val decoder = implicitly[Decoder[Currency]]
-    val value   = "PLN"
-    val obj     = Currency.getInstance(value)
+    if (!isScalaJS) {
+      val encoder = implicitly[Encoder[Currency]]
+      val decoder = implicitly[Decoder[Currency]]
+      val value   = "PLN"
+      val obj     = Currency.getInstance(value)
 
-    encoder(obj) shouldBe Json.fromString(value)
-    decoder(Json.fromString(value).hcursor) shouldBe Right(obj)
+      encoder(obj) shouldBe Json.fromString(value)
+      decoder(Json.fromString(value).hcursor) shouldBe Right(obj)
+    }
   }
 
   test("Currency wrong format exception") {

diff --git a/...rs/kebs/http4sstir/KebsEnumForTests.scala → ...rs/kebs/http4sstir/KebsEnumForTests.scala b/...rs/kebs/http4sstir/KebsEnumForTests.scala → ...rs/kebs/http4sstir/KebsEnumForTests.scala
diff --git a/...bs/http4sstir/KebsValueEnumForTests.scala → ...bs/http4sstir/KebsValueEnumForTests.scala b/...bs/http4sstir/KebsValueEnumForTests.scala → ...bs/http4sstir/KebsValueEnumForTests.scala
diff --git a/...p4sstir/domain/Http4sStirTagsDomain.scala → ...p4sstir/domain/Http4sStirTagsDomain.scala b/...p4sstir/domain/Http4sStirTagsDomain.scala → ...p4sstir/domain/Http4sStirTagsDomain.scala
diff --git a/...rs/kebs/http4sstir/KebsEnumForTests.scala → ...rs/kebs/http4sstir/KebsEnumForTests.scala b/...rs/kebs/http4sstir/KebsEnumForTests.scala → ...rs/kebs/http4sstir/KebsEnumForTests.scala
diff --git a/...bs/http4sstir/KebsValueEnumForTests.scala → ...bs/http4sstir/KebsValueEnumForTests.scala b/...bs/http4sstir/KebsValueEnumForTests.scala → ...bs/http4sstir/KebsValueEnumForTests.scala
diff --git a/...p4sstir/domain/Http4sStirTagsDomain.scala → ...p4sstir/domain/Http4sStirTagsDomain.scala b/...p4sstir/domain/Http4sStirTagsDomain.scala → ...p4sstir/domain/Http4sStirTagsDomain.scala
diff --git a/...ir/matchers/Http4sStirMatchersTests.scala → ...ir/matchers/Http4sStirMatchersTests.scala b/...ir/matchers/Http4sStirMatchersTests.scala → ...ir/matchers/Http4sStirMatchersTests.scala
diff --git a/...allers/Http4sStirUnmarshallersTests.scala → ...allers/Http4sStirUnmarshallersTests.scala b/...allers/Http4sStirUnmarshallersTests.scala → ...allers/Http4sStirUnmarshallersTests.scala
diff --git a/...tir/matchers/KebsHttp4sStirMatchers.scala → ...tir/matchers/KebsHttp4sStirMatchers.scala b/...tir/matchers/KebsHttp4sStirMatchers.scala → ...tir/matchers/KebsHttp4sStirMatchers.scala
diff --git a/...rs/kebs/http4sstir/matchers/package.scala → ...rs/kebs/http4sstir/matchers/package.scala b/...rs/kebs/http4sstir/matchers/package.scala → ...rs/kebs/http4sstir/matchers/package.scala
diff --git a/...hallers/KebsHttp4sStirUnmarshallers.scala → ...hallers/KebsHttp4sStirUnmarshallers.scala b/...hallers/KebsHttp4sStirUnmarshallers.scala → ...hallers/KebsHttp4sStirUnmarshallers.scala
diff --git a/...bs/http4sstir/unmarshallers/package.scala → ...bs/http4sstir/unmarshallers/package.scala b/...bs/http4sstir/unmarshallers/package.scala → ...bs/http4sstir/unmarshallers/package.scala
diff --git a/...terators/kebs/http4s/Http4sDslTests.scala → ...terators/kebs/http4s/Http4sDslTests.scala b/...terators/kebs/http4s/Http4sDslTests.scala → ...terators/kebs/http4s/Http4sDslTests.scala
diff --git a/...iterators/kebs/http4s/domain/Domain.scala → ...iterators/kebs/http4s/domain/Domain.scala b/...iterators/kebs/http4s/domain/Domain.scala → ...iterators/kebs/http4s/domain/Domain.scala
diff --git a/...a-3/pl/iterators/kebs/http4s/Domain.scala → ...a-3/pl/iterators/kebs/http4s/Domain.scala b/...a-3/pl/iterators/kebs/http4s/Domain.scala → ...a-3/pl/iterators/kebs/http4s/Domain.scala
diff --git a/...terators/kebs/http4s/Http4sDslTests.scala → ...terators/kebs/http4s/Http4sDslTests.scala b/...terators/kebs/http4s/Http4sDslTests.scala → ...terators/kebs/http4s/Http4sDslTests.scala
diff --git a/...pl/iterators/kebs/http4s/KebsHttp4s.scala → ...pl/iterators/kebs/http4s/KebsHttp4s.scala b/...pl/iterators/kebs/http4s/KebsHttp4s.scala → ...pl/iterators/kebs/http4s/KebsHttp4s.scala
diff --git a/...la/pl/iterators/kebs/http4s/package.scala → ...la/pl/iterators/kebs/http4s/package.scala b/...la/pl/iterators/kebs/http4s/package.scala → ...la/pl/iterators/kebs/http4s/package.scala
diff --git a/instances/src/test/scala/pl/iterators/kebs/instances/time/TimeInstancesTests.scala b/instances/src/test/scala/pl/iterators/kebs/instances/time/TimeInstancesTests.scala
@@ -9,6 +9,8 @@ import InstanceConverter.DecodeErrorException
 import java.time._
 
 class TimeInstancesTests extends AnyFunSuite with Matchers with TimeInstances {
+  private def isScalaJS     = System.getProperty("java.vm.name") == "Scala.js"
+  private def isScalaNative = System.getProperty("java.vm.name") == "Scala Native"
 
   test("DayOfWeek to Int") {
     val ico   = implicitly[InstanceConverter[DayOfWeek, Int]]
@@ -219,12 +221,14 @@ class TimeInstancesTests extends AnyFunSuite with Matchers with TimeInstances {
   }
 
   test("ZoneId to String") {
-    val ico   = implicitly[InstanceConverter[ZoneId, String]]
-    val value = "Europe/Warsaw"
-    val obj   = ZoneId.of(value)
+    if (!isScalaJS && !isScalaNative) {
+      val ico   = implicitly[InstanceConverter[ZoneId, String]]
+      val value = "Europe/Warsaw"
+      val obj   = ZoneId.of(value)
 
-    ico.encode(obj) shouldBe value
-    ico.decode(value) shouldBe obj
+      ico.encode(obj) shouldBe value
+      ico.decode(value) shouldBe obj
+    }
   }
 
   test("ZoneId wrong format exception") {
@@ -251,12 +255,14 @@ class TimeInstancesTests extends AnyFunSuite with Matchers with TimeInstances {
   }
 
   test("ZonedDateTime to String") {
-    val ico   = implicitly[InstanceConverter[ZonedDateTime, String]]
-    val value = "2011-12-03T10:15:30+01:00[Europe/Warsaw]"
-    val obj   = ZonedDateTime.parse(value)
-
-    ico.encode(obj) shouldBe value
-    ico.decode(value) shouldBe obj
+    if (!isScalaJS && !isScalaNative) {
+      val ico   = implicitly[InstanceConverter[ZonedDateTime, String]]
+      val value = "2011-12-03T10:15:30+01:00[Europe/Warsaw]"
+      val obj   = ZonedDateTime.parse(value)
+
+      ico.encode(obj) shouldBe value
+      ico.decode(value) shouldBe obj
+    }
   }
 
   test("ZonedDateTime wrong format exception") {

diff --git a/instances/src/test/scala/pl/iterators/kebs/instances/util/UtilInstancesTests.scala b/instances/src/test/scala/pl/iterators/kebs/instances/util/UtilInstancesTests.scala
@@ -9,14 +9,18 @@ import InstanceConverter.DecodeErrorException
 import java.util.{Currency, Locale, UUID}
 
 class UtilInstancesTests extends AnyFunSuite with Matchers with UtilInstances {
+  private def isScalaJS     = System.getProperty("java.vm.name") == "Scala.js"
+  private def isScalaNative = System.getProperty("java.vm.name") == "Scala Native"
 
   test("Currency to String") {
-    val ico   = implicitly[InstanceConverter[Currency, String]]
-    val value = "PLN"
-    val obj   = Currency.getInstance(value)
-
-    ico.encode(obj) shouldBe value
-    ico.decode(value) shouldBe obj
+    if (!isScalaJS && !isScalaNative) {
+      val ico   = implicitly[InstanceConverter[Currency, String]]
+      val value = "PLN"
+      val obj   = Currency.getInstance(value)
+
+      ico.encode(obj) shouldBe value
+      ico.decode(value) shouldBe obj
+    }
   }
 
   test("Currency wrong format exception") {

diff --git a/play-json/src/test/scala/pl/iterators/kebs/playjson/instances/TimeInstancesTests.scala b/play-json/src/test/scala/pl/iterators/kebs/playjson/instances/TimeInstancesTests.scala
@@ -9,6 +9,7 @@ import play.api.libs.json.{Format, JsError, JsNumber, JsString, JsSuccess}
 import java.time._
 
 class TimeInstancesTests extends AnyFunSuite with Matchers with TimeInstances {
+  private def isScalaJS = System.getProperty("java.vm.name") == "Scala.js"
   import pl.iterators.kebs.playjson._
   test("No ValueClassLike implicits derived") {
 
@@ -255,12 +256,14 @@ class TimeInstancesTests extends AnyFunSuite with Matchers with TimeInstances {
   }
 
   test("ZoneId standard format") {
-    val jf    = implicitly[Format[ZoneId]]
-    val value = "Europe/Warsaw"
-    val obj   = ZoneId.of(value)
+    if (!isScalaJS) {
+      val jf    = implicitly[Format[ZoneId]]
+      val value = "Europe/Warsaw"
+      val obj   = ZoneId.of(value)
 
-    jf.writes(obj) shouldBe JsString(value)
-    jf.reads(JsString(value)) shouldBe JsSuccess(obj)
+      jf.writes(obj) shouldBe JsString(value)
+      jf.reads(JsString(value)) shouldBe JsSuccess(obj)
+    }
   }
 
   test("ZoneId wrong format exception") {
@@ -287,12 +290,14 @@ class TimeInstancesTests extends AnyFunSuite with Matchers with TimeInstances {
   }
 
   test("ZonedDateTime standard format") {
-    val jf    = implicitly[Format[ZonedDateTime]]
-    val value = "2011-12-03T10:15:30+01:00[Europe/Warsaw]"
-    val obj   = ZonedDateTime.parse(value)
-
-    jf.writes(obj) shouldBe JsString(value)
-    jf.reads(JsString(value)) shouldBe JsSuccess(obj)
+    if (!isScalaJS) {
+      val jf    = implicitly[Format[ZonedDateTime]]
+      val value = "2011-12-03T10:15:30+01:00[Europe/Warsaw]"
+      val obj   = ZonedDateTime.parse(value)
+
+      jf.writes(obj) shouldBe JsString(value)
+      jf.reads(JsString(value)) shouldBe JsSuccess(obj)
+    }
   }
 
   test("ZonedDateTime wrong format exception") {

diff --git a/play-json/src/test/scala/pl/iterators/kebs/playjson/instances/UtilInstancesTests.scala b/play-json/src/test/scala/pl/iterators/kebs/playjson/instances/UtilInstancesTests.scala
@@ -9,6 +9,7 @@ import play.api.libs.json.{Format, JsError, JsString, JsSuccess}
 import java.util.{Currency, Locale, UUID}
 
 class UtilInstancesTests extends AnyFunSuite with Matchers with UtilInstances {
+  private def isScalaJS = System.getProperty("java.vm.name") == "Scala.js"
   import pl.iterators.kebs.playjson._
   test("No ValueClassLike implicits derived") {
 
@@ -21,12 +22,14 @@ class UtilInstancesTests extends AnyFunSuite with Matchers with UtilInstances {
   }
 
   test("Currency standard format") {
-    val jf    = implicitly[Format[Currency]]
-    val value = "PLN"
-    val obj   = Currency.getInstance(value)
+    if (!isScalaJS) {
+      val jf    = implicitly[Format[Currency]]
+      val value = "PLN"
+      val obj   = Currency.getInstance(value)
 
-    jf.writes(obj) shouldBe JsString(value)
-    jf.reads(JsString(value)) shouldBe JsSuccess(obj)
+      jf.writes(obj) shouldBe JsString(value)
+      jf.reads(JsString(value)) shouldBe JsSuccess(obj)
+    }
   }
 
   test("Currency wrong format exception") {

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,5 +4,7 @@ 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.5.12")
 
-addSbtPlugin("org.scala-js"       % "sbt-scalajs"              % "1.16.0")
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.3.2")
+addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.16.0")
+addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.5.4")
diff --git a/.../kebs/tag/meta/CirceAnnotationTests.scala → .../kebs/tag/meta/CirceAnnotationTests.scala b/.../kebs/tag/meta/CirceAnnotationTests.scala → .../kebs/tag/meta/CirceAnnotationTests.scala
diff --git a/.../tag/meta/JsonSchemaAnnotationTests.scala → .../tag/meta/JsonSchemaAnnotationTests.scala b/.../tag/meta/JsonSchemaAnnotationTests.scala → .../tag/meta/JsonSchemaAnnotationTests.scala
diff --git a/.../kebs/tag/meta/SprayAnnotationTests.scala → .../kebs/tag/meta/SprayAnnotationTests.scala b/.../kebs/tag/meta/SprayAnnotationTests.scala → .../kebs/tag/meta/SprayAnnotationTests.scala
diff --git a/.../kebs/tag/meta/SprayKebsIssue47Test.scala → .../kebs/tag/meta/SprayKebsIssue47Test.scala b/.../kebs/tag/meta/SprayKebsIssue47Test.scala → .../kebs/tag/meta/SprayKebsIssue47Test.scala
diff --git a/...meta/TaggedAnnotationFromMethodTest.scala → ...meta/TaggedAnnotationFromMethodTest.scala b/...meta/TaggedAnnotationFromMethodTest.scala → ...meta/TaggedAnnotationFromMethodTest.scala
diff --git a/...kebs/tag/meta/TaggedAnnotationTests.scala → ...kebs/tag/meta/TaggedAnnotationTests.scala b/...kebs/tag/meta/TaggedAnnotationTests.scala → ...kebs/tag/meta/TaggedAnnotationTests.scala
diff --git a/...a/pl/iterators/kebs/tag/meta/tagged.scala → ...a/pl/iterators/kebs/tag/meta/tagged.scala b/...a/pl/iterators/kebs/tag/meta/tagged.scala → ...a/pl/iterators/kebs/tag/meta/tagged.scala
diff --git a/tagged/jvm/src/main/scala/pl/iterators/kebs/tagged/slick/KebsTaggedSlickSupport.scala b/tagged/jvm/src/main/scala/pl/iterators/kebs/tagged/slick/KebsTaggedSlickSupport.scala
@@ -2,10 +2,11 @@ package pl.iterators.kebs.tagged.slick
 
 import pl.iterators.kebs.tagged._
 import _root_.slick.jdbc.JdbcProfile
+import scala.reflect.ClassTag
 
 trait KebsTaggedSlickSupport { this: JdbcProfile =>
   trait KebsTaggedImplicits {
-    implicit def taggedColumnType[T, U](implicit baseColumnType: BaseColumnType[T]): BaseColumnType[T @@ U] = {
+    implicit def taggedColumnType[T, U](implicit baseColumnType: BaseColumnType[T], cls: ClassTag[T @@ U]): ColumnType[T @@ U] = {
       MappedColumnType.base[T @@ U, T](identity, _.@@[U])
     }
   }