Skip to content

Commit de53e52

Browse files
authored
Merge pull request #2343 from dotty-staging/fix/sbt-interface-repo
Build.sbt: switch back to Maven-published sbt-interface
2 parents 0fea788 + 5a7ad68 commit de53e52

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

project/Build.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,7 @@ object Build {
419419
com.typesafe.sbteclipse.plugin.EclipsePlugin.EclipseKeys.withSource := true,
420420

421421
// get libraries onboard
422-
resolvers += Resolver.typesafeIvyRepo("releases"), // For org.scala-sbt:interface
423-
libraryDependencies ++= Seq("org.scala-sbt" % "interface" % sbtVersion.value,
422+
libraryDependencies ++= Seq("com.typesafe.sbt" % "sbt-interface" % sbtVersion.value,
424423
"org.scala-lang.modules" % "scala-xml_2.11" % "1.0.1",
425424
"com.novocode" % "junit-interface" % "0.11" % "test",
426425
"org.scala-lang" % "scala-reflect" % scalacVersion,
@@ -557,7 +556,7 @@ object Build {
557556
// used for tests that compile dotty
558557
path.contains("scala-asm") ||
559558
// needed for the xsbti interface
560-
path.contains("org.scala-sbt/interface/")
559+
path.contains("sbt-interface")
561560
} yield "-Xbootclasspath/p:" + path
562561

563562
val ci_build = // propagate if this is a ci build
@@ -672,9 +671,9 @@ object Build {
672671
},
673672
packageSrc in Compile := (packageSrc in Compile).dependsOn(cleanSbtBridge).value,
674673
description := "sbt compiler bridge for Dotty",
675-
resolvers += Resolver.typesafeIvyRepo("releases"), // For org.scala-sbt stuff
674+
resolvers += Resolver.typesafeIvyRepo("releases"), // For org.scala-sbt:api
676675
libraryDependencies ++= Seq(
677-
"org.scala-sbt" % "interface" % sbtVersion.value,
676+
"com.typesafe.sbt" % "sbt-interface" % sbtVersion.value,
678677
"org.scala-sbt" % "api" % sbtVersion.value % "test",
679678
"org.specs2" % "specs2_2.11" % "2.3.11" % "test"
680679
),

0 commit comments

Comments
 (0)