mirror of
https://github.com/sbt/sbt.git
synced 2026-09-01 10:37:54 +02:00
remove sbt-dotty
This commit is contained in:
@@ -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"
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
@@ -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 +0,0 @@
|
||||
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6")
|
||||
@@ -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,
|
||||
)
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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 +0,0 @@
|
||||
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6")
|
||||
@@ -1 +1 @@
|
||||
ThisBuild / scalaVersion := "3.0.0-M1"
|
||||
ThisBuild / scalaVersion := "3.1.3"
|
||||
|
||||
@@ -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 +0,0 @@
|
||||
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6")
|
||||
Reference in New Issue
Block a user