From da843046df6df591a1144e8b21e55f40bd93a3c5 Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Sun, 3 Jan 2016 16:38:28 +0100
Subject: [PATCH] Unify global caches (defaults to ~/.coursier/cache/v1)

---
 cache/src/main/scala/coursier/Cache.scala            |  7 +++++++
 cli/src/main/scala-2.11/coursier/cli/Coursier.scala  | 12 ++----------
 .../main/scala-2.10/coursier/CoursierPlugin.scala    |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/cache/src/main/scala/coursier/Cache.scala b/cache/src/main/scala/coursier/Cache.scala
index 513ca3edd..aae769a34 100644
--- a/cache/src/main/scala/coursier/Cache.scala
+++ b/cache/src/main/scala/coursier/Cache.scala
@@ -473,6 +473,13 @@ object Cache {
       "[artifact](-[classifier]).[ext]"
   )
 
+  lazy val defaultBase = new File(
+    sys.env.getOrElse(
+      "COURSIER_CACHE",
+      sys.props("user.home") + "/.coursier/cache/v1"
+    )
+  )
+
   val defaultConcurrentDownloadCount = 6
 
   lazy val defaultPool =
diff --git a/cli/src/main/scala-2.11/coursier/cli/Coursier.scala b/cli/src/main/scala-2.11/coursier/cli/Coursier.scala
index 4bc3d55d5..4f0dba5b6 100644
--- a/cli/src/main/scala-2.11/coursier/cli/Coursier.scala
+++ b/cli/src/main/scala-2.11/coursier/cli/Coursier.scala
@@ -45,18 +45,10 @@ case class CommonOptions(
   val verbose0 = verbose.length - (if (quiet) 1 else 0)
 }
 
-object CacheOptions {
-  def default =
-    sys.env.getOrElse(
-      "COURSIER_CACHE",
-      sys.props("user.home") + "/.coursier/cache"
-    )
-}
-
 case class CacheOptions(
-  @HelpMessage("Cache directory (defaults to environment variable COURSIER_CACHE or ~/.coursier/cache)")
+  @HelpMessage("Cache directory (defaults to environment variable COURSIER_CACHE or ~/.coursier/cache/v1)")
   @ExtraName("C")
-    cache: String = CacheOptions.default
+    cache: String = Cache.defaultBase.toString
 )
 
 sealed trait CoursierCommand extends Command
diff --git a/plugin/src/main/scala-2.10/coursier/CoursierPlugin.scala b/plugin/src/main/scala-2.10/coursier/CoursierPlugin.scala
index 7d617f7f4..1db20628f 100644
--- a/plugin/src/main/scala-2.10/coursier/CoursierPlugin.scala
+++ b/plugin/src/main/scala-2.10/coursier/CoursierPlugin.scala
@@ -39,7 +39,7 @@ object CoursierPlugin extends AutoPlugin {
     coursierVerbosity := 1,
     coursierResolvers <<= Tasks.coursierResolversTask,
     coursierSbtResolvers <<= externalResolvers in updateSbtClassifiers,
-    coursierCache := new File(sys.props("user.home") + "/.coursier/sbt"),
+    coursierCache := Cache.defaultBase,
     update <<= Tasks.updateTask(withClassifiers = false),
     updateClassifiers <<= Tasks.updateTask(withClassifiers = true),
     updateSbtClassifiers in Defaults.TaskGlobal <<= Tasks.updateTask(withClassifiers = true, sbtClassifiers = true),