Update dependencies (#678)

Idealiste-cz · Apr 25, 2024 · dd6c770 · dd6c770
1 parent a1b073f
commit dd6c770
Show file tree

Hide file tree

Showing 16 changed files with 74 additions and 82 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
 version = "3.8.1"
-runner.dialect = scala213source3
+runner.dialect = scala213
 maxColumn = 120
 trailingCommas = always
diff --git a/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/Config.scala b/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/Config.scala
@@ -1,13 +1,12 @@
 package cz.idealiste.idealvoting.server
 
 import cz.idealiste.ideal.voting.server
-import monocle.Monocle.*
+import monocle.Monocle._
 import pprint.PPrinter.BlackWhite
-import zio.*
-import zio.config.*
-import zio.config.magnolia.Descriptor
-import zio.config.typesafe.*
-import zio.doobie.liquibase.*
+import zio._
+import zio.config.magnolia._
+import zio.config.typesafe._
+import zio.doobie.liquibase._
 
 final case class Config(
     dbTransactor: ZIODoobieLiquibase.Config,
@@ -17,16 +16,14 @@ final case class Config(
 
 object Config {
 
-  implicit lazy val configDescriptor: ConfigDescriptor[Config] = Descriptor.descriptor[Config]
+  implicit lazy val configDescriptor: DeriveConfig[Config] = DeriveConfig.getDeriveConfig[Config]
 
   private[server] val layer = ZLayer.fromZIO {
+    val typesafe = TypesafeConfigProvider.fromResourcePath()
+    val env = ConfigProvider.envProvider
+    val source = env.orElse(typesafe)
     for {
-      args <- ZIO.service[ZIOAppArgs]
-      typesafe = TypesafeConfigSource.fromResourcePath
-      env = ConfigSource.fromSystemEnv()
-      cmd = ConfigSource.fromCommandLineArgs(args.getArgs.toList)
-      source = cmd <> env <> typesafe
-      config <- read(implicitly[ConfigDescriptor[Config]].from(source)).orDie
+      config <- source.load(deriveConfig[Config]).orDie
       configSanitized = config.focus(_.dbTransactor.hikari.password).replace(Some("******"))
       () <- ZIO.logInfo(s"${server.BuildInfo}, configuration:\n${BlackWhite(configSanitized)}")
     } yield config

diff --git a/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/Db.scala b/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/Db.scala
@@ -1,7 +1,7 @@
 package cz.idealiste.idealvoting.server
 
-import cz.idealiste.idealvoting.server.Db.*
-import cz.idealiste.idealvoting.server.Voting.*
+import cz.idealiste.idealvoting.server.Db._
+import cz.idealiste.idealvoting.server.Voting._
 import zio.Task
 
 import java.time.OffsetDateTime

diff --git a/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/DbDoobie.scala b/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/DbDoobie.scala
@@ -1,17 +1,17 @@
 package cz.idealiste.idealvoting.server
 
 import cats.data.Validated
-import cats.implicits.*
+import cats.implicits._
 import cats.{Applicative, ApplicativeError}
 import cz.idealiste.idealvoting.server
-import cz.idealiste.idealvoting.server.Db.*
-import cz.idealiste.idealvoting.server.Voting.*
-import doobie.*
-import doobie.implicits.*
-import doobie.implicits.javatimedrivernative.*
+import cz.idealiste.idealvoting.server.Db._
+import cz.idealiste.idealvoting.server.Voting._
+import doobie._
+import doobie.implicits._
+import doobie.implicits.javatimedrivernative._
 import emil.MailAddress
-import emil.doobie.EmilDoobieMeta.*
-import zio.*
+import emil.doobie.EmilDoobieMeta._
+import zio._
 import zio.interop.catz.asyncInstance
 
 import java.time.OffsetDateTime

diff --git a/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/HandlerLive.scala b/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/HandlerLive.scala
@@ -1,21 +1,21 @@
 package cz.idealiste.idealvoting.server
 
-import cats.implicits.*
+import cats.implicits._
 import cz.idealiste.idealvoting.contract
 import cz.idealiste.idealvoting.contract.definitions.LinksResponse.Links
-import cz.idealiste.idealvoting.server.HandlerLive.*
-import cz.idealiste.idealvoting.server.Voting.*
+import cz.idealiste.idealvoting.server.HandlerLive._
+import cz.idealiste.idealvoting.server.Voting._
 import emil.MailAddress
-import emil.javamail.syntax.*
+import emil.javamail.syntax._
 import io.circe.generic.semiauto.{deriveDecoder, deriveEncoder}
 import io.circe.{Decoder, Encoder}
-import io.scalaland.chimney.cats.*
-import io.scalaland.chimney.dsl.*
+import io.scalaland.chimney.cats._
+import io.scalaland.chimney.dsl._
 import io.scalaland.chimney.{PartialTransformer, Transformer}
-import org.http4s.*
-import org.http4s.circe.CirceEntityCodec.*
+import org.http4s._
+import org.http4s.circe.CirceEntityCodec._
 import org.http4s.dsl.Http4sDsl
-import zio.*
+import zio._
 import zio.interop.catz.asyncInstance
 
 import java.time.OffsetDateTime

diff --git a/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/HttpAppLive.scala b/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/HttpAppLive.scala
@@ -3,8 +3,7 @@ package cz.idealiste.idealvoting.server
 import cz.idealiste.idealvoting.contract
 import org.http4s
 import org.http4s.server.Router
-import zio.interop.catz.*
-import zio.interop.catz.implicits.*
+import zio.interop.catz._
 import zio.{Task, ZLayer}
 
 final case class HttpAppLive(handler: Handler) extends HttpApp {

diff --git a/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/HttpServer.scala b/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/HttpServer.scala
@@ -1,7 +1,7 @@
 package cz.idealiste.idealvoting.server
 
 import org.http4s.server.Server
-import zio.*
+import zio._
 
 trait HttpServer {
   def server: RIO[Scope, Server]

diff --git a/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/HttpServerBlaze.scala b/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/HttpServerBlaze.scala
@@ -4,15 +4,13 @@ import cz.idealiste.idealvoting.server
 import cz.idealiste.idealvoting.server.HttpServerBlaze.Config
 import org.http4s.blaze.server.BlazeServerBuilder
 import org.http4s.server.Server
-import zio.*
-import zio.config.*
-import zio.config.magnolia.Descriptor
-import zio.interop.catz.*
+import zio._
+import zio.config.magnolia._
+import zio.interop.catz._
 
 final case class HttpServerBlaze(config: Config, httpApp: HttpApp) extends HttpServer {
 
   lazy val server: RIO[Scope, Server] = ZIO.executorWith { executor =>
-    import zio.interop.catz.implicits.*
     BlazeServerBuilder[Task]
       .withExecutionContext(executor.asExecutionContext)
       .bindHttp(config.port, config.host)
@@ -31,8 +29,8 @@ object HttpServerBlaze {
 
   object Config {
     private[server] val layer = ZLayer.fromZIO(ZIO.service[server.Config].map(_.httpServer))
-    implicit lazy val configDescriptor: ConfigDescriptor[Config] =
-      Descriptor.descriptor[Config]
+    implicit lazy val configDescriptor: DeriveConfig[Config] =
+      DeriveConfig.getDeriveConfig[Config]
   }
 
 }
diff --git a/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/Main.scala b/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/Main.scala
@@ -1,18 +1,18 @@
 package cz.idealiste.idealvoting.server
 
 import cz.idealiste.idealvoting.server.Config
-import org.http4s.server.*
-import zio.*
+import org.http4s.server._
+import zio._
 import zio.doobie.liquibase.ZIODoobieLiquibase
 import zio.logging.backend.SLF4J
 
 object Main extends ZIOAppDefault {
 
-  override def run: ZIO[ZIOAppArgs, Throwable, Nothing] =
+  override def run: ZIO[Any, Throwable, Nothing] =
     serverLayer.launch
 
   private[server] val serverLayer =
-    ZLayer.makeSome[ZIOAppArgs, Server](
+    ZLayer.make[Server](
       ZLayer.succeedEnvironment(DefaultServices.live),
       Runtime.removeDefaultLoggers,
       SLF4J.slf4j,

diff --git a/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/Voting.scala b/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/Voting.scala
@@ -1,8 +1,8 @@
 package cz.idealiste.idealvoting.server
 
 import cats.data.{NonEmptyList, NonEmptySet, ValidatedNec}
-import cats.implicits.*
-import cz.idealiste.idealvoting.server.Voting.*
+import cats.implicits._
+import cz.idealiste.idealvoting.server.Voting._
 import emil.MailAddress
 import zio.Task
 

diff --git a/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/VotingLive.scala b/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/VotingLive.scala
@@ -1,15 +1,14 @@
 package cz.idealiste.idealvoting.server
 
-import cats.implicits.*
+import cats.implicits._
 import cz.idealiste.idealvoting.server
 import cz.idealiste.idealvoting.server.Db.Election
-import cz.idealiste.idealvoting.server.Voting.*
+import cz.idealiste.idealvoting.server.Voting._
 import cz.idealiste.idealvoting.server.VotingLive.Config
 import org.apache.commons.lang3.StringUtils
-import zio.*
-import zio.config.*
-import zio.config.magnolia.Descriptor
-import zio.interop.catz.core.*
+import zio._
+import zio.config.magnolia._
+import zio.interop.catz.core._
 
 import java.time.OffsetDateTime
 
@@ -128,6 +127,6 @@ object VotingLive {
   final case class Config(tokenLength: Int = 10)
   object Config {
     private[server] val layer = ZLayer.fromZIO(ZIO.service[server.Config].map(_.voting))
-    implicit lazy val configDescriptor: ConfigDescriptor[Config] = Descriptor.descriptor[Config]
+    implicit lazy val configDescriptor: DeriveConfig[Config] = DeriveConfig.getDeriveConfig[Config]
   }
 }
diff --git a/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/VotingSystemDummy.scala b/ideal-voting-server/src/main/scala/cz/idealiste/idealvoting/server/VotingSystemDummy.scala
@@ -1,6 +1,6 @@
 package cz.idealiste.idealvoting.server
 
-import zio.*
+import zio._
 
 final case class VotingSystemDummy() extends VotingSystem {
   def computePositions(options: List[Int], votes: List[List[Int]]): List[Int] = options.reverse

diff --git a/ideal-voting-server/src/test/scala/cz/idealiste/idealvoting/server/MainSpec.scala b/ideal-voting-server/src/test/scala/cz/idealiste/idealvoting/server/MainSpec.scala
@@ -1,20 +1,20 @@
 package cz.idealiste.idealvoting.server
 
-import cats.implicits.*
+import cats.implicits._
 import com.dimafeng.testcontainers.DockerComposeContainer
 import cz.idealiste.idealvoting.server.Config
-import cz.idealiste.idealvoting.server.HandlerLive.*
+import cz.idealiste.idealvoting.server.HandlerLive._
 import emil.MailAddress
-import emil.javamail.syntax.*
-import org.http4s.circe.CirceEntityCodec.*
-import org.http4s.implicits.*
+import emil.javamail.syntax._
+import org.http4s.circe.CirceEntityCodec._
+import org.http4s.implicits._
 import org.http4s.{Method, Request, Status, Uri}
-import zio.*
-import zio.interop.catz.*
+import zio._
+import zio.interop.catz._
 import zio.logging.backend.SLF4J
-import zio.test.Assertion.*
-import zio.test.TestAspect.*
-import zio.test.*
+import zio.test.Assertion._
+import zio.test.TestAspect._
+import zio.test._
 
 object MainSpec extends ZIOSpecDefault {
 
@@ -203,7 +203,6 @@ object MainSpec extends ZIOSpecDefault {
     ZLayer.make[Config & DockerComposeContainer](
       Runtime.removeDefaultLoggers,
       SLF4J.slf4j,
-      ZIOAppArgs.empty,
       Config.layer,
       TestContainer.dockerCompose,
     ) >>> TestContainer.layer

diff --git a/ideal-voting-server/src/test/scala/cz/idealiste/idealvoting/server/TestContainer.scala b/ideal-voting-server/src/test/scala/cz/idealiste/idealvoting/server/TestContainer.scala
@@ -1,13 +1,13 @@
 package cz.idealiste.idealvoting.server
 
-import cats.implicits.*
-import com.dimafeng.testcontainers.DockerComposeContainer.*
+import cats.implicits._
+import com.dimafeng.testcontainers.DockerComposeContainer._
 import com.dimafeng.testcontainers.{DockerComposeContainer, ExposedService}
 import cz.idealiste.idealvoting.server.Config
-import monocle.syntax.all.*
+import monocle.syntax.all._
 import pprint.PPrinter.BlackWhite
-import zio.*
-import zio.testcontainers.*
+import zio._
+import zio.testcontainers._
 
 import java.io.File
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -7,21 +7,21 @@ object Dependencies {
     val chimney = "0.8.5"
     val circe = "0.14.6"
     val commonsLang = "3.14.0"
-    val emil = "0.16.1"
-    val http4s = "0.23.25"
+    val emil = "0.17.0"
+    val http4s = "0.23.26"
     val http4sBlaze = "0.23.16"
     val jackson = "2.17.0"
-    val liquibaseSlf4j = "4.1.0"
-    val logback = "1.4.7"
+    val liquibaseSlf4j = "5.0.0"
+    val logback = "1.5.6"
     val logbackJackson = "0.1.5"
     val logbackJson = "0.1.5"
     val mariadb = "3.3.3"
     val monocle = "3.2.0"
-    val pprint = "0.8.1"
+    val pprint = "0.9.0"
     val snakeyaml = "2.0"
     val zio = "2.0.22"
-    val zioDoobie = "0.5.3"
-    val zioLoggingSlf4j = "2.1.12"
+    val zioDoobie = "0.6.0"
+    val zioLoggingSlf4j = "2.2.3"
 
     // Test
     val testcontainers = "0.40.17"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,7 @@
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
-addSbtPlugin("com.github.sideeffffect" % "sbt-decent-scala" % "1.0.0-6-e3022e4e")
+addSbtPlugin("com.github.sideeffffect" % "sbt-decent-scala" % "1.0.27-1-d4333dfd")
 addSbtPlugin("dev.guardrail" % "sbt-guardrail" % "1.0.0-M1")
 libraryDependencies ++= List(
-  "org.snakeyaml" % "snakeyaml-engine" % "2.4",
+  "org.snakeyaml" % "snakeyaml-engine" % "2.7",
   "dev.guardrail" %% "guardrail-scala-http4s" % "1.0.0-M1",
 )