From 0c28db9d210192a1f62bbb69c4883ff99b5254ab Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Wed, 12 Jul 2017 08:33:18 -0400
Subject: [PATCH] rename to DependencyResolutionInterface

---
 README.md                                                | 4 ++--
 ...ibraryManagement.scala => DependencyResolution.scala} | 8 ++++----
 .../librarymanagement/LibraryManagementInterface.scala   | 6 +++---
 ...aryManagement.scala => IvyDependencyResolution.scala} | 9 +++++----
 ivy/src/test/scala/BaseIvySpecification.scala            | 4 ++--
 5 files changed, 16 insertions(+), 15 deletions(-)
 rename core/src/main/scala/sbt/librarymanagement/{LibraryManagement.scala => DependencyResolution.scala} (97%)
 rename ivy/src/main/scala/sbt/librarymanagement/ivy/{IvyLibraryManagement.scala => IvyDependencyResolution.scala} (70%)

diff --git a/README.md b/README.md
index d3e7f5c20..f8a089339 100644
--- a/README.md
+++ b/README.md
@@ -15,9 +15,9 @@ log: sbt.internal.util.ManagedLogger = sbt.internal.util.ManagedLogger@c439b0f
 scala> val lm = {
          import sbt.librarymanagement.ivy._
          val ivyConfig = InlineIvyConfiguration().withLog(log)
-         IvyLibraryManagement(ivyConfig)
+         IvyDependencyResolution(ivyConfig)
        }
-lm: sbt.librarymanagement.LibraryManagement = sbt.librarymanagement.ivy.IvyLibraryManagement@11c07acb
+lm: sbt.librarymanagement.DependencyResolution = sbt.librarymanagement.DependencyResolution@6a9b40f8
 
 scala> val module = "commons-io" % "commons-io" % "2.5"
 module: sbt.librarymanagement.ModuleID = commons-io:commons-io:2.5
diff --git a/core/src/main/scala/sbt/librarymanagement/LibraryManagement.scala b/core/src/main/scala/sbt/librarymanagement/DependencyResolution.scala
similarity index 97%
rename from core/src/main/scala/sbt/librarymanagement/LibraryManagement.scala
rename to core/src/main/scala/sbt/librarymanagement/DependencyResolution.scala
index 54a3fa970..b2d5beb03 100644
--- a/core/src/main/scala/sbt/librarymanagement/LibraryManagement.scala
+++ b/core/src/main/scala/sbt/librarymanagement/DependencyResolution.scala
@@ -8,7 +8,7 @@ import sbt.librarymanagement.syntax._
 /**
  * Library management API to resolve dependencies.
  */
-class LibraryManagement private[sbt] (lmEngine: LibraryManagementInterface) {
+class DependencyResolution private[sbt] (lmEngine: DependencyResolutionInterface) {
   import sbt.internal.librarymanagement.InternalDefaults._
   import sbt.internal.librarymanagement.UpdateClassifiersUtil._
 
@@ -217,7 +217,7 @@ class LibraryManagement private[sbt] (lmEngine: LibraryManagementInterface) {
     }).mkString(", ")
 }
 
-object LibraryManagement {
-  def apply(lmEngine: LibraryManagementInterface): LibraryManagement =
-    new LibraryManagement(lmEngine)
+object DependencyResolution {
+  def apply(lmEngine: DependencyResolutionInterface): DependencyResolution =
+    new DependencyResolution(lmEngine)
 }
diff --git a/core/src/main/scala/sbt/librarymanagement/LibraryManagementInterface.scala b/core/src/main/scala/sbt/librarymanagement/LibraryManagementInterface.scala
index 9af54bd06..6afc27e2d 100644
--- a/core/src/main/scala/sbt/librarymanagement/LibraryManagementInterface.scala
+++ b/core/src/main/scala/sbt/librarymanagement/LibraryManagementInterface.scala
@@ -4,9 +4,9 @@ import java.io.File
 import sbt.util.Logger
 
 /**
- * Interface for library management intended for library management engine authors.
+ * Interface for dependency resolution intended for engine authors.
  */
-abstract class LibraryManagementInterface {
+trait DependencyResolutionInterface {
 
   /**
    * Builds a ModuleDescriptor that describes a subproject with dependencies.
@@ -35,7 +35,7 @@ abstract class LibraryManagementInterface {
 /**
  * Interface for publishing modules.
  */
-abstract class PublisherInterface {
+trait PublisherInterface {
 
   /**
    * Builds a ModuleDescriptor that describes a subproject with dependencies.
diff --git a/ivy/src/main/scala/sbt/librarymanagement/ivy/IvyLibraryManagement.scala b/ivy/src/main/scala/sbt/librarymanagement/ivy/IvyDependencyResolution.scala
similarity index 70%
rename from ivy/src/main/scala/sbt/librarymanagement/ivy/IvyLibraryManagement.scala
rename to ivy/src/main/scala/sbt/librarymanagement/ivy/IvyDependencyResolution.scala
index 3d591ea02..fd0fd259c 100644
--- a/ivy/src/main/scala/sbt/librarymanagement/ivy/IvyLibraryManagement.scala
+++ b/ivy/src/main/scala/sbt/librarymanagement/ivy/IvyDependencyResolution.scala
@@ -5,7 +5,8 @@ package ivy
 import sbt.internal.librarymanagement._
 import sbt.util.Logger
 
-class IvyLibraryManagement private[sbt] (val ivySbt: IvySbt) extends LibraryManagementInterface {
+class IvyDependencyResolution private[sbt] (val ivySbt: IvySbt)
+    extends DependencyResolutionInterface {
   type Module = ivySbt.Module
 
   override def moduleDescriptor(moduleSetting: ModuleDescriptorConfiguration): ModuleDescriptor = {
@@ -24,7 +25,7 @@ class IvyLibraryManagement private[sbt] (val ivySbt: IvySbt) extends LibraryMana
     }
 }
 
-object IvyLibraryManagement {
-  def apply(ivyConfiguration: IvyConfiguration): LibraryManagement =
-    LibraryManagement(new IvyLibraryManagement(new IvySbt(ivyConfiguration)))
+object IvyDependencyResolution {
+  def apply(ivyConfiguration: IvyConfiguration): DependencyResolution =
+    DependencyResolution(new IvyDependencyResolution(new IvySbt(ivyConfiguration)))
 }
diff --git a/ivy/src/test/scala/BaseIvySpecification.scala b/ivy/src/test/scala/BaseIvySpecification.scala
index a4c1d4fda..4dd23afe3 100644
--- a/ivy/src/test/scala/BaseIvySpecification.scala
+++ b/ivy/src/test/scala/BaseIvySpecification.scala
@@ -18,8 +18,8 @@ trait BaseIvySpecification extends UnitSpec {
     ModuleID("com.example", "foo", "0.1.0").withConfigurations(Some("compile"))
 
   lazy val log = ConsoleLogger()
-  def lmEngine(uo: UpdateOptions = UpdateOptions()): LibraryManagement =
-    IvyLibraryManagement(mkIvyConfiguration(uo))
+  def lmEngine(uo: UpdateOptions = UpdateOptions()): DependencyResolution =
+    IvyDependencyResolution(mkIvyConfiguration(uo))
 
   def configurations = Vector(Compile, Test, Runtime)
   def module(moduleId: ModuleID,