From e18c4fa76c247a17e0205fc2e3ba3479ef9ca17f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 2 Feb 2018 18:52:54 +0100 Subject: [PATCH] [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 --- build.sbt | 2 +- sbt-shared/src/main/scala/coursier/FromSbt.scala | 5 +++-- sbt-shared/src/main/scala/coursier/ToSbt.scala | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 27e73fb3e..13d6900b5 100644 --- a/build.sbt +++ b/build.sbt @@ -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) diff --git a/sbt-shared/src/main/scala/coursier/FromSbt.scala b/sbt-shared/src/main/scala/coursier/FromSbt.scala index a827fe603..4273a46be 100644 --- a/sbt-shared/src/main/scala/coursier/FromSbt.scala +++ b/sbt-shared/src/main/scala/coursier/FromSbt.scala @@ -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 { diff --git a/sbt-shared/src/main/scala/coursier/ToSbt.scala b/sbt-shared/src/main/scala/coursier/ToSbt.scala index ec79312c1..e437b12cc 100644 --- a/sbt-shared/src/main/scala/coursier/ToSbt.scala +++ b/sbt-shared/src/main/scala/coursier/ToSbt.scala @@ -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 = {