Skip to content

Commit 833e029

Browse files
committed
sbt-dotty tests: use unpublished version of dotty
1 parent c58fe5c commit 833e029

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

project/Build.scala

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,17 @@ object DottyInjectedPlugin extends AutoPlugin {
861861
ScriptedPlugin.scriptedSettings,
862862
ScriptedPlugin.sbtTestDirectory := baseDirectory.value / "sbt-test",
863863
ScriptedPlugin.scriptedBufferLog := false,
864-
ScriptedPlugin.scriptedLaunchOpts += "-Dplugin.version=" + version.value
864+
ScriptedPlugin.scriptedLaunchOpts += "-Dplugin.version=" + version.value,
865+
ScriptedPlugin.scriptedLaunchOpts += "-Dplugin.scalaVersion=" + dottyVersion,
866+
ScriptedPlugin.scripted := ScriptedPlugin.scripted.dependsOn(Def.task {
867+
val x0 = (publishLocal in `dotty-sbt-bridge-bootstrapped`).value
868+
val x1 = (publishLocal in `dotty-interfaces`).value
869+
val x2 = (publishLocal in `dotty-compiler-bootstrapped`).value
870+
val x3 = (publishLocal in `dotty-library-bootstrapped`).value
871+
val x4 = (publishLocal in `scala-library`).value
872+
val x5 = (publishLocal in `scala-reflect`).value
873+
val x6 = (publishLocal in `dotty-bootstrapped`).value // Needed because sbt currently hardcodes the dotty artifact
874+
}).evaluated
865875
)
866876

867877
lazy val publishSettings = Seq(
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
scalaVersion := dottyLatestNightlyBuild.get
1+
scalaVersion := sys.props("plugin.scalaVersion")
22

33
libraryDependencies += ("org.scala-lang.modules" %% "scala-xml" % "1.0.1").withDottyCompat()

0 commit comments

Comments
 (0)