From aae88a3665c699a17d94627cd911df13245528df Mon Sep 17 00:00:00 2001
From: Chua Chee Seng <cheeseng@amaseng.com>
Date: Fri, 14 May 2021 20:46:26 +0800
Subject: [PATCH] Reverted back to use sbt 1.4.9 and sbt-dotty, as sbt 1.5
 requires MIMA 0.9.1, but MIMA 0.9.1 has problem with overloaded functions in
 Configuration under org.scalatest.prop package.

---
 project/BuildCommons.scala | 4 ++--
 project/DottyBuild.scala   | 3 ++-
 project/build.properties   | 2 +-
 project/plugins.sbt        | 2 ++
 project/scalatest.scala    | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/project/BuildCommons.scala b/project/BuildCommons.scala
index 55e788199f..70af916133 100644
--- a/project/BuildCommons.scala
+++ b/project/BuildCommons.scala
@@ -20,8 +20,8 @@ trait BuildCommons {
 
   val previousReleaseVersion = "3.2.8"
 
-  val plusJUnitVersion = "3.2.8.0"
-  val plusTestNGVersion = "3.2.8.0"
+  val plusJUnitVersion = "3.2.9.0"
+  val plusTestNGVersion = "3.2.9.0"
   val flexmarkVersion = "0.36.8"
 
   def rootProject: Project
diff --git a/project/DottyBuild.scala b/project/DottyBuild.scala
index 45d44f3383..5e5b552133 100644
--- a/project/DottyBuild.scala
+++ b/project/DottyBuild.scala
@@ -1,3 +1,4 @@
+import dotty.tools.sbtplugin.DottyPlugin.autoImport._
 import sbt._
 import Keys._
 import com.typesafe.tools.mima.plugin.MimaKeys.{mimaPreviousArtifacts, mimaCurrentClassfiles, mimaBinaryIssueFilters}
@@ -233,7 +234,7 @@ trait DottyBuild { this: BuildCommons =>
                                        |import org.scalactic._
                                        |import Matchers._""".stripMargin,
       libraryDependencies += "org.scala-lang.modules" %%% "scala-xml" % "2.0.0", 
-      libraryDependencies += ("org.scala-js" %% "scalajs-test-interface" % scalaJSVersion).cross(CrossVersion.for3Use2_13), 
+      libraryDependencies += ("org.scala-js" %% "scalajs-test-interface" % scalaJSVersion).withDottyCompat(dottyVersion), 
       packageManagedSources,
       sourceGenerators in Compile += Def.task {
         GenModulesDotty.genScalaTestCoreJS((sourceManaged in Compile).value, version.value, scalaVersion.value) ++
diff --git a/project/build.properties b/project/build.properties
index 41aaafea7b..f17a59c5dc 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.2
\ No newline at end of file
+sbt.version=1.4.9
\ No newline at end of file
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 3b7e0d11e0..6bc372f96a 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -17,3 +17,5 @@ val scalaNativeVersion = Option(System.getenv("SCALANATIVE_VERSION")).getOrElse(
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)
 
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.7.0")
+
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.5")
\ No newline at end of file
diff --git a/project/scalatest.scala b/project/scalatest.scala
index 65d7c679ac..6cf629a0d1 100644
--- a/project/scalatest.scala
+++ b/project/scalatest.scala
@@ -164,7 +164,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
 
       case Some((3, _)) =>
         Seq(
-          "org.scala-lang.modules" %%% "scala-parser-combinators" % "1.2.0-RC2"
+          "org.scala-lang.modules" %%% "scala-parser-combinators" % "2.0.0"
         )  
 
       case Some((2, scalaMajor)) if scalaMajor >= 11 =>