From 8d414475288c373ed35c6b5fbfdf035134e6457b Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried <leonard.ehrenfried@gmail.com>
Date: Mon, 5 Feb 2018 18:36:36 +0100
Subject: [PATCH] Remove more imports from sbt._ namespace (#766)

* Remove more imports from sbt._ namespace

* Bump sbt-compat to 1.2.4
---
 build.sbt                                        |  2 +-
 sbt-shared/src/main/scala/coursier/FromSbt.scala |  1 -
 sbt-shared/src/main/scala/coursier/ToSbt.scala   | 16 ++++++++--------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/build.sbt b/build.sbt
index 13d6900b5..123d168f5 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.2"
+      val dependency = "com.dwijnand" % "sbt-compat" % "1.2.4"
       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 4273a46be..9ce477589 100644
--- a/sbt-shared/src/main/scala/coursier/FromSbt.scala
+++ b/sbt-shared/src/main/scala/coursier/FromSbt.scala
@@ -9,7 +9,6 @@ import sbt.internal.librarymanagement.mavenint.SbtPomExtraProperties
 import sbt.librarymanagement._
 import sbt.librarymanagement.Resolver
 import sbt.util.Logger
-import sbt.{CrossVersion, ModuleID}
 
 import scalaz.{-\/, \/-}
 
diff --git a/sbt-shared/src/main/scala/coursier/ToSbt.scala b/sbt-shared/src/main/scala/coursier/ToSbt.scala
index e437b12cc..fb96d4dbd 100644
--- a/sbt-shared/src/main/scala/coursier/ToSbt.scala
+++ b/sbt-shared/src/main/scala/coursier/ToSbt.scala
@@ -24,9 +24,9 @@ object ToSbt {
       }
   }
 
-  val moduleId = caching[(Dependency, Map[String, String]), sbt.ModuleID] {
+  val moduleId = caching[(Dependency, Map[String, String]), ModuleID] {
     case (dependency, extraProperties) =>
-      sbt.ModuleID(
+      sbt.librarymanagement.ModuleID(
         dependency.module.organization,
         dependency.module.name,
         dependency.version
@@ -49,9 +49,9 @@ object ToSbt {
       )
   }
 
-  val artifact = caching[(Module, Map[String, String], Artifact), sbt.Artifact] {
+  val artifact = caching[(Module, Map[String, String], Artifact), sbt.librarymanagement.Artifact] {
     case (module, extraProperties, artifact) =>
-      sbt.Artifact(module.name)
+      sbt.librarymanagement.Artifact(module.name)
         // FIXME Get these two from publications
         .withType(artifact.attributes.`type`)
         .withExtension(MavenSource.typeExtension(artifact.attributes.`type`))
@@ -65,7 +65,7 @@ object ToSbt {
         .withExtraAttributes(module.attributes ++ extraProperties)
   }
 
-  val moduleReport = caching[(Dependency, Seq[(Dependency, Project)], Project, Seq[(Artifact, Option[File])]), sbt.ModuleReport] {
+  val moduleReport = caching[(Dependency, Seq[(Dependency, Project)], Project, Seq[(Artifact, Option[File])]), ModuleReport] {
     case (dependency, dependees, project, artifacts) =>
 
     val sbtArtifacts = artifacts.collect {
@@ -218,7 +218,7 @@ object ToSbt {
     log: Logger,
     keepPomArtifact: Boolean = false,
     includeSignatures: Boolean = false
-  ): sbt.UpdateReport = {
+  ): UpdateReport = {
 
     val configReports = configs.map {
       case (config, extends0) =>
@@ -257,10 +257,10 @@ object ToSbt {
         )
     }
 
-    sbt.UpdateReport(
+    UpdateReport(
       null,
       configReports.toVector,
-      sbt.UpdateStats(-1L, -1L, -1L, cached = false),
+      UpdateStats(-1L, -1L, -1L, cached = false),
       Map.empty
     )
   }