Update And modernize

Author: dacr

.scalafix.conf

@@ -0,0 +1,12 @@
+rules = [
+  DisableSyntax,
+  RedundantSyntax,
+  //ExplicitResultTypes  // not yet compatible with Scala3
+]
+DisableSyntax.noVars = true
+DisableSyntax.noThrows = true
+DisableSyntax.noNulls = true
+DisableSyntax.noReturns = true
+DisableSyntax.noWhileLoops = true
+DisableSyntax.noAsInstanceOf = true
+DisableSyntax.noIsInstanceOf = true

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.7.2
+version = 3.7.3
 runner.dialect = scala3
 align.preset = most
 maxColumn = 250

build.sbt

@@ -1,29 +1,29 @@
 name        := "zwords"
 description := "Guess a word everyday game"
+scalaVersion := "3.2.2"
 
 val versions = new {
-  val zio        = "2.0.10"
+  val zio        = "2.0.13"
   val zionio     = "2.0.1"
   val zioconfig  = "3.0.7"
   val ziocli     = "0.2.2"
-  val ziojson    = "0.4.2"
-  val ziologging = "2.1.10"
-  val ziolmdb    = "1.0.5"
-  val tapir      = "1.2.10"
-  val logback    = "1.4.5"
+  val ziojson    = "0.5.0"
+  val ziologging = "2.1.12"
+  val ziolmdb    = "1.0.6"
+  val tapir      = "1.2.13"
+  val logback    = "1.4.7"
 }
 
 val sharedSettings = Seq(
   scalaVersion := "3.2.2",
   Test / fork  := true,
   testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"),
   scalacOptions ++= Seq("-deprecation"), // "-Xfatal-warnings",
-  excludeDependencies += "org.scala-lang.modules" % "scala-collection-compat_2.13",
+  //excludeDependencies += "org.scala-lang.modules" % "scala-collection-compat_2.13",
   libraryDependencies ++= Seq(
     "dev.zio" %% "zio"            % versions.zio,
     "dev.zio" %% "zio-test"       % versions.zio % Test,
-    "dev.zio" %% "zio-test-sbt"   % versions.zio % Test,
-    "dev.zio" %% "zio-test-junit" % versions.zio % Test
+    "dev.zio" %% "zio-test-sbt"   % versions.zio % Test
   )
 )
 

dictionary/src/test/scala/fr/janalyse/zwords/dictionary/HunspellEnglishSpec.scala

@@ -15,14 +15,12 @@
  */
 package fr.janalyse.zwords.dictionary
 
-import org.junit.runner.RunWith
 import zio.*
 import zio.test.*
 import zio.test.Assertion.*
 import zio.test.TestAspect.*
 
-@RunWith(classOf[zio.test.junit.ZTestJUnitRunner])
-class HunspellEnglishSpec extends ZIOSpecDefault {
+object HunspellEnglishSpec extends ZIOSpecDefault {
   val lang = "en"
   override def spec = {
     suite("dictionary")(

dictionary/src/test/scala/fr/janalyse/zwords/dictionary/HunspellFrenchSpec.scala

@@ -15,14 +15,12 @@
  */
 package fr.janalyse.zwords.dictionary
 
-import org.junit.runner.RunWith
 import zio.*
 import zio.test.*
 import zio.test.Assertion.*
 import zio.test.TestAspect.*
 
-@RunWith(classOf[zio.test.junit.ZTestJUnitRunner])
-class HunspellFrenchSpec extends ZIOSpecDefault {
+object HunspellFrenchSpec extends ZIOSpecDefault {
   val lang = "fr"
   override def spec = {
     suite("dictionary")(

gamelogic/src/test/scala/fr/janalyse/zwords/gamelogic/GameSolverSpec.scala

@@ -17,15 +17,13 @@ package fr.janalyse.zwords.gamelogic
 
 import fr.janalyse.zwords.dictionary.DictionaryService
 import fr.janalyse.zwords.wordgen.WordGeneratorService
-import org.junit.runner.RunWith
 import zio.*
 import zio.json.*
 import zio.test.*
 import zio.test.Assertion.*
 import zio.test.TestAspect.*
 
-@RunWith(classOf[zio.test.junit.ZTestJUnitRunner])
-class GameSolverSpec extends ZIOSpecDefault {
+object GameSolverSpec extends ZIOSpecDefault {
 
   override def spec = {
     suite("Game solver spec")(

gamelogic/src/test/scala/fr/janalyse/zwords/gamelogic/GameSpec.scala

@@ -17,15 +17,13 @@ package fr.janalyse.zwords.gamelogic
 
 import fr.janalyse.zwords.dictionary.{DictionaryConfig, DictionaryService}
 import fr.janalyse.zwords.wordgen.WordGeneratorService
-import org.junit.runner.RunWith
 import zio.*
 import zio.json.*
 import zio.test.*
 import zio.test.Assertion.*
 import zio.test.TestAspect.*
 
-@RunWith(classOf[zio.test.junit.ZTestJUnitRunner])
-class GameSpec extends ZIOSpecDefault {
+object GameSpec extends ZIOSpecDefault {
   val lang = "fr"
   override def spec = {
     suite("game logic spec")(

project/plugins.sbt

@@ -1,2 +1,3 @@
-addSbtPlugin("com.github.sbt"   % "sbt-native-packager" % "1.9.16")
 addSbtPlugin("com.timushev.sbt" % "sbt-updates"         % "0.6.3")
+addSbtPlugin("com.github.sbt"   % "sbt-native-packager" % "1.9.16")
+addSbtPlugin("ch.epfl.scala"    % "sbt-scalafix"        % "0.10.4")

webapi/src/main/scala/fr/janalyse/zwords/webapi/WebApiApp.scala

@@ -28,8 +28,8 @@ import sttp.tapir.server.ziohttp.ZioHttpInterpreter
 import sttp.tapir.swagger.bundle.SwaggerInterpreter
 import sttp.tapir.ztapir.{oneOfVariant, *}
 import zio.*
-import zio.lmdb.{LMDB,LMDBConfig}
-import zio.http.*
+import zio.lmdb.{LMDB, LMDBConfig}
+import zio.http.{Server}
 import zio.json.*
 import zio.json.ast.*
 import zio.logging.{LogFormat, removeDefaultLoggers}
@@ -49,10 +49,7 @@ object WebApiApp extends ZIOAppDefault {
 
   // -------------------------------------------------------------------------------------------------------------------
 
-  lazy val loggingLayer = removeDefaultLoggers >>> SLF4J.slf4j(
-    LogLevel.Debug,
-    format = LogFormat.colored
-  )
+  lazy val loggingLayer = removeDefaultLoggers >>> SLF4J.slf4j(format = LogFormat.colored)
 
   override val bootstrap = loggingLayer
 
@@ -250,7 +247,6 @@ object WebApiApp extends ZIOAppDefault {
         Info(title = "ZWORDS Game API", version = "2.0", description = Some("A wordle like game as an API by @BriossantC and @crodav"))
       )
 
-
   def server = for {
     clientResources             <- System.env("ZWORDS_CLIENT_RESOURCES_PATH").some
     clientSideResourcesEndPoints = filesGetServerEndpoint(emptyInput)(clientResources).widen[GameEnv]
@@ -261,13 +257,13 @@ object WebApiApp extends ZIOAppDefault {
     zservice                    <- Server.serve(httpApp.withDefaultErrorResponse)
   } yield zservice
 
-  val listeningAddress = System
+  val listeningPort = System
     .envOrElse("ZWORDS_LISTENING_PORT", "8090")
     .mapAttempt(port => port.toInt)
     .mapError(th => Exception("ZWORDS_LISTENING_PORT : provided value is not a number"))
     .filterOrFail(port => port > 0 && port < 30000)(Exception("ZWORDS_LISTENING_PORT : Invalid port number provided"))
-    .mapAttempt(port => InetSocketAddress("127.0.0.1", port))
-    .mapError(th => Exception("Can't build listening address configuration"))
+  // .mapAttempt(port => InetSocketAddress("127.0.0.1", port))
+  // .mapError(th => Exception("Can't build listening address configuration"))
 
   val lmdbConfigLayer = ZLayer.scoped(
     for {
@@ -277,8 +273,8 @@ object WebApiApp extends ZIOAppDefault {
       lmdbConfig    = LMDBConfig(directoryPath.toFile)
     } yield lmdbConfig
   )
-  
-  val serverConfigLayer = ZLayer.fromZIO(listeningAddress.map(address => ServerConfig(address = address)))
+
+  val serverConfigLayer = ZLayer.fromZIO(listeningPort.map(port => Server.Config.default.port(port)))
 
   override def run =
     server

webapi/src/test/scala/fr/janalyse/zwords/webapi/ApiLogicsSpec.scala

@@ -12,25 +12,23 @@ import zio.test.TestAspect.*
 
 import java.util.UUID
 import java.util.concurrent.TimeUnit
-import org.junit.runner.RunWith
 import ApiLogics.*
 import fr.janalyse.zwords.dictionary.DictionaryService
 import fr.janalyse.zwords.dictionary.DictionaryConfig
 import fr.janalyse.zwords.webapi.protocol.GivenWord
 import fr.janalyse.zwords.webapi.store.PersistenceService
 import fr.janalyse.zwords.wordgen.WordGeneratorService
 
-@RunWith(classOf[zio.test.junit.ZTestJUnitRunner])
-class ApiLogicsSpec extends ZIOSpecDefault {
+object ApiLogicsSpec extends ZIOSpecDefault {
 
   def playerSuite = suite("player logics")(
     test("player CRUD")(
       for {
-        player         <- playerGetLogic(None, None, None)
-        playerId        = player.playerId
-        gottenPlayer   <- playerGetLogic(Some(playerId), None, None)
+        player          <- playerGetLogic(None, None, None)
+        playerId         = player.playerId
+        gottenPlayer    <- playerGetLogic(Some(playerId), None, None)
         pseudo           = "the-gamer"
-        updatedPlayer  <- playerUpdateLogic(gottenPlayer.copy(pseudo = Some(pseudo)), None, None)
+        updatedPlayer   <- playerUpdateLogic(gottenPlayer.copy(pseudo = Some(pseudo)), None, None)
         _               <- playerDeleteLogic(playerId, None, None)
         gottenHasFailed <- playerGetLogic(Some(playerId), None, None).isFailure
       } yield assertTrue(
@@ -40,7 +38,7 @@ class ApiLogicsSpec extends ZIOSpecDefault {
     ),
     test("invalid pseudo updates")(
       for {
-        player       <- playerGetLogic(None, None, None)
+        player        <- playerGetLogic(None, None, None)
         invalidPseudos = List("", "a", "@@@@", "x" * 43, "     ", " truc ")
         results       <- ZIO.foreach(invalidPseudos) { invalidPseudo =>
                            playerUpdateLogic(player.copy(pseudo = Some(invalidPseudo)), None, None).isFailure
@@ -57,11 +55,12 @@ class ApiLogicsSpec extends ZIOSpecDefault {
       for {
         languages <- gameLanguagesLogic
         language   = "en-common"
-        player   <- playerGetLogic(None, None, None)
+        _         <- TestClock.setTime(java.time.Instant.ofEpochMilli(0)) // Remember used randomness is using day based seed
+        player    <- playerGetLogic(None, None, None)
         round0    <- gameGetLogic(language, player.playerId)
-        round1    <- gamePlayLogic(language, player.playerId, GivenWord("noses"))
-        round2    <- gamePlayLogic(language, player.playerId, GivenWord("never"))
-        round3    <- gamePlayLogic(language, player.playerId, GivenWord("nymph"))
+        round1    <- gamePlayLogic(language, player.playerId, GivenWord("certain"))
+        round2    <- gamePlayLogic(language, player.playerId, GivenWord("central"))
+        round3    <- gamePlayLogic(language, player.playerId, GivenWord("command"))
       } yield assertTrue(
         languages.keys.contains(language),
         round0.state == "playing",