luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move Coursier related tasks into sbt.coursierint 

Ref #4713
This commit is contained in:
Eugene Yokota 2019-05-30 00:24:55 -04:00
parent 5b96bcae06
commit a5a8c63732
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main/src/main/scala/sbt/Defaults.scala
View File

@ -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.{

3
main/src/main/scala/sbt/internal/librarymanagement/CoursierArtifactsTasks.scala → main/src/main/scala/sbt/coursierint/CoursierArtifactsTasks.scala
View File

@ -6,8 +6,7 @@
*/
package sbt
package internal
package librarymanagement
package coursierint
import lmcoursier.definitions.{
Classifier => CClassifier,

7
main/src/main/scala/sbt/internal/librarymanagement/CoursierInputsTasks.scala → main/src/main/scala/sbt/coursierint/CoursierInputsTasks.scala
View File

@ -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,

5
main/src/main/scala/sbt/internal/librarymanagement/CoursierRepositoriesTasks.scala → main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala
View File

@ -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/",

5
main/src/main/scala/sbt/internal/LMCoursier.scala → main/src/main/scala/sbt/coursierint/LMCoursier.scala
View File

@ -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