From 18ba04ac2164e08f4db74d0d2e7d8e0c541a890a Mon Sep 17 00:00:00 2001 From: Matthias Berndt Date: Thu, 5 Sep 2024 13:38:44 +0200 Subject: [PATCH 1/2] add DeriveConfig instances for NonEmptyChunk --- .../scala-2.12-2.13/zio/config/magnolia/DeriveConfig.scala | 5 ++++- .../main/scala-dotty/zio/config/magnolia/DeriveConfig.scala | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/magnolia/shared/src/main/scala-2.12-2.13/zio/config/magnolia/DeriveConfig.scala b/magnolia/shared/src/main/scala-2.12-2.13/zio/config/magnolia/DeriveConfig.scala index 6e7c63915..6c35914f6 100644 --- a/magnolia/shared/src/main/scala-2.12-2.13/zio/config/magnolia/DeriveConfig.scala +++ b/magnolia/shared/src/main/scala-2.12-2.13/zio/config/magnolia/DeriveConfig.scala @@ -2,7 +2,7 @@ package zio.config.magnolia import magnolia._ import zio.config._ -import zio.{Chunk, Config, LogLevel} +import zio.{Chunk, NonEmptyChunk, Config, LogLevel} import java.net.URI import java.time.{LocalDate, LocalDateTime, LocalTime, OffsetDateTime} @@ -75,6 +75,9 @@ object DeriveConfig { implicit def implicitChunkDesc[A: DeriveConfig]: DeriveConfig[Chunk[A]] = DeriveConfig(Config.chunkOf(DeriveConfig[A].desc)) + implicit def implicitNonEmptyChunkDesc[A: DeriveConfig]: DeriveConfig[NonEmptyChunk[A]] = + DeriveConfig(Config.nonEmptyChunkOf(DeriveConfig[A].desc)) + implicit def implicitMapDesc[A: DeriveConfig]: DeriveConfig[Map[String, A]] = DeriveConfig(Config.table(implicitly[DeriveConfig[A]].desc)) diff --git a/magnolia/shared/src/main/scala-dotty/zio/config/magnolia/DeriveConfig.scala b/magnolia/shared/src/main/scala-dotty/zio/config/magnolia/DeriveConfig.scala index d54a467ac..498c4879a 100644 --- a/magnolia/shared/src/main/scala-dotty/zio/config/magnolia/DeriveConfig.scala +++ b/magnolia/shared/src/main/scala-dotty/zio/config/magnolia/DeriveConfig.scala @@ -107,6 +107,9 @@ object DeriveConfig { given chunkDesc[A](using ev: DeriveConfig[A]): DeriveConfig[Chunk[A]] = DeriveConfig.from(chunkOf(ev.desc)) + given nonEmptyChunkDesc[A](using ev: DeriveConfig[A]): DeriveConfig[NonEmptyChunk[A]] = + DeriveConfig.from(nonEmptyChunkOf(ev.desc)) + given mapDesc[A](using ev: DeriveConfig[A]): DeriveConfig[Map[String, A]] = DeriveConfig.from(table(ev.desc)) From 9ff0f31beeddd4b652a1bc2a64dd66a6d8eaac79 Mon Sep 17 00:00:00 2001 From: Matthias Berndt Date: Thu, 5 Sep 2024 13:49:51 +0200 Subject: [PATCH 2/2] bump zio --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 3db4b163f..7578333ae 100644 --- a/build.sbt +++ b/build.sbt @@ -51,7 +51,7 @@ addCommandAlias( val awsVersion = "1.12.721" val zioAwsVersion = "5.19.33.2" -val zioVersion = "2.0.13" +val zioVersion = "2.1.9" val magnoliaVersion = "0.17.0" val refinedVersion = "0.11.1" val pureconfigVersion = "0.16.0"