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

Remove more imports from sbt._ namespace (#766) 

* Remove more imports from sbt._ namespace

* Bump sbt-compat to 1.2.4
This commit is contained in:
Leonard Ehrenfried 2018-02-05 18:36:36 +01:00 committed by Alexandre Archambault
parent 9c274c23d6
commit 8d41447528
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

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

1
sbt-shared/src/main/scala/coursier/FromSbt.scala
View File

@ -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.{-\/, \/-}

16
sbt-shared/src/main/scala/coursier/ToSbt.scala
View File

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