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

[sbt-shared] Use sbt.util.Logger instead of sbt.Logger (#764) 

* Use sbt.util.Logger instead of sbt.Logger

* Bump sbt-compat, adds backport for sbt.util.Logger
This commit is contained in:
Leonard Ehrenfried 2018-02-02 18:52:54 +01:00 committed by Alexandre Archambault
parent a8bdff26c5
commit e18c4fa76c
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -241,7 +241,7 @@ lazy val `sbt-shared` = project
// because we don't publish for 2.11 the following declaration
// is more wordy than usual
libs ++= {
val dependency = "com.dwijnand" % "sbt-compat" % "1.2.1"
val dependency = "com.dwijnand" % "sbt-compat" % "1.2.2"
val sbtV = (sbtBinaryVersion in pluginCrossBuild).value
val scalaV = (scalaBinaryVersion in update).value
val m = Defaults.sbtPluginExtra(dependency, sbtV, scalaV)

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

@ -8,6 +8,7 @@ import coursier.core.Authentication
import sbt.internal.librarymanagement.mavenint.SbtPomExtraProperties
import sbt.librarymanagement._
import sbt.librarymanagement.Resolver
import sbt.util.Logger
import sbt.{CrossVersion, ModuleID}
import scalaz.{-\/, \/-}
@ -176,7 +177,7 @@ object FromSbt {
private def mavenRepositoryOpt(
root: String,
log: sbt.Logger,
log: Logger,
authentication: Option[Authentication]
): Option[MavenRepository] =
try {
@ -203,7 +204,7 @@ object FromSbt {
def repository(
resolver: Resolver,
ivyProperties: Map[String, String],
log: sbt.Logger,
log: Logger,
authentication: Option[Authentication]
): Option[Repository] =
resolver match {

5
sbt-shared/src/main/scala/coursier/ToSbt.scala
View File

@ -5,6 +5,7 @@ import java.util.GregorianCalendar
import java.util.concurrent.ConcurrentHashMap
import sbt.librarymanagement._
import sbt.util.Logger
import coursier.maven.MavenSource
object ToSbt {
@ -126,7 +127,7 @@ object ToSbt {
res: Resolution,
classifiersOpt: Option[Seq[String]],
artifactFileOpt: (Module, String, Artifact) => Option[File],
log: sbt.Logger,
log: Logger,
keepPomArtifact: Boolean = false,
includeSignatures: Boolean = false
) = {
@ -214,7 +215,7 @@ object ToSbt {
configs: Map[String, Set[String]],
classifiersOpt: Option[Seq[String]],
artifactFileOpt: (Module, String, Artifact) => Option[File],
log: sbt.Logger,
log: Logger,
keepPomArtifact: Boolean = false,
includeSignatures: Boolean = false
): sbt.UpdateReport = {