luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove sbt-dotty

This commit is contained in:
xuwei-k 2022-07-08 14:45:43 +09:00
parent dd9a6ff90e
commit 87bd79e538
10 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbt-app/src/sbt-test/plugins/dotty-compiler-plugin/build.sbt
View File

@ -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"
)
)

6
sbt-app/src/sbt-test/plugins/dotty-compiler-plugin/changes/build.sbt
View File

@ -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

1
sbt-app/src/sbt-test/plugins/dotty-compiler-plugin/project/plugins.sbt
View File

@ -1 +0,0 @@
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6")

6
sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/build.sbt
View File

@ -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,
)

3
sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/project/plugins.sbt
View File

@ -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")

4
sbt-app/src/sbt-test/plugins/dotty-sandwich/build.sbt
View File

@ -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)

1
sbt-app/src/sbt-test/plugins/dotty-sandwich/project/plugins.sbt
View File

@ -1 +0,0 @@
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6")

2
sbt-app/src/sbt-test/plugins/dotty/build.sbt
View File

@ -1 +1 @@
ThisBuild / scalaVersion := "3.0.0-M1"
ThisBuild / scalaVersion := "3.1.3"

3
sbt-app/src/sbt-test/plugins/dotty/project/build.properties
View File

@ -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

1
sbt-app/src/sbt-test/plugins/dotty/project/plugins.sbt
View File

@ -1 +0,0 @@
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6")