Merge pull request #477 from coursier/topic/enable-sbt-plugin-hack-by-default

Enable sbt plugin hack in Maven repo paths by default
This commit is contained in:
Alexandre Archambault 2017-04-03 10:10:05 +02:00 committed by GitHub
commit 8c08ead018
4 changed files with 6 additions and 8 deletions

View File

@ -134,11 +134,10 @@ class Helper(
var repos = (if (common.noDefault) Nil else defaultRepositories) ++ repos0
if (common.sbtPluginHack)
repos = repos.map {
case m: MavenRepository => m.copy(sbtAttrStub = true)
case other => other
}
repos = repos.map {
case m: MavenRepository => m.copy(sbtAttrStub = common.sbtPluginHack)
case other => other
}
if (common.dropInfoAttr)
repos = repos.map {

View File

@ -37,7 +37,7 @@ final case class CommonOptions(
@Help("Do not add default repositories (~/.ivy2/local, and Central)")
noDefault: Boolean = false,
@Help("Modify names in Maven repository paths for SBT plugins")
sbtPluginHack: Boolean = false,
sbtPluginHack: Boolean = true,
@Help("Drop module attributes starting with 'info.' - these are sometimes used by projects built with SBT")
dropInfoAttr: Boolean = false,
@Help("Force module version")

View File

@ -63,7 +63,7 @@ final case class MavenRepository(
root: String,
changing: Option[Boolean] = None,
/** Hackish hack for sbt plugins mainly - what this does really sucks */
sbtAttrStub: Boolean = false,
sbtAttrStub: Boolean = true,
authentication: Option[Authentication] = None
) extends Repository {

View File

@ -156,7 +156,6 @@ object FromSbt {
Some(
MavenRepository(
root0,
sbtAttrStub = true,
authentication = authentication
)
)