Skip to content

Commit 84cf02c

Browse files
committed
Upgrade to sbt 0.13.14-RC2
Also replace com.typesafe.sbt:sbt-interface by the equivalent org.scala-sbt:interface since the former is not published in 0.13.14 for some reason (sbt/sbt#3012).
1 parent 5fd7a95 commit 84cf02c

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

project/Build.scala

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,11 @@ object DottyBuild extends Build {
281281
libraryDependencies ++= partestDeps.value,
282282
libraryDependencies ++= Seq("org.scala-lang.modules" %% "scala-xml" % "1.0.1",
283283
"org.scala-lang.modules" %% "scala-partest" % "1.0.11" % "test",
284-
"com.novocode" % "junit-interface" % "0.11" % "test",
285-
"com.typesafe.sbt" % "sbt-interface" % sbtVersion.value),
284+
"com.novocode" % "junit-interface" % "0.11" % "test"),
285+
286+
resolvers += Resolver.typesafeIvyRepo("releases"), // For org.scala-sbt:interface
287+
libraryDependencies += "org.scala-sbt" % "interface" % sbtVersion.value,
288+
286289
// enable improved incremental compilation algorithm
287290
incOptions := incOptions.value.withNameHashing(true),
288291

@@ -428,7 +431,7 @@ object DottyBuild extends Build {
428431
// FIXME: should go away when xml literal parsing is removed
429432
path.contains("scala-xml") ||
430433
// needed for the xsbti interface
431-
path.contains("sbt-interface")
434+
path.contains("org.scala-sbt/interface/")
432435
} yield "-Xbootclasspath/p:" + path
433436

434437
val ci_build = // propagate if this is a ci build
@@ -552,9 +555,9 @@ object DottyBuild extends Build {
552555
},
553556
publishLocal := (publishLocal.dependsOn(cleanSbtBridge)).value,
554557
description := "sbt compiler bridge for Dotty",
555-
resolvers += Resolver.typesafeIvyRepo("releases"),
558+
resolvers += Resolver.typesafeIvyRepo("releases"), // For org.scala-sbt stuff
556559
libraryDependencies ++= Seq(
557-
"com.typesafe.sbt" % "sbt-interface" % sbtVersion.value,
560+
"org.scala-sbt" % "interface" % sbtVersion.value,
558561
"org.scala-sbt" % "api" % sbtVersion.value % "test",
559562
"org.specs2" %% "specs2" % "2.3.11" % "test"
560563
),

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.11
1+
sbt.version=0.13.14-RC2

0 commit comments

Comments
 (0)