Skip to content

Commit a749162

Browse files
committed
Do not add the compiler on the dotty-staging classpath
1 parent ecfea9d commit a749162

File tree

4 files changed

+19
-1
lines changed

4 files changed

+19
-1
lines changed

project/Build.scala

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,11 @@ object Build {
761761

762762
lazy val `dotty-staging` = project.in(file("staging")).
763763
withCommonSettings(Bootstrapped).
764-
dependsOn(dottyCompiler(Bootstrapped)).
764+
// We want the compiler to be present in the compiler classpath when compiling this project but not
765+
// when compiling a project that depends on dotty-staging (see ...), but we always need it to be present
766+
// on the JVM classpath at runtime.
767+
dependsOn(dottyCompiler(Bootstrapped) % "provided").
768+
dependsOn(dottyCompiler(Bootstrapped) % "compile->runtime").
765769
dependsOn(dottyCompiler(Bootstrapped) % "test->test").
766770
settings(commonBootstrappedSettings).
767771
settings(commonDottyJarClasspathSettings).

sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/build.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@ scalaVersion := sys.props("plugin.scalaVersion")
22

33
libraryDependencies ++= Seq(
44
"ch.epfl.lamp" %% "dotty-staging" % scalaVersion.value,
5+
// "ch.epfl.lamp" %% "dotty-compiler" % scalaVersion.value % "runtime",
6+
// "ch.epfl.lamp" %% "dotty-compiler" % scalaVersion.value % "test->runtime",
57
"com.novocode" % "junit-interface" % "0.11" % "test"
68
)
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package hello
2+
3+
4+
object Main {
5+
6+
def main(args: Array[String]): Unit = {
7+
dotty.tools.dotc.Main.main(Array.empty)
8+
}
9+
10+
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
> run
22
> test
3+
$ copy-file src/changes/Hello.scala src/main/scala/hello/Hello.scala
4+
-> compile

0 commit comments

Comments
 (0)