Skip to content

Commit

Permalink
Build and test for scala 3 (#137)
Browse files Browse the repository at this point in the history
* Build and test for scala 3

* Tweak

* Different

* Bump zio version

* Add scala3 to mergify

* Bump collection compat

* Remove dotty plugin
  • Loading branch information
svroonland authored May 22, 2021
1 parent 9364323 commit 716c7fb
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ jobs:
- "~/.m2"
test_dotty_jdk11:
docker:
- image: hseeberger/scala-sbt:11.0.10_1.4.7_2.13.6
- image: hseeberger/scala-sbt:11.0.10_1.5.2_3.0.0
steps:
- checkout
- restore_cache:
key: sbt-cache
- run: sbt ++3.0.0-RC1! rezilienceJVM/test
- run: sbt ++3.0.0! rezilienceJVM/test
- save_cache:
key: sbt-cache
paths:
Expand Down
1 change: 1 addition & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ pull_request_rules:
- "status-success=ci/circleci: test213_jdk8"
- "status-success=ci/circleci: test212_jdk11"
- "status-success=ci/circleci: test212_jdk8"
- "status-success=ci/circleci: test_dotty_jdk11"
actions:
merge:
method: squash
Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.scalafmt.sbt.ScalafmtPlugin.autoImport.scalafmtOnCompile
val mainScala = "2.13.6"
val allScala = Seq("2.12.12", mainScala)
val dottyVersion = "3.0.0-RC1"
val dottyVersion = "3.0.0"

lazy val commonJvmSettings = Seq(
crossScalaVersions := allScala :+ dottyVersion
Expand Down Expand Up @@ -56,10 +56,10 @@ lazy val rezilience = crossProject(JSPlatform, JVMPlatform)
fork in run := true,
scalafmtOnCompile := true,
libraryDependencies ++= Seq(
"dev.zio" %%% "zio-streams" % "1.0.5",
"dev.zio" %%% "zio-test" % "1.0.5" % "test",
"dev.zio" %%% "zio-test-sbt" % "1.0.5" % "test",
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.4.3"
"dev.zio" %%% "zio-streams" % "1.0.8",
"dev.zio" %%% "zio-test" % "1.0.8" % "test",
"dev.zio" %%% "zio-test-sbt" % "1.0.8" % "test",
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.4.4"
),
testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework")
)
Expand Down
1 change: 0 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
addSbtPlugin("io.shiftleft" % "sbt-ci-release-early" % "2.0.16")
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.3.4")
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.5")

addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
Expand Down

0 comments on commit 716c7fb

Please sign in to comment.