@@ -498,9 +498,9 @@ object Build {
498498 // get libraries onboard
499499 libraryDependencies ++= Seq (
500500 " org.scala-lang.modules" % " scala-asm" % " 6.0.0-scala-1" , // used by the backend
501- " com.typesafe.sbt" % " sbt-interface" % sbtVersion.value,
502501 (" org.scala-lang.modules" %% " scala-xml" % " 1.0.6" ).withDottyCompat(scalaVersion.value),
503- " org.scala-lang" % " scala-library" % scalacVersion % " test"
502+ " org.scala-lang" % " scala-library" % scalacVersion % " test" ,
503+ Dependencies .`compiler-interface`,
504504 ),
505505
506506 // For convenience, change the baseDirectory when running the compiler
@@ -699,7 +699,7 @@ object Build {
699699 packageAll := {
700700 (packageAll in `dotty-compiler`).value ++ Seq (
701701 (" dotty-compiler" -> (packageBin in Compile ).value.getAbsolutePath),
702- (" dotty-library" -> (packageBin in (dottyLibrary( Bootstrapped ) , Compile )).value.getAbsolutePath)
702+ (" dotty-library" -> (packageBin in (`dotty-library-bootstrapped` , Compile )).value.getAbsolutePath)
703703 )
704704 }
705705 )
@@ -750,10 +750,10 @@ object Build {
750750 description := " sbt compiler bridge for Dotty" ,
751751 resolvers += Resolver .typesafeIvyRepo(" releases" ), // For org.scala-sbt:api
752752 libraryDependencies ++= Seq (
753- " org.scala-sbt " % " compiler-interface" % " 1.0.2 " ,
754- (" org.scala-sbt " %% " zinc-apiinfo" % " 1.0.2 " % " test " ).withDottyCompat(scalaVersion.value),
755- (" org.specs2" %% " specs2-core" % " 3.9.1" % " test " ).withDottyCompat(scalaVersion.value),
756- (" org.specs2" %% " specs2-junit" % " 3.9.1" % " test " ).withDottyCompat(scalaVersion.value)
753+ Dependencies .` compiler-interface` ,
754+ (Dependencies .` zinc-apiinfo` % Test ).withDottyCompat(scalaVersion.value),
755+ (" org.specs2" %% " specs2-core" % " 3.9.1" % Test ).withDottyCompat(scalaVersion.value),
756+ (" org.specs2" %% " specs2-junit" % " 3.9.1" % Test ).withDottyCompat(scalaVersion.value)
757757 ),
758758 // The sources should be published with crossPaths := false since they
759759 // need to be compiled by the project using the bridge.
@@ -882,11 +882,10 @@ object Build {
882882 lazy val `sbt-dotty` = project.in(file(" sbt-dotty" )).
883883 settings(commonSettings).
884884 settings(
885- scalaVersion := " 2.12.2" ,
886885 // Keep in sync with inject-sbt-dotty.sbt
887886 libraryDependencies ++= Seq (
888887 Dependencies .`jackson-databind`,
889- " org.scala-sbt " % " compiler-interface" % " 1.0.2 "
888+ Dependencies .` compiler-interface`
890889 ),
891890 unmanagedSourceDirectories in Compile +=
892891 baseDirectory.value / " ../language-server/src/dotty/tools/languageserver/config" ,
@@ -897,6 +896,7 @@ object Build {
897896 scriptedLaunchOpts += " -Dplugin.scalaVersion=" + dottyVersion,
898897 // By default scripted tests use $HOME/.ivy2 for the ivy cache. We need to override this value for the CI.
899898 scriptedLaunchOpts ++= ivyPaths.value.ivyHome.map(" -Dsbt.ivy.home=" + _.getAbsolutePath).toList,
899+ scriptedBufferLog := false ,
900900 scripted := scripted.dependsOn(Def .task {
901901 val x0 = (publishLocal in `dotty-sbt-bridge-bootstrapped`).value
902902 val x1 = (publishLocal in `dotty-interfaces`).value
0 commit comments