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

Address some compilation warnings

This commit is contained in:
Alexandre Archambault 2017-05-15 15:32:53 +02:00
parent 65a0b035d0
commit 334cc1b01a
2 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sbt-coursier/src/main/scala/coursier/FromSbt.scala
View File

@ -7,6 +7,8 @@ import java.net.{MalformedURLException, URL}
import coursier.core.Authentication
import sbt.{CrossVersion, ModuleID, Resolver}
import scalaz.{-\/, \/-}
import SbtCompatibility._
object FromSbt {
@ -189,14 +191,25 @@ object FromSbt {
mavenCompatibleBaseOpt0 match {
case None =>
Some(IvyRepository(
val repo = IvyRepository.parse(
"file://" + r.patterns.artifactPatterns.head,
metadataPatternOpt = Some("file://" + r.patterns.ivyPatterns.head),
changing = Some(true),
properties = ivyProperties,
dropInfoAttributes = true,
authentication = authentication
))
) match {
case -\/(err) =>
sys.error(
s"Cannot parse Ivy patterns ${r.patterns.artifactPatterns.head} and ${r.patterns.ivyPatterns.head}: $err"
)
case \/-(repo) =>
repo
}
Some(repo)
case Some(mavenCompatibleBase) =>
mavenRepositoryOpt("file://" + mavenCompatibleBase, log, authentication)
}
@ -209,14 +222,25 @@ object FromSbt {
mavenCompatibleBaseOpt0 match {
case None =>
Some(IvyRepository(
val repo = IvyRepository.parse(
r.patterns.artifactPatterns.head,
metadataPatternOpt = Some(r.patterns.ivyPatterns.head),
changing = None,
properties = ivyProperties,
dropInfoAttributes = true,
authentication = authentication
))
) match {
case -\/(err) =>
sys.error(
s"Cannot parse Ivy patterns ${r.patterns.artifactPatterns.head} and ${r.patterns.ivyPatterns.head}: $err"
)
case \/-(repo) =>
repo
}
Some(repo)
case Some(mavenCompatibleBase) =>
mavenRepositoryOpt(mavenCompatibleBase, log, authentication)
}

34
sbt-coursier/src/main/scala/coursier/Tasks.scala
View File

@ -47,24 +47,24 @@ object Tasks {
structure(state).allProjectRefs.filter(p => deps(p.project))
}
def coursierResolversTask: Def.Initialize[sbt.Task[Seq[Resolver]]] =
(
externalResolvers,
sbtPlugin,
sbtResolver,
bootResolvers,
overrideBuildResolvers
).map { (extRes, isSbtPlugin, sbtRes, bootResOpt, overrideFlag) =>
bootResOpt.filter(_ => overrideFlag).getOrElse {
var resolvers = extRes
if (isSbtPlugin)
resolvers = Seq(
sbtRes,
Classpaths.sbtPluginReleases
) ++ resolvers
resolvers
}
def coursierResolversTask: Def.Initialize[sbt.Task[Seq[Resolver]]] = Def.task {
val extRes = externalResolvers.value
val isSbtPlugin = sbtPlugin.value
val sbtRes = sbtResolver.value
val bootResOpt = bootResolvers.value
val overrideFlag = overrideBuildResolvers.value
bootResOpt.filter(_ => overrideFlag).getOrElse {
var resolvers = extRes
if (isSbtPlugin)
resolvers = Seq(
sbtRes,
Classpaths.sbtPluginReleases
) ++ resolvers
resolvers
}
}
def coursierRecursiveResolversTask: Def.Initialize[sbt.Task[Seq[Resolver]]] =
(