From a3677d249e9c2587f7c31d6373d6b5296e2c0dff Mon Sep 17 00:00:00 2001
From: changzhiwin <changzhiwin@gmail.com>
Date: Wed, 16 Nov 2022 15:02:25 +0800
Subject: [PATCH 1/2] clean sbt deprecated warnning

---
 .gitignore                |  2 ++
 build.sbt                 | 19 +++++++++++--------
 project/BuildHelper.scala |  4 ++--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 33d7e99f..dcfc40c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -461,6 +461,8 @@ project/plugins/project/
 project/secret
 project/metals.sbt
 
+.vscode/
+
 # mdoc
 website/node_modules
 website/build
diff --git a/build.sbt b/build.sbt
index 03e1d1cd..35e16d39 100644
--- a/build.sbt
+++ b/build.sbt
@@ -41,7 +41,7 @@ val doobieVersion         = "0.13.4"
 lazy val root =
   project
     .in(file("."))
-    .settings(skip in publish := true)
+    .settings(publish / skip := true)
     .aggregate(zioActors, zioActorsPersistence, zioActorsPersistenceJDBC, examples, zioActorsAkkaInterop)
 
 lazy val zioActors = module("zio-actors", "actors")
@@ -88,7 +88,7 @@ lazy val zioActorsPersistenceJDBC = module("zio-actors-persistence-jdbc", "persi
 
 lazy val examples = module("zio-actors-examples", "examples")
   .settings(
-    skip in publish := true,
+    publish / skip := true,
     fork := true,
     libraryDependencies ++= Seq(
       "dev.zio" %% "zio-test"     % zioVersion % "test",
@@ -121,18 +121,21 @@ def module(moduleName: String, fileName: String): Project =
 lazy val docs = project
   .in(file("zio-actors-docs"))
   .settings(
-    skip.in(publish) := true,
+    publish / skip := true,
     moduleName := "zio-actors-docs",
     scalacOptions -= "-Yno-imports",
     scalacOptions -= "-Xfatal-warnings",
     libraryDependencies ++= Seq(
       "dev.zio" %% "zio" % zioVersion
     ),
-    unidocProjectFilter in (ScalaUnidoc, unidoc) := inProjects(root),
-    target in (ScalaUnidoc, unidoc) := (baseDirectory in LocalRootProject).value / "website" / "static" / "api",
-    cleanFiles += (target in (ScalaUnidoc, unidoc)).value,
-    docusaurusCreateSite := docusaurusCreateSite.dependsOn(unidoc in Compile).value,
-    docusaurusPublishGhpages := docusaurusPublishGhpages.dependsOn(unidoc in Compile).value
+    ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(root),
+    //unidocProjectFilter in (ScalaUnidoc, unidoc) := inProjects(root),
+    ScalaUnidoc / unidoc / target := (LocalRootProject / baseDirectory).value / "website" / "static" / "api",
+    //target in (ScalaUnidoc, unidoc) := ( in LocalRootProject).value / "website" / "static" / "api",
+    cleanFiles += (ScalaUnidoc / unidoc / target).value,
+    //cleanFiles += (target in (ScalaUnidoc, unidoc)).value,
+    docusaurusCreateSite := docusaurusCreateSite.dependsOn(Compile / unidoc).value,
+    docusaurusPublishGhpages := docusaurusPublishGhpages.dependsOn(Compile / unidoc).value
   )
   .dependsOn(zioActors, zioActorsPersistence, zioActorsAkkaInterop)
   .enablePlugins(MdocPlugin, DocusaurusPlugin, ScalaUnidocPlugin)
diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala
index 4052d5aa..1a1a370f 100644
--- a/project/BuildHelper.scala
+++ b/project/BuildHelper.scala
@@ -73,8 +73,8 @@ object BuildHelper {
   def stdSettings(prjName: String) =
     Seq(
       name := s"$prjName",
-      crossScalaVersions := Seq(Scala212, Scala213),
-      scalaVersion in ThisBuild := Scala213,
+      ThisBuild / crossScalaVersions := Seq(Scala212, Scala213),
+      ThisBuild / scalaVersion := Scala213,
       scalacOptions := stdOptions ++ extraOptions(scalaVersion.value),
       libraryDependencies ++=
         Seq(

From 9e670052aafbb93bc4316a448643a877391e6e35 Mon Sep 17 00:00:00 2001
From: changzhiwin <changzhiwin@gmail.com>
Date: Wed, 16 Nov 2022 15:06:03 +0800
Subject: [PATCH 2/2] Upgrade to ZIO 2.0.3

---
 build.sbt                | 2 +-
 project/build.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sbt b/build.sbt
index 35e16d39..ccfc0725 100644
--- a/build.sbt
+++ b/build.sbt
@@ -31,7 +31,7 @@ inThisBuild(
 addCommandAlias("fmt", "all scalafmtSbt scalafmt test:scalafmt")
 addCommandAlias("check", "all scalafmtSbtCheck scalafmtCheck test:scalafmtCheck")
 
-val zioVersion            = "2.0.2"
+val zioVersion            = "2.0.3"
 val zioNioVersion         = "2.0.0"
 val zioConfigVersion      = "3.0.2"
 val zioInteropCatsVersion = "22.0.0.0"
diff --git a/project/build.properties b/project/build.properties
index 8378cad5..d738b858 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.5.7
+sbt.version = 1.7.1