From 87bd79e538fc9e3510331d94f296f8c2fbf44593 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Fri, 8 Jul 2022 14:45:43 +0900 Subject: [PATCH] remove sbt-dotty --- .../src/sbt-test/plugins/dotty-compiler-plugin/build.sbt | 4 ++-- .../plugins/dotty-compiler-plugin/changes/build.sbt | 6 +----- .../plugins/dotty-compiler-plugin/project/plugins.sbt | 1 - sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/build.sbt | 6 +++--- .../sbt-test/plugins/dotty-sandwich-sjs/project/plugins.sbt | 3 +-- sbt-app/src/sbt-test/plugins/dotty-sandwich/build.sbt | 4 ++-- .../src/sbt-test/plugins/dotty-sandwich/project/plugins.sbt | 1 - sbt-app/src/sbt-test/plugins/dotty/build.sbt | 2 +- sbt-app/src/sbt-test/plugins/dotty/project/build.properties | 3 --- sbt-app/src/sbt-test/plugins/dotty/project/plugins.sbt | 1 - 10 files changed, 10 insertions(+), 21 deletions(-) delete mode 100644 sbt-app/src/sbt-test/plugins/dotty-compiler-plugin/project/plugins.sbt delete mode 100644 sbt-app/src/sbt-test/plugins/dotty-sandwich/project/plugins.sbt delete mode 100644 sbt-app/src/sbt-test/plugins/dotty/project/build.properties delete mode 100644 sbt-app/src/sbt-test/plugins/dotty/project/plugins.sbt diff --git a/sbt-app/src/sbt-test/plugins/dotty-compiler-plugin/build.sbt b/sbt-app/src/sbt-test/plugins/dotty-compiler-plugin/build.sbt index 8aabedac8..8da13c7ec 100644 --- a/sbt-app/src/sbt-test/plugins/dotty-compiler-plugin/build.sbt +++ b/sbt-app/src/sbt-test/plugins/dotty-compiler-plugin/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "3.0.0-M1" +ThisBuild / scalaVersion := "3.1.3" lazy val plugin = project .in(file("plugin")) @@ -12,7 +12,7 @@ lazy val plugin = project ), libraryDependencies ++= Seq( - "ch.epfl.lamp" %% "dotty-compiler" % scalaVersion.value % "provided" + "org.scala-lang" %% "scala3-compiler" % scalaVersion.value % "provided" ) ) diff --git a/sbt-app/src/sbt-test/plugins/dotty-compiler-plugin/changes/build.sbt b/sbt-app/src/sbt-test/plugins/dotty-compiler-plugin/changes/build.sbt index 584adf234..3c716e1bb 100644 --- a/sbt-app/src/sbt-test/plugins/dotty-compiler-plugin/changes/build.sbt +++ b/sbt-app/src/sbt-test/plugins/dotty-compiler-plugin/changes/build.sbt @@ -1,4 +1,4 @@ -lazy val dottyVersion = "3.0.0-M1" +lazy val dottyVersion = "3.1.3" lazy val plugin = project .in(file("plugin")) @@ -7,10 +7,6 @@ lazy val plugin = project version := "0.0.1", organization := "ch.epfl.lamp", scalaVersion := dottyVersion, - - libraryDependencies ++= Seq( - "ch.epfl.lamp" %% "dotty" % scalaVersion.value % "provided" - ) ) lazy val app = project diff --git a/sbt-app/src/sbt-test/plugins/dotty-compiler-plugin/project/plugins.sbt b/sbt-app/src/sbt-test/plugins/dotty-compiler-plugin/project/plugins.sbt deleted file mode 100644 index 83a3da10f..000000000 --- a/sbt-app/src/sbt-test/plugins/dotty-compiler-plugin/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6") diff --git a/sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/build.sbt b/sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/build.sbt index 9e2883f48..f28325922 100644 --- a/sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/build.sbt +++ b/sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/build.sbt @@ -1,15 +1,15 @@ -ThisBuild / scalaVersion := "2.13.4" +ThisBuild / scalaVersion := "2.13.8" ThisBuild / scalacOptions += "-Ytasty-reader" lazy val scala3code = project .enablePlugins(ScalaJSPlugin) - .settings(scalaVersion := "3.0.0-M1") + .settings(scalaVersion := "3.1.3") lazy val app = project .enablePlugins(ScalaJSPlugin) .dependsOn(scala3code) .settings( libraryDependencies ~= (_.filterNot(_.name.contains("scalajs-compiler"))), - addCompilerPlugin("org.scala-js" % "scalajs-compiler_2.13.4" % scalaJSVersion), + addCompilerPlugin("org.scala-js" % "scalajs-compiler_2.13.8" % scalaJSVersion), scalaJSUseMainModuleInitializer := true, ) diff --git a/sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/project/plugins.sbt b/sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/project/plugins.sbt index f0dfae12d..4c620dc0a 100644 --- a/sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/project/plugins.sbt +++ b/sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/project/plugins.sbt @@ -1,2 +1 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1") diff --git a/sbt-app/src/sbt-test/plugins/dotty-sandwich/build.sbt b/sbt-app/src/sbt-test/plugins/dotty-sandwich/build.sbt index d6b4a9a34..fe7f9dd1f 100644 --- a/sbt-app/src/sbt-test/plugins/dotty-sandwich/build.sbt +++ b/sbt-app/src/sbt-test/plugins/dotty-sandwich/build.sbt @@ -1,7 +1,7 @@ -ThisBuild / scalaVersion := "3.0.0-M1" +ThisBuild / scalaVersion := "3.1.3" ThisBuild / scalacOptions += "-Ytasty-reader" -lazy val scala213 = "2.13.4" +lazy val scala213 = "2.13.8" lazy val root = (project in file(".")) .aggregate(fooApp, fooCore, barApp, barCore) diff --git a/sbt-app/src/sbt-test/plugins/dotty-sandwich/project/plugins.sbt b/sbt-app/src/sbt-test/plugins/dotty-sandwich/project/plugins.sbt deleted file mode 100644 index 83a3da10f..000000000 --- a/sbt-app/src/sbt-test/plugins/dotty-sandwich/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6") diff --git a/sbt-app/src/sbt-test/plugins/dotty/build.sbt b/sbt-app/src/sbt-test/plugins/dotty/build.sbt index e80bfb07c..e46913668 100644 --- a/sbt-app/src/sbt-test/plugins/dotty/build.sbt +++ b/sbt-app/src/sbt-test/plugins/dotty/build.sbt @@ -1 +1 @@ -ThisBuild / scalaVersion := "3.0.0-M1" +ThisBuild / scalaVersion := "3.1.3" diff --git a/sbt-app/src/sbt-test/plugins/dotty/project/build.properties b/sbt-app/src/sbt-test/plugins/dotty/project/build.properties deleted file mode 100644 index 16dc090c5..000000000 --- a/sbt-app/src/sbt-test/plugins/dotty/project/build.properties +++ /dev/null @@ -1,3 +0,0 @@ -# sbt-coursier scripted tests: required, as we default to sbt 1.0.3, -# but sbt-dotty requires sbt >= 1.2.7 -sbt.version=1.2.7 diff --git a/sbt-app/src/sbt-test/plugins/dotty/project/plugins.sbt b/sbt-app/src/sbt-test/plugins/dotty/project/plugins.sbt deleted file mode 100644 index 83a3da10f..000000000 --- a/sbt-app/src/sbt-test/plugins/dotty/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6")