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

Merge pull request #6121 from xuwei-k/dotty-update 

Update dotty and scala versions in tests
This commit is contained in:
eugene yokota 2020-11-19 14:53:48 -05:00 committed by GitHub
parent 711a590bc4 6344de924a
commit 87d0972b03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "0.27.0-RC1" ThisBuild / scalaVersion := "3.0.0-M1"
lazy val plugin = project lazy val plugin = project
.in(file("plugin")) .in(file("plugin"))

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

@ -1,4 +1,4 @@
lazy val dottyVersion = "0.27.0-RC1" lazy val dottyVersion = "3.0.0-M1"
lazy val plugin = project lazy val plugin = project
.in(file("plugin")) .in(file("plugin"))

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

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

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

@ -1,17 +1,15 @@
// TODO use 2.13.4 when it's out ThisBuild / scalaVersion := "2.13.4"
ThisBuild / scalaVersion := "2.13.4-bin-d526da6" ThisBuild / scalacOptions += "-Ytasty-reader"
Global / resolvers += "scala-integration".at("https://scala-ci.typesafe.com/artifactory/scala-integration/")
lazy val scala3code = project lazy val scala3code = project
.enablePlugins(ScalaJSPlugin) .enablePlugins(ScalaJSPlugin)
.settings(scalaVersion := "0.27.0-RC1") .settings(scalaVersion := "3.0.0-M1")
lazy val app = project lazy val app = project
.enablePlugins(ScalaJSPlugin) .enablePlugins(ScalaJSPlugin)
.dependsOn(scala3code) .dependsOn(scala3code)
.settings( .settings(
libraryDependencies ~= (_.filterNot(_.name.contains("scalajs-compiler"))), 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, scalaJSUseMainModuleInitializer := true,
) )

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

@ -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") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0")

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

@ -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/" lazy val scala213 = "2.13.4"
// TODO use 2.13.4 when it's out
lazy val scala213 = "2.13.4-bin-d526da6"
lazy val root = (project in file(".")) lazy val root = (project in file("."))
.aggregate(fooApp, fooCore, barApp, barCore) .aggregate(fooApp, fooCore, barApp, barCore)

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

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

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

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

2
sbt/src/sbt-test/plugins/dotty/project/plugins.sbt
View File

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