From 716c7fb67b099021e03e7174ba9f3dfa39461e36 Mon Sep 17 00:00:00 2001
From: svroonland <svroonland@users.noreply.github.com>
Date: Sat, 22 May 2021 10:59:05 +0200
Subject: [PATCH] Build and test for scala 3 (#137)

* Build and test for scala 3

* Tweak

* Different

* Bump zio version

* Add scala3 to mergify

* Bump collection compat

* Remove dotty plugin
---
 .circleci/config.yml |  4 ++--
 .mergify.yml         |  1 +
 build.sbt            | 10 +++++-----
 project/plugins.sbt  |  1 -
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c6acb7d3..44b034a8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -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:
diff --git a/.mergify.yml b/.mergify.yml
index b3c5fdbb..0ba9fd73 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -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
diff --git a/build.sbt b/build.sbt
index 7e3dd9a7..e7fe222c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -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
@@ -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")
   )
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 8580600b..3d2dfc07 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -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")