From 4519faaf106424569fd121aef55e7fbf026d8eaa Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried <leonard.ehrenfried@gmail.com>
Date: Fri, 9 Feb 2018 00:57:08 +0100
Subject: [PATCH] Remove sbt._ types from FromSbt.scala (#771)

* Remove more types from sbt._ namespace

* Use newest version of sbt-compat
---
 build.sbt                                        | 2 +-
 sbt-shared/src/main/scala/coursier/FromSbt.scala | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.sbt b/build.sbt
index a3e41d004..5c8061d9e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -246,7 +246,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.4"
+      val dependency = "com.dwijnand" % "sbt-compat" % "1.2.5"
       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 9ce477589..54c9d7eb2 100644
--- a/sbt-shared/src/main/scala/coursier/FromSbt.scala
+++ b/sbt-shared/src/main/scala/coursier/FromSbt.scala
@@ -162,7 +162,7 @@ object FromSbt {
     )
   }
 
-  private def mavenCompatibleBaseOpt(patterns: sbt.Patterns): Option[String] =
+  private def mavenCompatibleBaseOpt(patterns: Patterns): Option[String] =
     if (patterns.isMavenCompatible) {
       val baseIvyPattern = patterns.ivyPatterns.head.takeWhile(c => c != '[' && c != '(')
       val baseArtifactPattern = patterns.ivyPatterns.head.takeWhile(c => c != '[' && c != '(')
@@ -210,7 +210,7 @@ object FromSbt {
       case r: sbt.librarymanagement.MavenRepository =>
         mavenRepositoryOpt(r.root, log, authentication)
 
-      case r: sbt.FileRepository
+      case r: FileRepository
         if r.patterns.ivyPatterns.lengthCompare(1) == 0 &&
           r.patterns.artifactPatterns.lengthCompare(1) == 0 =>
 
@@ -241,7 +241,7 @@ object FromSbt {
             mavenRepositoryOpt("file://" + mavenCompatibleBase, log, authentication)
         }
 
-      case r: sbt.URLRepository
+      case r: URLRepository
         if r.patterns.ivyPatterns.lengthCompare(1) == 0 &&
           r.patterns.artifactPatterns.lengthCompare(1) == 0 =>
 
@@ -272,7 +272,7 @@ object FromSbt {
             mavenRepositoryOpt(mavenCompatibleBase, log, authentication)
         }
 
-      case raw: sbt.RawRepository if raw.name == "inter-project" => // sbt.RawRepository.equals just compares names anyway
+      case raw: RawRepository if raw.name == "inter-project" => // sbt.RawRepository.equals just compares names anyway
         None
 
       case other =>