Skip to content

Commit

Permalink
fix: formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
GrigoriiBerezin committed May 29, 2024
1 parent d81a59d commit 200e949
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
- ++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
Expand Down
5 changes: 1 addition & 4 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
9 changes: 4 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ 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`,
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions zio-quickstart-restful-webservice/build.sbt
Original file line number Diff line number Diff line change
@@ -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")

0 comments on commit 200e949

Please sign in to comment.