From ff70b38aec67ec3be2f75156179f5099fb605971 Mon Sep 17 00:00:00 2001
From: Grigorii Berezin <grisha.berezin.1998@mail.ru>
Date: Wed, 29 May 2024 12:45:34 +0300
Subject: [PATCH] fix: formatting

---
 .github/workflows/ci.yml                    |  4 ++--
 .scalafmt.conf                              |  5 +----
 build.sbt                                   | 11 +++++------
 zio-quickstart-restful-webservice/build.sbt | 10 +++++-----
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 425eeec..3a48a64 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,12 +68,12 @@ jobs:
       fail-fast: false
       matrix:
         java:
-        - '8'
+        - '17'
         scala-project:
         - ++2.13.8 zio-quickstart-encode-decode-json
         - ++2.13.13 zio-quickstart-sql
         - ++2.13.13 zio-quickstart-prelude
-        - ++3.3.3 zio-quickstart-restful-webservice
+        - ++3.3.1 zio-quickstart-restful-webservice
     steps:
     - name: Install libuv
       run: sudo apt-get update && sudo apt-get install -y libuv1-dev
diff --git a/.scalafmt.conf b/.scalafmt.conf
index 4e5160e..a6c4b60 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -3,10 +3,7 @@ align.preset = "more"
 runner.dialect = scala213
 
 fileOverride {
-  "glob:**/zio-quickstart-restful-webservice/src/main/scala/**" {
-    runner.dialect = scala3
-  }
-  "glob:**/zio-quickstart-restful-webservice/test/main/scala/**" {
+  "glob:**/zio-quickstart-restful-webservice/src/**/scala/**" {
       runner.dialect = scala3
   }
 }
diff --git a/build.sbt b/build.sbt
index 586e415..7c02c9e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -8,14 +8,14 @@ inThisBuild(
     ciReleaseJobs              := Seq.empty,
     ciPostReleaseJobs          := Seq.empty,
     ciCheckWebsiteBuildProcess := Seq.empty,
-    scalaVersion               := "2.13.8",
+    scalaVersion               := scala213.value,
     ciTargetScalaVersions := makeTargetScalaMap(
       `zio-quickstart-encode-decode-json`,
       `zio-quickstart-sql`,
       `zio-quickstart-prelude`,
       `zio-quickstart-restful-webservice`
     ).value,
-    ciDefaultTargetJavaVersions := Seq("8"),
+    ciDefaultTargetJavaVersions := Seq("17"),
     semanticdbEnabled           := true,
     semanticdbVersion           := scalafixSemanticdb.revision
   )
@@ -45,10 +45,9 @@ lazy val root =
       testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework")
     )
 
-lazy val `zio-quickstart-hello-world`       = project
-lazy val `zio-quickstart-junit-integration` = project
-lazy val `zio-quickstart-restful-webservice` =
-  project.settings(scalaVersion := "3.3.3")
+lazy val `zio-quickstart-hello-world`                         = project
+lazy val `zio-quickstart-junit-integration`                   = project
+lazy val `zio-quickstart-restful-webservice`                  = project
 lazy val `zio-quickstart-restful-webservice-configurable-app` = project
 lazy val `zio-quickstart-restful-webservice-custom-logger`    = project
 lazy val `zio-quickstart-restful-webservice-dockerize`        = project
diff --git a/zio-quickstart-restful-webservice/build.sbt b/zio-quickstart-restful-webservice/build.sbt
index b55e053..caeb664 100644
--- a/zio-quickstart-restful-webservice/build.sbt
+++ b/zio-quickstart-restful-webservice/build.sbt
@@ -1,16 +1,16 @@
-scalaVersion := "3.3.3"
+scalaVersion := "3.3.1"
 Test / fork  := true
 
 libraryDependencies ++= Seq(
   "dev.zio"       %% "zio"              % "2.1.1",
   "dev.zio"       %% "zio-json"         % "0.6.2",
   "dev.zio"       %% "zio-http"         % "3.0.0-RC8",
-  "io.getquill"   %% "quill-zio"        % "4.8.5",
-  "io.getquill"   %% "quill-jdbc-zio"   % "4.8.4",
+  "io.getquill"   %% "quill-zio"        % "4.7.0",
+  "io.getquill"   %% "quill-jdbc-zio"   % "4.7.0",
   "com.h2database" % "h2"               % "2.2.224",
-  "dev.zio"       %% "zio-test"         % "2.1.0" % Test,
+  "dev.zio"       %% "zio-test"         % "2.1.0"     % Test,
   "dev.zio"       %% "zio-http-testkit" % "3.0.0-RC8" % Test,
-  "dev.zio"       %% "zio-test-sbt"     % "2.1.1" % Test
+  "dev.zio"       %% "zio-test-sbt"     % "2.1.1"     % Test
 )
 
 resolvers ++= Resolver.sonatypeOssRepos("snapshots")