From a5a8c6373257c2115238cd5d61a61bbf5a96133e Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Thu, 30 May 2019 00:24:55 -0400
Subject: [PATCH] Move Coursier related tasks into sbt.coursierint

Ref #4713
---
 main/src/main/scala/sbt/Defaults.scala                     | 1 +
 .../CoursierArtifactsTasks.scala                           | 3 +--
 .../CoursierInputsTasks.scala                              | 7 +++----
 .../CoursierRepositoriesTasks.scala                        | 5 ++---
 .../scala/sbt/{internal => coursierint}/LMCoursier.scala   | 5 ++---
 5 files changed, 9 insertions(+), 12 deletions(-)
 rename main/src/main/scala/sbt/{internal/librarymanagement => coursierint}/CoursierArtifactsTasks.scala (99%)
 rename main/src/main/scala/sbt/{internal/librarymanagement => coursierint}/CoursierInputsTasks.scala (97%)
 rename main/src/main/scala/sbt/{internal/librarymanagement => coursierint}/CoursierRepositoriesTasks.scala (98%)
 rename main/src/main/scala/sbt/{internal => coursierint}/LMCoursier.scala (98%)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index e00d863d0..839b6b120 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -16,6 +16,7 @@ import lmcoursier.CoursierDependencyResolution
 import lmcoursier.definitions.{ Configuration => CConfiguration }
 import org.apache.ivy.core.module.descriptor.ModuleDescriptor
 import org.apache.ivy.core.module.id.ModuleRevisionId
+import sbt.coursierint._
 import sbt.Def.{ Initialize, ScopedKey, Setting, SettingsDefinition }
 import sbt.Keys._
 import sbt.Project.{
diff --git a/main/src/main/scala/sbt/internal/librarymanagement/CoursierArtifactsTasks.scala b/main/src/main/scala/sbt/coursierint/CoursierArtifactsTasks.scala
similarity index 99%
rename from main/src/main/scala/sbt/internal/librarymanagement/CoursierArtifactsTasks.scala
rename to main/src/main/scala/sbt/coursierint/CoursierArtifactsTasks.scala
index b3c6e3518..59db5d4f3 100644
--- a/main/src/main/scala/sbt/internal/librarymanagement/CoursierArtifactsTasks.scala
+++ b/main/src/main/scala/sbt/coursierint/CoursierArtifactsTasks.scala
@@ -6,8 +6,7 @@
  */
 
 package sbt
-package internal
-package librarymanagement
+package coursierint
 
 import lmcoursier.definitions.{
   Classifier => CClassifier,
diff --git a/main/src/main/scala/sbt/internal/librarymanagement/CoursierInputsTasks.scala b/main/src/main/scala/sbt/coursierint/CoursierInputsTasks.scala
similarity index 97%
rename from main/src/main/scala/sbt/internal/librarymanagement/CoursierInputsTasks.scala
rename to main/src/main/scala/sbt/coursierint/CoursierInputsTasks.scala
index b837b737d..4836e1335 100644
--- a/main/src/main/scala/sbt/internal/librarymanagement/CoursierInputsTasks.scala
+++ b/main/src/main/scala/sbt/coursierint/CoursierInputsTasks.scala
@@ -6,8 +6,7 @@
  */
 
 package sbt
-package internal
-package librarymanagement
+package coursierint
 
 import java.net.URL
 import sbt.librarymanagement._
@@ -35,7 +34,7 @@ import sbt.librarymanagement.ivy.{
 import sbt.ScopeFilter.Make._
 import scala.collection.JavaConverters._
 
-private[sbt] object CoursierInputsTasks {
+object CoursierInputsTasks {
   private def coursierProject0(
       projId: ModuleID,
       dependencies: Seq[ModuleID],
@@ -70,7 +69,7 @@ private[sbt] object CoursierInputsTasks {
     }
   }
 
-  private[sbt] def coursierProjectTask: Def.Initialize[sbt.Task[CProject]] =
+  def coursierProjectTask: Def.Initialize[sbt.Task[CProject]] =
     Def.task {
       coursierProject0(
         projectID.value,
diff --git a/main/src/main/scala/sbt/internal/librarymanagement/CoursierRepositoriesTasks.scala b/main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala
similarity index 98%
rename from main/src/main/scala/sbt/internal/librarymanagement/CoursierRepositoriesTasks.scala
rename to main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala
index b0d4436f7..88b6c395a 100644
--- a/main/src/main/scala/sbt/internal/librarymanagement/CoursierRepositoriesTasks.scala
+++ b/main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala
@@ -6,15 +6,14 @@
  */
 
 package sbt
-package internal
-package librarymanagement
+package coursierint
 
 import sbt.librarymanagement._
 import sbt.Keys._
 import sbt.ScopeFilter.Make._
 import sbt.io.IO
 
-private[sbt] object CoursierRepositoriesTasks {
+object CoursierRepositoriesTasks {
   private object CResolvers {
     private val slowReposBase = Seq(
       "https://repo.typesafe.com/",
diff --git a/main/src/main/scala/sbt/internal/LMCoursier.scala b/main/src/main/scala/sbt/coursierint/LMCoursier.scala
similarity index 98%
rename from main/src/main/scala/sbt/internal/LMCoursier.scala
rename to main/src/main/scala/sbt/coursierint/LMCoursier.scala
index 6e3e78691..f84a19afa 100644
--- a/main/src/main/scala/sbt/internal/LMCoursier.scala
+++ b/main/src/main/scala/sbt/coursierint/LMCoursier.scala
@@ -6,7 +6,7 @@
  */
 
 package sbt
-package internal
+package coursierint
 
 import java.io.File
 import lmcoursier.definitions.{
@@ -16,10 +16,9 @@ import lmcoursier.definitions.{
   Project => CProject
 }
 import lmcoursier._
-import sbt.librarymanagement._
 import lmcoursier.credentials.Credentials
 import Keys._
-import sbt.internal.librarymanagement.{ CoursierArtifactsTasks, CoursierInputsTasks }
+import sbt.librarymanagement._
 import sbt.util.Logger
 import sbt.io.syntax._
 import xsbti.AppConfiguration