Skip to content

Commit 0bed0bd

Browse files
committed
Make the sbt scripted tests use the bootstrapped dotty
Also move them to their own project `dotty-sbt-scripted-tests`, because they need to be in a Scala 2.10 project to work correctly, since sbt uses 2.10. The scripted tests can now be run with: > dotty-sbt-scripted-tests/scripted A few of them are broken right now, I'll fix them later (we don't run them on the CI yet).
1 parent 2b7c7f2 commit 0bed0bd

File tree

582 files changed

+1133
-1377
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

582 files changed

+1133
-1377
lines changed

build.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ val `dotty-library` = Build.`dotty-library`
1111
val `dotty-library-bootstrapped` = Build.`dotty-library-bootstrapped`
1212
val `dotty-sbt-bridge` = Build.`dotty-sbt-bridge`
1313
val `dotty-sbt-bridge-bootstrapped` = Build.`dotty-sbt-bridge-bootstrapped`
14+
val `dotty-sbt-scripted-tests` = Build.`dotty-sbt-scripted-tests`
1415
val sjsSandbox = Build.sjsSandbox
1516
val `dotty-bench` = Build.`dotty-bench`
1617
val `scala-library` = Build.`scala-library`

project/Build.scala

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -659,17 +659,35 @@ object Build {
659659
lazy val `dotty-sbt-bridge` = project.in(file("sbt-bridge")).
660660
dependsOn(`dotty-compiler`).
661661
settings(commonNonBootstrappedSettings).
662+
settings(dottySbtBridgeSettings)
663+
664+
lazy val `dotty-sbt-bridge-bootstrapped` = project.in(file("sbt-bridge")).
665+
dependsOn(`dotty-compiler-bootstrapped`).
666+
settings(commonBootstrappedSettings).
662667
settings(dottySbtBridgeSettings).
668+
settings(
669+
moduleName := "dotty-sbt-bridge",
670+
// Disabled because dotty crashes when compiling the tests
671+
sources in Test := Seq()
672+
)
673+
674+
lazy val `dotty-sbt-scripted-tests` = project.in(file("sbt-scripted-tests")).
675+
settings(
676+
publishArtifact := false
677+
).
663678
settings(ScriptedPlugin.scriptedSettings: _*).
664679
settings(
665680
ScriptedPlugin.sbtTestDirectory := baseDirectory.value / "sbt-test",
666681
ScriptedPlugin.scriptedLaunchOpts := Seq("-Xmx1024m"),
667682
ScriptedPlugin.scriptedBufferLog := false,
668683
ScriptedPlugin.scripted := {
684+
val x0 = (publishLocal in `dotty-sbt-bridge-bootstrapped`).value
669685
val x1 = (publishLocal in `dotty-interfaces`).value
670-
val x2 = (publishLocal in `dotty-compiler`).value
671-
val x3 = (publishLocal in `dotty-library`).value
672-
val x4 = (publishLocal in dotty).value // Needed because sbt currently hardcodes the dotty artifact
686+
val x2 = (publishLocal in `dotty-compiler-bootstrapped`).value
687+
val x3 = (publishLocal in `dotty-library-bootstrapped`).value
688+
val x4 = (publishLocal in `scala-library`).value
689+
val x5 = (publishLocal in `scala-reflect`).value
690+
val x6 = (publishLocal in `dotty-bootstrapped`).value // Needed because sbt currently hardcodes the dotty artifact
673691
ScriptedPlugin.scriptedTask.evaluated
674692
}
675693
// TODO: Use this instead of manually copying DottyInjectedPlugin.scala
@@ -688,27 +706,14 @@ object DottyInjectedPlugin extends AutoPlugin {
688706
scalaVersion := "0.1.1-bin-SNAPSHOT",
689707
scalaOrganization := "ch.epfl.lamp",
690708
scalacOptions += "-language:Scala2",
691-
scalaBinaryVersion := "2.11",
692-
autoScalaLibrary := false,
693-
libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5")
709+
scalaBinaryVersion := "0.1"
694710
)
695711
}
696712
""")
697713
}
698714
*/
699715
)
700716

701-
lazy val `dotty-sbt-bridge-bootstrapped` = project.in(file("sbt-bridge")).
702-
dependsOn(`dotty-compiler-bootstrapped`).
703-
settings(commonBootstrappedSettings).
704-
settings(dottySbtBridgeSettings).
705-
settings(
706-
moduleName := "dotty-sbt-bridge",
707-
// Disabled because dotty crashes when compiling the tests
708-
sources in Test := Seq()
709-
)
710-
711-
712717
/** A sandbox to play with the Scala.js back-end of dotty.
713718
*
714719
* This sandbox is compiled with dotty with support for Scala.js. It can be

sbt-bridge/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

sbt-bridge/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

sbt-bridge/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

sbt-bridge/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

sbt-bridge/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.
Binary file not shown.

sbt-bridge/sbt-test/source-dependencies/canon/lib/a.jar

Lines changed: 0 additions & 1 deletion
This file was deleted.

sbt-bridge/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

sbt-bridge/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

sbt-bridge/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

sbt-bridge/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

sbt-bridge/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

sbt-bridge/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

sbt-bridge/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

sbt-bridge/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

sbt-bridge/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

sbt-bridge/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)