@@ -734,10 +734,10 @@ object Build {
734
734
description := " sbt compiler bridge for Dotty" ,
735
735
resolvers += Resolver .typesafeIvyRepo(" releases" ), // For org.scala-sbt:api
736
736
libraryDependencies ++= Seq (
737
- " org.scala-sbt " % " compiler-interface" % " 1.0.2 " ,
738
- (" org.scala-sbt " %% " zinc-apiinfo" % " 1.0.2 " % " test " ).withDottyCompat(scalaVersion.value),
739
- (" org.specs2" %% " specs2-core" % " 3.9.1" % " test " ).withDottyCompat(scalaVersion.value),
740
- (" org.specs2" %% " specs2-junit" % " 3.9.1" % " test " ).withDottyCompat(scalaVersion.value)
737
+ Dependencies .` compiler-interface` ,
738
+ (Dependencies .` zinc-apiinfo` % Test ).withDottyCompat(scalaVersion.value),
739
+ (" org.specs2" %% " specs2-core" % " 3.9.1" % Test ).withDottyCompat(scalaVersion.value),
740
+ (" org.specs2" %% " specs2-junit" % " 3.9.1" % Test ).withDottyCompat(scalaVersion.value)
741
741
),
742
742
// The sources should be published with crossPaths := false since they
743
743
// need to be compiled by the project using the bridge.
@@ -866,11 +866,11 @@ object Build {
866
866
lazy val `sbt-dotty` = project.in(file(" sbt-dotty" )).
867
867
settings(commonSettings).
868
868
settings(
869
- scalaVersion := " 2.12.2 " ,
869
+ scalaVersion := scalacVersion ,
870
870
// Keep in sync with inject-sbt-dotty.sbt
871
871
libraryDependencies ++= Seq (
872
872
Dependencies .`jackson-databind`,
873
- " org.scala-sbt " % " compiler-interface" % " 1.0.2 "
873
+ Dependencies .` compiler-interface`
874
874
),
875
875
unmanagedSourceDirectories in Compile +=
876
876
baseDirectory.value / " ../language-server/src/dotty/tools/languageserver/config" ,
@@ -881,6 +881,7 @@ object Build {
881
881
scriptedLaunchOpts += " -Dplugin.scalaVersion=" + dottyVersion,
882
882
// By default scripted tests use $HOME/.ivy2 for the ivy cache. We need to override this value for the CI.
883
883
scriptedLaunchOpts ++= ivyPaths.value.ivyHome.map(" -Dsbt.ivy.home=" + _.getAbsolutePath).toList,
884
+ scriptedBufferLog := false ,
884
885
scripted := scripted.dependsOn(Def .task {
885
886
val x0 = (publishLocal in `dotty-sbt-bridge-bootstrapped`).value
886
887
val x1 = (publishLocal in `dotty-interfaces`).value
0 commit comments