diff --git a/build.sbt b/build.sbt index f667f03..f0fe88f 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,15 @@ .crossType(CrossType.Full) .settings(name := "iw-support-core") .in(file("core")) - .settings(IWDeps.zioPrelude) + .settings( + IWDeps.zioPrelude, + IWDeps.zioJson, + // TODO: use zio-optics when derivation is available + libraryDependencies ++= Seq( + "dev.optics" %%% "monocle-core" % "3.2.0", + "dev.optics" %%% "monocle-macro" % "3.2.0" + ) + ) lazy val `tapir-support` = crossProject(JSPlatform, JVMPlatform) .in(file("tapir")) @@ -67,7 +75,9 @@ IWDeps.akka.profiles.eventsourcedJdbcProjection ) -lazy val ui = crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Full).in(file("ui")) +lazy val ui = crossProject(JSPlatform, JVMPlatform) + .crossType(CrossType.Full) + .in(file("ui")) .settings(name := "iw-support-ui") .settings( IWDeps.useZIO(Test), @@ -85,7 +95,8 @@ ) .jvmSettings( libraryDependencies += "org.apache.poi" % "poi-ooxml" % "5.2.1" - ).dependsOn(core) + ) + .dependsOn(core) lazy val root = (project in file(".")) .enablePlugins(IWScalaProjectPlugin) diff --git a/build.sbt b/build.sbt index f667f03..f0fe88f 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,15 @@ .crossType(CrossType.Full) .settings(name := "iw-support-core") .in(file("core")) - .settings(IWDeps.zioPrelude) + .settings( + IWDeps.zioPrelude, + IWDeps.zioJson, + // TODO: use zio-optics when derivation is available + libraryDependencies ++= Seq( + "dev.optics" %%% "monocle-core" % "3.2.0", + "dev.optics" %%% "monocle-macro" % "3.2.0" + ) + ) lazy val `tapir-support` = crossProject(JSPlatform, JVMPlatform) .in(file("tapir")) @@ -67,7 +75,9 @@ IWDeps.akka.profiles.eventsourcedJdbcProjection ) -lazy val ui = crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Full).in(file("ui")) +lazy val ui = crossProject(JSPlatform, JVMPlatform) + .crossType(CrossType.Full) + .in(file("ui")) .settings(name := "iw-support-ui") .settings( IWDeps.useZIO(Test), @@ -85,7 +95,8 @@ ) .jvmSettings( libraryDependencies += "org.apache.poi" % "poi-ooxml" % "5.2.1" - ).dependsOn(core) + ) + .dependsOn(core) lazy val root = (project in file(".")) .enablePlugins(IWScalaProjectPlugin) diff --git a/codecs/src/main/scala/works/iterative/core/codecs/Codecs.scala b/codecs/src/main/scala/works/iterative/core/codecs/Codecs.scala index 6a66a32..4095dc2 100644 --- a/codecs/src/main/scala/works/iterative/core/codecs/Codecs.scala +++ b/codecs/src/main/scala/works/iterative/core/codecs/Codecs.scala @@ -16,11 +16,11 @@ trait JsonCodecs: - def fromValidation[T](v: Validation[MessageId, T]): Either[String, T] = - v.mapError(_.toString).toEither.left.map(_.mkString(",")) + def fromValidation[T](v: Validation[UserMessage, T]): Either[String, T] = + v.mapError(_.id).toEither.left.map(_.mkString(",")) private def textCodec[T]( - f: String => Validation[MessageId, T] + f: String => Validation[UserMessage, T] ): JsonCodec[T] = JsonCodec.string.transformOrFail(f andThen fromValidation, _.toString) diff --git a/build.sbt b/build.sbt index f667f03..f0fe88f 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,15 @@ .crossType(CrossType.Full) .settings(name := "iw-support-core") .in(file("core")) - .settings(IWDeps.zioPrelude) + .settings( + IWDeps.zioPrelude, + IWDeps.zioJson, + // TODO: use zio-optics when derivation is available + libraryDependencies ++= Seq( + "dev.optics" %%% "monocle-core" % "3.2.0", + "dev.optics" %%% "monocle-macro" % "3.2.0" + ) + ) lazy val `tapir-support` = crossProject(JSPlatform, JVMPlatform) .in(file("tapir")) @@ -67,7 +75,9 @@ IWDeps.akka.profiles.eventsourcedJdbcProjection ) -lazy val ui = crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Full).in(file("ui")) +lazy val ui = crossProject(JSPlatform, JVMPlatform) + .crossType(CrossType.Full) + .in(file("ui")) .settings(name := "iw-support-ui") .settings( IWDeps.useZIO(Test), @@ -85,7 +95,8 @@ ) .jvmSettings( libraryDependencies += "org.apache.poi" % "poi-ooxml" % "5.2.1" - ).dependsOn(core) + ) + .dependsOn(core) lazy val root = (project in file(".")) .enablePlugins(IWScalaProjectPlugin) diff --git a/codecs/src/main/scala/works/iterative/core/codecs/Codecs.scala b/codecs/src/main/scala/works/iterative/core/codecs/Codecs.scala index 6a66a32..4095dc2 100644 --- a/codecs/src/main/scala/works/iterative/core/codecs/Codecs.scala +++ b/codecs/src/main/scala/works/iterative/core/codecs/Codecs.scala @@ -16,11 +16,11 @@ trait JsonCodecs: - def fromValidation[T](v: Validation[MessageId, T]): Either[String, T] = - v.mapError(_.toString).toEither.left.map(_.mkString(",")) + def fromValidation[T](v: Validation[UserMessage, T]): Either[String, T] = + v.mapError(_.id).toEither.left.map(_.mkString(",")) private def textCodec[T]( - f: String => Validation[MessageId, T] + f: String => Validation[UserMessage, T] ): JsonCodec[T] = JsonCodec.string.transformOrFail(f andThen fromValidation, _.toString) diff --git a/project/build.properties b/project/build.properties index 8b9a0b0..3040987 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.0 +sbt.version=1.9.4 diff --git a/build.sbt b/build.sbt index f667f03..f0fe88f 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,15 @@ .crossType(CrossType.Full) .settings(name := "iw-support-core") .in(file("core")) - .settings(IWDeps.zioPrelude) + .settings( + IWDeps.zioPrelude, + IWDeps.zioJson, + // TODO: use zio-optics when derivation is available + libraryDependencies ++= Seq( + "dev.optics" %%% "monocle-core" % "3.2.0", + "dev.optics" %%% "monocle-macro" % "3.2.0" + ) + ) lazy val `tapir-support` = crossProject(JSPlatform, JVMPlatform) .in(file("tapir")) @@ -67,7 +75,9 @@ IWDeps.akka.profiles.eventsourcedJdbcProjection ) -lazy val ui = crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Full).in(file("ui")) +lazy val ui = crossProject(JSPlatform, JVMPlatform) + .crossType(CrossType.Full) + .in(file("ui")) .settings(name := "iw-support-ui") .settings( IWDeps.useZIO(Test), @@ -85,7 +95,8 @@ ) .jvmSettings( libraryDependencies += "org.apache.poi" % "poi-ooxml" % "5.2.1" - ).dependsOn(core) + ) + .dependsOn(core) lazy val root = (project in file(".")) .enablePlugins(IWScalaProjectPlugin) diff --git a/codecs/src/main/scala/works/iterative/core/codecs/Codecs.scala b/codecs/src/main/scala/works/iterative/core/codecs/Codecs.scala index 6a66a32..4095dc2 100644 --- a/codecs/src/main/scala/works/iterative/core/codecs/Codecs.scala +++ b/codecs/src/main/scala/works/iterative/core/codecs/Codecs.scala @@ -16,11 +16,11 @@ trait JsonCodecs: - def fromValidation[T](v: Validation[MessageId, T]): Either[String, T] = - v.mapError(_.toString).toEither.left.map(_.mkString(",")) + def fromValidation[T](v: Validation[UserMessage, T]): Either[String, T] = + v.mapError(_.id).toEither.left.map(_.mkString(",")) private def textCodec[T]( - f: String => Validation[MessageId, T] + f: String => Validation[UserMessage, T] ): JsonCodec[T] = JsonCodec.string.transformOrFail(f andThen fromValidation, _.toString) diff --git a/project/build.properties b/project/build.properties index 8b9a0b0..3040987 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.0 +sbt.version=1.9.4 diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt index eb56cda..1591c0a 100644 --- a/project/project/plugins.sbt +++ b/project/project/plugins.sbt @@ -3,5 +3,5 @@ resolvers += "IW snapshots" at "https://dig.iterative.works/maven/snapshots" addSbtPlugin( - "works.iterative.sbt" % "sbt-iw-plugin-presets" % "0.3.17" + "works.iterative.sbt" % "sbt-iw-plugin-presets" % "0.3.18" ) diff --git a/build.sbt b/build.sbt index f667f03..f0fe88f 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,15 @@ .crossType(CrossType.Full) .settings(name := "iw-support-core") .in(file("core")) - .settings(IWDeps.zioPrelude) + .settings( + IWDeps.zioPrelude, + IWDeps.zioJson, + // TODO: use zio-optics when derivation is available + libraryDependencies ++= Seq( + "dev.optics" %%% "monocle-core" % "3.2.0", + "dev.optics" %%% "monocle-macro" % "3.2.0" + ) + ) lazy val `tapir-support` = crossProject(JSPlatform, JVMPlatform) .in(file("tapir")) @@ -67,7 +75,9 @@ IWDeps.akka.profiles.eventsourcedJdbcProjection ) -lazy val ui = crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Full).in(file("ui")) +lazy val ui = crossProject(JSPlatform, JVMPlatform) + .crossType(CrossType.Full) + .in(file("ui")) .settings(name := "iw-support-ui") .settings( IWDeps.useZIO(Test), @@ -85,7 +95,8 @@ ) .jvmSettings( libraryDependencies += "org.apache.poi" % "poi-ooxml" % "5.2.1" - ).dependsOn(core) + ) + .dependsOn(core) lazy val root = (project in file(".")) .enablePlugins(IWScalaProjectPlugin) diff --git a/codecs/src/main/scala/works/iterative/core/codecs/Codecs.scala b/codecs/src/main/scala/works/iterative/core/codecs/Codecs.scala index 6a66a32..4095dc2 100644 --- a/codecs/src/main/scala/works/iterative/core/codecs/Codecs.scala +++ b/codecs/src/main/scala/works/iterative/core/codecs/Codecs.scala @@ -16,11 +16,11 @@ trait JsonCodecs: - def fromValidation[T](v: Validation[MessageId, T]): Either[String, T] = - v.mapError(_.toString).toEither.left.map(_.mkString(",")) + def fromValidation[T](v: Validation[UserMessage, T]): Either[String, T] = + v.mapError(_.id).toEither.left.map(_.mkString(",")) private def textCodec[T]( - f: String => Validation[MessageId, T] + f: String => Validation[UserMessage, T] ): JsonCodec[T] = JsonCodec.string.transformOrFail(f andThen fromValidation, _.toString) diff --git a/project/build.properties b/project/build.properties index 8b9a0b0..3040987 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.0 +sbt.version=1.9.4 diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt index eb56cda..1591c0a 100644 --- a/project/project/plugins.sbt +++ b/project/project/plugins.sbt @@ -3,5 +3,5 @@ resolvers += "IW snapshots" at "https://dig.iterative.works/maven/snapshots" addSbtPlugin( - "works.iterative.sbt" % "sbt-iw-plugin-presets" % "0.3.17" + "works.iterative.sbt" % "sbt-iw-plugin-presets" % "0.3.18" ) diff --git a/ui/js/src/main/scala/works/iterative/ui/components/tailwind/Display.scala b/ui/js/src/main/scala/works/iterative/ui/components/tailwind/Display.scala index 9ec397e..84eb271 100644 --- a/ui/js/src/main/scala/works/iterative/ui/components/tailwind/Display.scala +++ b/ui/js/src/main/scala/works/iterative/ui/components/tailwind/Display.scala @@ -9,7 +9,7 @@ enum DisplayClass: case block, `inline-block`, `inline`, flex, `inline-flex`, table, - `inline-table`, `table-caption` + `inline-table`, `table-caption` object ShowUpFrom: inline def apply(