From f79aa714a465f18512cb656ec04b3964daafd8d9 Mon Sep 17 00:00:00 2001 From: Dejan Mijic Date: Fri, 23 Aug 2024 23:10:53 +0200 Subject: [PATCH 1/4] Upgrade dependencies --- project/Dependencies.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8313d74e3..c41711b97 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,13 +4,13 @@ object Dependencies { private object Versions { val CatsEffect = "3.5.4" val EmbeddedRedis = "0.6" - val Redis4Cats = "1.6.0" + val Redis4Cats = "1.7.1" val Sttp = "3.9.8" val TlsChannel = "0.9.1" val ZHttp = "2.0.0-RC11" val ZioConfig = "4.0.2" - val ZioJson = "0.6.2" - val ZioSchema = "1.2.2" + val ZioJson = "0.7.2" + val ZioSchema = "1.4.1" val ZioTestContainers = "0.5.0" } From 9596b0c2e7c5823032cdac92c03f319bfde01de6 Mon Sep 17 00:00:00 2001 From: Dejan Mijic Date: Fri, 23 Aug 2024 23:25:51 +0200 Subject: [PATCH 2/4] Specify types --- .../src/main/scala/zio/redis/example/ContributorsCache.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/example/src/main/scala/zio/redis/example/ContributorsCache.scala b/modules/example/src/main/scala/zio/redis/example/ContributorsCache.scala index 4a666169a..6243312bd 100644 --- a/modules/example/src/main/scala/zio/redis/example/ContributorsCache.scala +++ b/modules/example/src/main/scala/zio/redis/example/ContributorsCache.scala @@ -30,7 +30,7 @@ trait ContributorsCache { object ContributorsCache { lazy val layer: URLayer[Redis with Sttp, ContributorsCache] = - ZLayer.fromFunction(Live.apply _) + ZLayer.fromFunction[Redis with Sttp](Live.apply _) private final case class Live(redis: Redis, sttp: Sttp) extends ContributorsCache { def fetchAll(repository: Repository): IO[ApiError, Contributors] = From fa809f6787f95d0a66dbc5129b26e7af7d5dca3e Mon Sep 17 00:00:00 2001 From: Dejan Mijic Date: Fri, 23 Aug 2024 23:29:58 +0200 Subject: [PATCH 3/4] Revert "Specify types" This reverts commit 9596b0c2e7c5823032cdac92c03f319bfde01de6. --- .../src/main/scala/zio/redis/example/ContributorsCache.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/example/src/main/scala/zio/redis/example/ContributorsCache.scala b/modules/example/src/main/scala/zio/redis/example/ContributorsCache.scala index 6243312bd..4a666169a 100644 --- a/modules/example/src/main/scala/zio/redis/example/ContributorsCache.scala +++ b/modules/example/src/main/scala/zio/redis/example/ContributorsCache.scala @@ -30,7 +30,7 @@ trait ContributorsCache { object ContributorsCache { lazy val layer: URLayer[Redis with Sttp, ContributorsCache] = - ZLayer.fromFunction[Redis with Sttp](Live.apply _) + ZLayer.fromFunction(Live.apply _) private final case class Live(redis: Redis, sttp: Sttp) extends ContributorsCache { def fetchAll(repository: Repository): IO[ApiError, Contributors] = From 1cae36ac6d50fc5847d9aa0eb52bc5bc506dd1ef Mon Sep 17 00:00:00 2001 From: Dejan Mijic Date: Fri, 23 Aug 2024 23:37:26 +0200 Subject: [PATCH 4/4] Change alias --- .../example/src/main/scala/zio/redis/example/package.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/example/src/main/scala/zio/redis/example/package.scala b/modules/example/src/main/scala/zio/redis/example/package.scala index 68f2a0b53..597d899ba 100644 --- a/modules/example/src/main/scala/zio/redis/example/package.scala +++ b/modules/example/src/main/scala/zio/redis/example/package.scala @@ -16,8 +16,6 @@ package zio.redis -import sttp.capabilities.WebSockets -import sttp.capabilities.zio.ZioStreams import sttp.client3.SttpBackend import zio.Task @@ -26,5 +24,5 @@ package object example { type Login = Login.Type type Owner = Owner.Type type Name = Name.Type - type Sttp = SttpBackend[Task, ZioStreams with WebSockets] + type Sttp = SttpBackend[Task, Any] }