Skip to content
This repository has been archived by the owner on Jan 20, 2025. It is now read-only.

Upgrade ZIO & sbt #464

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,8 @@ project/plugins/project/
project/secret
project/metals.sbt

.vscode/

# mdoc
website/node_modules
website/build
Expand Down
21 changes: 12 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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")
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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)
4 changes: 2 additions & 2 deletions project/BuildHelper.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.5.7
sbt.version = 1.7.1