Skip to content

Build.sbt: switch back to Maven-published sbt-interface #2343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 1, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -419,8 +419,7 @@ object Build {
com.typesafe.sbteclipse.plugin.EclipsePlugin.EclipseKeys.withSource := true,

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

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