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

Enable sbt plugin hack in Maven repo paths by default

This commit is contained in:
Alexandre Archambault 2017-04-03 00:19:51 +02:00
parent 3f88fb9449
commit c176adca3c
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cli/src/main/scala-2.11/coursier/cli/Helper.scala
View File

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

2
cli/src/main/scala-2.11/coursier/cli/Options.scala
View File

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

2
core/shared/src/main/scala/coursier/maven/MavenRepository.scala
View File

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

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

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