luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Import correct resolver from librarymanagement #746

This commit is contained in:
Leonard Ehrenfried 2018-01-31 15:26:21 +01:00 committed by Alexandre Archambault
parent 954841eb93
commit 387078aa87
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sbt
View File

@ -237,9 +237,9 @@ lazy val `sbt-shared` = project
.settings(
plugin,
utest,
// addSbtPlugin("com.dwijnand" % "sbt-compat" % "1.2.0")
// addSbtPlugin("com.dwijnand" % "sbt-compat" % "1.2.0+2-f30b82f4")
libs ++= {
val dependency = "com.dwijnand" % "sbt-compat" % "1.2.0"
val dependency = "com.dwijnand" % "sbt-compat" % "1.2.0+2-f30b82f4"
val sbtV = (sbtBinaryVersion in pluginCrossBuild).value
val scalaV = (scalaBinaryVersion in update).value
val m = Defaults.sbtPluginExtra(dependency, sbtV, scalaV)

3
sbt-shared/src/main/scala/coursier/FromSbt.scala
View File

@ -7,7 +7,8 @@ import java.net.{MalformedURLException, URL}
import coursier.core.Authentication
import sbt.internal.librarymanagement.mavenint.SbtPomExtraProperties
import sbt.librarymanagement._
import sbt.{CrossVersion, ModuleID, Resolver}
import sbt.librarymanagement.Resolver
import sbt.{CrossVersion, ModuleID}
import scalaz.{-\/, \/-}