Remove sbt-dotty from sbt-dotty scripted

Author: adpi2

project/Build.scala

@@ -1198,6 +1198,10 @@ object Build {
       // ensure that sbt-dotty is built on sbt 1.4
       pluginCrossBuild / sbtVersion := "1.4.7",
 
+      // hack to run the scripted tests on sbt 1.5.0-bin-20210302T081602
+      // https://github.com/sbt/sbt/issues/6347
+      scriptedLaunchOpts ++= Seq("-Dsbt.version=1.5.0-bin-20210302T081602"),
+
       // The batch mode accidentally became the default with no way to disable
       // it in sbt 1.4 (https://github.com/sbt/sbt/issues/5913#issuecomment-716003195).
       // We enable it explicitly here to make it clear that we're using it.

sbt-dotty/sbt-test/compilerReporter/i7442/project/plugins.sbt

@@ -1,4 +1,4 @@
 scalaVersion := sys.props("plugin.scalaVersion")
 
 libraryDependencies +=
-("org.scala-lang.modules" %% "scala-xml" % "1.2.0").withDottyCompat(scalaVersion.value)
+("org.scala-lang.modules" %% "scala-xml" % "1.2.0").cross(CrossVersion.for3Use2_13)

sbt-dotty/sbt-test/compilerReporter/simple/project/plugins.sbt

@@ -1,7 +1 @@
 scalaVersion := sys.props("plugin.scalaVersion")
-
-lazy val assertUsingScaladoc = taskKey[Unit]("")
-
-assertUsingScaladoc := {
-  assert(useScaladoc.value)
-}

sbt-dotty/sbt-test/discovery/test-discovery/project/plugins.sbt

@@ -1,3 +1 @@
-> assertUsingScaladoc
 > doc
-

sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/project/plugins.sbt

@@ -4,5 +4,5 @@ libraryDependencies ++= {
   Seq(
     ("com.typesafe.akka" %% "akka-http"   % "10.1.10"),
     ("com.typesafe.akka" %% "akka-stream" % "2.6.0")
-  ).map(_.withDottyCompat(scalaVersion.value))
+  ).map(_.cross(CrossVersion.for3Use2_13))
 }

sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/project/plugins.sbt

@@ -1,4 +1,4 @@
 scalaVersion := sys.props("plugin.scalaVersion")
 
 libraryDependencies +=
-   ("org.atnos" %% "eff" % "5.5.2").withDottyCompat(scalaVersion.value)
+   ("org.atnos" %% "eff" % "5.5.2").cross(CrossVersion.for3Use2_13)

sbt-dotty/sbt-test/sbt-dotty/example-project/build.sbt

@@ -10,6 +10,6 @@ lazy val test = (project in file ("main"))
     scalaVersion := scala3Version,
     // https://github.com/sbt/sbt/issues/5369
     projectDependencies := {
-      projectDependencies.value.map(_.withDottyCompat(scalaVersion.value))
+      projectDependencies.value.map(_.cross(CrossVersion.for3Use2_13))
     }
   )

sbt-dotty/sbt-test/sbt-dotty/example-project/project/plugins.sbt

@@ -10,6 +10,6 @@ lazy val `i8847-test` = (project in file ("main"))
     scalaVersion := scala3Version,
     // https://github.com/sbt/sbt/issues/5369
     projectDependencies := {
-      projectDependencies.value.map(_.withDottyCompat(scalaVersion.value))
+      projectDependencies.value.map(_.cross(CrossVersion.for3Use2_13))
     }
   )

sbt-dotty/sbt-test/sbt-dotty/i7897/project/plugins.sbt

@@ -10,6 +10,6 @@ lazy val `i9916a-test` = (project in file ("main"))
     scalaVersion := scala3Version,
     // https://github.com/sbt/sbt/issues/5369
     projectDependencies := {
-      projectDependencies.value.map(_.withDottyCompat(scalaVersion.value))
+      projectDependencies.value.map(_.cross(CrossVersion.for3Use2_13))
     }
   )

sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/project/plugins.sbt

@@ -10,6 +10,6 @@ lazy val `i9916b-test` = (project in file ("main"))
     scalaVersion := scala3Version,
     // https://github.com/sbt/sbt/issues/5369
     projectDependencies := {
-      projectDependencies.value.map(_.withDottyCompat(scalaVersion.value))
+      projectDependencies.value.map(_.cross(CrossVersion.for3Use2_13))
     }
   )

sbt-dotty/sbt-test/sbt-dotty/scala2/project/plugins.sbt

@@ -3,6 +3,6 @@ enablePlugins(ScalaJSPlugin)
 scalaVersion := sys.props("plugin.scalaVersion")
 
 // Test withDottyCompat for %%% dependencies
-libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").withDottyCompat(scalaVersion.value)
+libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").cross(CrossVersion.for3Use2_13)
 
 scalaJSUseMainModuleInitializer := true

sbt-dotty/sbt-test/sbt-dotty/scaladoc-empty-test/project/plugins.sbt

@@ -1,2 +1 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % sys.props("plugin.scalaJSVersion"))