Skip to content

Commit

Permalink
Merge branch 'master' into fs2-3
Browse files Browse the repository at this point in the history
  • Loading branch information
vigoo authored May 22, 2021
2 parents 2077bea + 1141d0a commit 3a1126b
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 13 deletions.
22 changes: 11 additions & 11 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ val commonSettings = Seq(
organization := "io.github.vigoo",
scalaVersion := scala213,
crossScalaVersions := List(scala212, scala213),
addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.12.0" cross CrossVersion.full),
addCompilerPlugin("org.typelevel" %% s"kind-projector" % "0.13.0" cross CrossVersion.full),
scalacOptions += "-target:jvm-1.8",

libraryDependencies ++= Seq(
Expand Down Expand Up @@ -73,10 +73,10 @@ lazy val proxFS2 = Project("prox-fs2", file("prox-fs2")).settings(commonSettings
"co.fs2" %% "fs2-core" % "2.5.6",
"co.fs2" %% "fs2-io" % "2.5.6",

"dev.zio" %% "zio" % "1.0.7" % "test",
"dev.zio" %% "zio-test" % "1.0.7" % "test",
"dev.zio" %% "zio-test-sbt" % "1.0.7" % "test",
"dev.zio" %% "zio-interop-cats" % "2.4.1.0" % "test",
"dev.zio" %% "zio" % "1.0.8" % "test",
"dev.zio" %% "zio-test" % "1.0.8" % "test",
"dev.zio" %% "zio-test-sbt" % "1.0.8" % "test",
"dev.zio" %% "zio-interop-cats" % "2.5.1.0" % "test",
),
testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"),
).dependsOn(proxCore)
Expand All @@ -96,12 +96,12 @@ lazy val proxFS23 = Project("prox-fs2-3", file("prox-fs2-3")).settings(commonSet

lazy val proxZStream = Project("prox-zstream", file("prox-zstream")).settings(commonSettings).settings(
libraryDependencies ++= Seq(
"dev.zio" %% "zio" % "1.0.7",
"dev.zio" %% "zio-streams" % "1.0.7",
"dev.zio" %% "zio-prelude" % "1.0.0-RC4",
"dev.zio" %% "zio" % "1.0.8",
"dev.zio" %% "zio-streams" % "1.0.8",
"dev.zio" %% "zio-prelude" % "1.0.0-RC5",

"dev.zio" %% "zio-test" % "1.0.7" % "test",
"dev.zio" %% "zio-test-sbt" % "1.0.7" % "test",
"dev.zio" %% "zio-test" % "1.0.8" % "test",
"dev.zio" %% "zio-test-sbt" % "1.0.8" % "test",
),
testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"),
).dependsOn(proxCore)
Expand All @@ -112,7 +112,7 @@ lazy val proxJava9 = Project("prox-java9", file("prox-java9")).settings(commonSe
lazy val docs = project
.enablePlugins(GhpagesPlugin, SiteScaladocPlugin, ScalaUnidocPlugin, MicrositesPlugin)
.settings(
addCompilerPlugin("org.typelevel" %% s"kind-projector" % "0.12.0" cross CrossVersion.full),
addCompilerPlugin("org.typelevel" %% s"kind-projector" % "0.13.0" cross CrossVersion.full),
publishArtifact := false,
skip in publish := true,
scalaVersion := scala213,
Expand Down
3 changes: 3 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
coverage:
precision: 0
round: down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.3.4")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.20")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.21")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")

0 comments on commit 3a1126b

Please sign in to comment.