From c176adca3c0ab3ad7269af8193b97e9c96278d43 Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Mon, 3 Apr 2017 00:19:51 +0200
Subject: [PATCH] Enable sbt plugin hack in Maven repo paths by default

---
 cli/src/main/scala-2.11/coursier/cli/Helper.scala        | 9 ++++-----
 cli/src/main/scala-2.11/coursier/cli/Options.scala       | 2 +-
 .../src/main/scala/coursier/maven/MavenRepository.scala  | 2 +-
 sbt-coursier/src/main/scala-2.10/coursier/FromSbt.scala  | 1 -
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/cli/src/main/scala-2.11/coursier/cli/Helper.scala b/cli/src/main/scala-2.11/coursier/cli/Helper.scala
index 341af33fb..6a6193a56 100644
--- a/cli/src/main/scala-2.11/coursier/cli/Helper.scala
+++ b/cli/src/main/scala-2.11/coursier/cli/Helper.scala
@@ -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 {
diff --git a/cli/src/main/scala-2.11/coursier/cli/Options.scala b/cli/src/main/scala-2.11/coursier/cli/Options.scala
index b2a183a54..7aba4f63a 100644
--- a/cli/src/main/scala-2.11/coursier/cli/Options.scala
+++ b/cli/src/main/scala-2.11/coursier/cli/Options.scala
@@ -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")
diff --git a/core/shared/src/main/scala/coursier/maven/MavenRepository.scala b/core/shared/src/main/scala/coursier/maven/MavenRepository.scala
index 9150901b0..03f05796a 100644
--- a/core/shared/src/main/scala/coursier/maven/MavenRepository.scala
+++ b/core/shared/src/main/scala/coursier/maven/MavenRepository.scala
@@ -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 {
 
diff --git a/sbt-coursier/src/main/scala-2.10/coursier/FromSbt.scala b/sbt-coursier/src/main/scala-2.10/coursier/FromSbt.scala
index 725ab6eae..37b17fd1a 100644
--- a/sbt-coursier/src/main/scala-2.10/coursier/FromSbt.scala
+++ b/sbt-coursier/src/main/scala-2.10/coursier/FromSbt.scala
@@ -156,7 +156,6 @@ object FromSbt {
       Some(
         MavenRepository(
           root0,
-          sbtAttrStub = true,
           authentication = authentication
         )
       )