Downgrade scala-js back to 1.8.0, let's only upgrade scala-js in 3.3.0.

scalatest · Apr 19, 2024 · cc3fb85 · cc3fb85
1 parent 30a407c
commit cc3fb85
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/project/BuildCommons.scala b/project/BuildCommons.scala
@@ -14,7 +14,7 @@ trait BuildCommons {
 
   val runFlickerTests = Option(System.getenv("SCALATEST_RUN_FLICKER_TESTS")).getOrElse("FALSE").toUpperCase == "TRUE"
 
-  val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.16.0")
+  val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.8.0")
   def scalatestJSLibraryDependencies =
     Seq(
       "org.scala-js" %% "scalajs-test-interface" % scalaJSVersion

diff --git a/project/DottyBuild.scala b/project/DottyBuild.scala
@@ -289,7 +289,7 @@ trait DottyBuild { this: BuildCommons =>
       initialCommands in console := """|import org.scalatest._
                                        |import org.scalactic._
                                        |import Matchers._""".stripMargin,
-      libraryDependencies += "org.scala-lang.modules" %%% "scala-xml" % "2.3.0",
+      libraryDependencies += "org.scala-lang.modules" %%% "scala-xml" % "2.1.0",
       libraryDependencies += ("org.scala-js" %% "scalajs-test-interface" % scalaJSVersion).withDottyCompat(dottyVersion), 
       packageManagedSources,
       sourceGenerators in Compile += Def.task {

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,7 +4,7 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
 
-val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.16.0")
+val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.8.0")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 

diff --git a/project/scalatest.scala b/project/scalatest.scala
@@ -133,7 +133,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
       case Some((2, 10)) => Seq.empty
       case Some((2, 11)) => Seq(("org.scala-lang.modules" %% "scala-xml" % "1.3.0"))
       case Some((scalaEpoch, scalaMajor)) if (scalaEpoch == 2 && scalaMajor >= 12) || scalaEpoch == 3 =>
-        Seq(("org.scala-lang.modules" %% "scala-xml" % "2.3.0"))
+        Seq(("org.scala-lang.modules" %% "scala-xml" % "2.1.0"))
     }
 
   def scalaLibraries(theScalaVersion: String) =
@@ -156,10 +156,15 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
       case Some((2, scalaMajor)) if scalaMajor == 10 =>
         Seq.empty
 
-      case _ => // for scala 2.11, 2.12, 2.13 and 3.x
+      case Some((3, _)) => // for scala 3.x
         Seq(
           "org.scala-lang.modules" %%% "scala-parser-combinators" % "2.4.0"
         )
+
+      case _ => // for scala 2.11, 2.12, 2.13
+        Seq(
+          "org.scala-lang.modules" %%% "scala-parser-combinators" % "2.1.1"
+        )
     }
   }