Skip to content

Commit faea80c

Browse files
committed
Bump compiler interface version
1 parent 79cd769 commit faea80c

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

project/Build.scala

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -734,10 +734,10 @@ object Build {
734734
description := "sbt compiler bridge for Dotty",
735735
resolvers += Resolver.typesafeIvyRepo("releases"), // For org.scala-sbt:api
736736
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)
741741
),
742742
// The sources should be published with crossPaths := false since they
743743
// need to be compiled by the project using the bridge.
@@ -866,11 +866,11 @@ object Build {
866866
lazy val `sbt-dotty` = project.in(file("sbt-dotty")).
867867
settings(commonSettings).
868868
settings(
869-
scalaVersion := "2.12.2",
869+
scalaVersion := scalacVersion,
870870
// Keep in sync with inject-sbt-dotty.sbt
871871
libraryDependencies ++= Seq(
872872
Dependencies.`jackson-databind`,
873-
"org.scala-sbt" % "compiler-interface" % "1.0.2"
873+
Dependencies.`compiler-interface`
874874
),
875875
unmanagedSourceDirectories in Compile +=
876876
baseDirectory.value / "../language-server/src/dotty/tools/languageserver/config",
@@ -881,6 +881,7 @@ object Build {
881881
scriptedLaunchOpts += "-Dplugin.scalaVersion=" + dottyVersion,
882882
// By default scripted tests use $HOME/.ivy2 for the ivy cache. We need to override this value for the CI.
883883
scriptedLaunchOpts ++= ivyPaths.value.ivyHome.map("-Dsbt.ivy.home=" + _.getAbsolutePath).toList,
884+
scriptedBufferLog := false,
884885
scripted := scripted.dependsOn(Def.task {
885886
val x0 = (publishLocal in `dotty-sbt-bridge-bootstrapped`).value
886887
val x1 = (publishLocal in `dotty-interfaces`).value

project/Dependencies.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ object Dependencies {
99
"com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion
1010
val `jackson-dataformat-yaml` =
1111
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % jacksonVersion
12+
13+
private val sbtVersion = "1.0.5"
14+
val `compiler-interface` = "org.scala-sbt" % "compiler-interface" % sbtVersion
15+
val `zinc-apiinfo` = "org.scala-sbt" %% "zinc-apiinfo" % sbtVersion
1216
}

project/inject-sbt-dotty.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ unmanagedSourceDirectories in Compile += baseDirectory.value / "../sbt-dotty/src
77
// Keep in sync with `sbt-dotty` config in Build.scala
88
libraryDependencies ++= Seq(
99
Dependencies.`jackson-databind`,
10-
"org.scala-sbt" % "compiler-interface" % "1.0.0-X16"
10+
Dependencies.`compiler-interface`
1111
)
1212
unmanagedSourceDirectories in Compile +=
1313
baseDirectory.value / "../language-server/src/dotty/tools/languageserver/config"

0 commit comments

Comments
 (0)