diff --git a/sbt/src/sbt-test/plugins/dotty-compiler-plugin/build.sbt b/sbt/src/sbt-test/plugins/dotty-compiler-plugin/build.sbt index 4d6fc4fd4..8aabedac8 100644 --- a/sbt/src/sbt-test/plugins/dotty-compiler-plugin/build.sbt +++ b/sbt/src/sbt-test/plugins/dotty-compiler-plugin/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "0.27.0-RC1" +ThisBuild / scalaVersion := "3.0.0-M1" lazy val plugin = project .in(file("plugin")) diff --git a/sbt/src/sbt-test/plugins/dotty-compiler-plugin/changes/build.sbt b/sbt/src/sbt-test/plugins/dotty-compiler-plugin/changes/build.sbt index 50c9cf724..584adf234 100644 --- a/sbt/src/sbt-test/plugins/dotty-compiler-plugin/changes/build.sbt +++ b/sbt/src/sbt-test/plugins/dotty-compiler-plugin/changes/build.sbt @@ -1,4 +1,4 @@ -lazy val dottyVersion = "0.27.0-RC1" +lazy val dottyVersion = "3.0.0-M1" lazy val plugin = project .in(file("plugin")) diff --git a/sbt/src/sbt-test/plugins/dotty-compiler-plugin/project/plugins.sbt b/sbt/src/sbt-test/plugins/dotty-compiler-plugin/project/plugins.sbt index 59d5793ef..83a3da10f 100644 --- a/sbt/src/sbt-test/plugins/dotty-compiler-plugin/project/plugins.sbt +++ b/sbt/src/sbt-test/plugins/dotty-compiler-plugin/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.3") +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6") diff --git a/sbt/src/sbt-test/plugins/dotty-sandwich-sjs/build.sbt b/sbt/src/sbt-test/plugins/dotty-sandwich-sjs/build.sbt index 06804de99..9e2883f48 100644 --- a/sbt/src/sbt-test/plugins/dotty-sandwich-sjs/build.sbt +++ b/sbt/src/sbt-test/plugins/dotty-sandwich-sjs/build.sbt @@ -1,17 +1,15 @@ -// TODO use 2.13.4 when it's out -ThisBuild / scalaVersion := "2.13.4-bin-d526da6" - -Global / resolvers += "scala-integration".at("https://scala-ci.typesafe.com/artifactory/scala-integration/") +ThisBuild / scalaVersion := "2.13.4" +ThisBuild / scalacOptions += "-Ytasty-reader" lazy val scala3code = project .enablePlugins(ScalaJSPlugin) - .settings(scalaVersion := "0.27.0-RC1") + .settings(scalaVersion := "3.0.0-M1") lazy val app = project .enablePlugins(ScalaJSPlugin) .dependsOn(scala3code) .settings( libraryDependencies ~= (_.filterNot(_.name.contains("scalajs-compiler"))), - addCompilerPlugin("org.scala-js" % "scalajs-compiler_2.13.3" % scalaJSVersion), + addCompilerPlugin("org.scala-js" % "scalajs-compiler_2.13.4" % scalaJSVersion), scalaJSUseMainModuleInitializer := true, ) diff --git a/sbt/src/sbt-test/plugins/dotty-sandwich-sjs/project/plugins.sbt b/sbt/src/sbt-test/plugins/dotty-sandwich-sjs/project/plugins.sbt index 289edbdba..f0dfae12d 100644 --- a/sbt/src/sbt-test/plugins/dotty-sandwich-sjs/project/plugins.sbt +++ b/sbt/src/sbt-test/plugins/dotty-sandwich-sjs/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.3") +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0") diff --git a/sbt/src/sbt-test/plugins/dotty-sandwich/build.sbt b/sbt/src/sbt-test/plugins/dotty-sandwich/build.sbt index 0669df9fc..d6b4a9a34 100644 --- a/sbt/src/sbt-test/plugins/dotty-sandwich/build.sbt +++ b/sbt/src/sbt-test/plugins/dotty-sandwich/build.sbt @@ -1,8 +1,7 @@ -ThisBuild / scalaVersion := "0.27.0-RC1" +ThisBuild / scalaVersion := "3.0.0-M1" +ThisBuild / scalacOptions += "-Ytasty-reader" -ThisBuild / resolvers += "scala-integration" at "https://scala-ci.typesafe.com/artifactory/scala-integration/" -// TODO use 2.13.4 when it's out -lazy val scala213 = "2.13.4-bin-d526da6" +lazy val scala213 = "2.13.4" lazy val root = (project in file(".")) .aggregate(fooApp, fooCore, barApp, barCore) diff --git a/sbt/src/sbt-test/plugins/dotty-sandwich/project/plugins.sbt b/sbt/src/sbt-test/plugins/dotty-sandwich/project/plugins.sbt index 59d5793ef..83a3da10f 100644 --- a/sbt/src/sbt-test/plugins/dotty-sandwich/project/plugins.sbt +++ b/sbt/src/sbt-test/plugins/dotty-sandwich/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.3") +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6") diff --git a/sbt/src/sbt-test/plugins/dotty/build.sbt b/sbt/src/sbt-test/plugins/dotty/build.sbt index ea167c1f8..e80bfb07c 100644 --- a/sbt/src/sbt-test/plugins/dotty/build.sbt +++ b/sbt/src/sbt-test/plugins/dotty/build.sbt @@ -1 +1 @@ -ThisBuild / scalaVersion := "0.27.0-RC1" +ThisBuild / scalaVersion := "3.0.0-M1" diff --git a/sbt/src/sbt-test/plugins/dotty/project/plugins.sbt b/sbt/src/sbt-test/plugins/dotty/project/plugins.sbt index 59d5793ef..83a3da10f 100644 --- a/sbt/src/sbt-test/plugins/dotty/project/plugins.sbt +++ b/sbt/src/sbt-test/plugins/dotty/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.3") +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6")