From 07ad16da717c0f16d3795709e6b24b31a0ff4b83 Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Fri, 27 Oct 2017 16:23:07 +0200
Subject: [PATCH] Tweak v1 component handling in cache path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Up to coursier 1.0.0-RC12, setting COURSIER_CACHE=foo makes files land
in e.g. foo/https/repo1.maven.org/….
https://github.com/coursier/coursier/pull/676 changed that to foo/v1/https/….
This commit reverts things back to what they were before that.

In the long term, it would be better to keep the v1 component there, but
I'd prefer not to change that behavior right now.
---
 paths/src/main/java/coursier/CachePath.java     |  2 +-
 paths/src/main/java/coursier/CoursierPaths.java | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/paths/src/main/java/coursier/CachePath.java b/paths/src/main/java/coursier/CachePath.java
index 40f884347..3d47122b6 100644
--- a/paths/src/main/java/coursier/CachePath.java
+++ b/paths/src/main/java/coursier/CachePath.java
@@ -85,7 +85,7 @@ public class CachePath {
     }
 
     public static File defaultCacheDirectory() {
-        return new File(CoursierPaths.cacheDirectory(), "v1");
+        return CoursierPaths.cacheDirectory();
     }
 
     private static ConcurrentHashMap<File, Object> processStructureLocks = new ConcurrentHashMap<File, Object>();
diff --git a/paths/src/main/java/coursier/CoursierPaths.java b/paths/src/main/java/coursier/CoursierPaths.java
index 2f313cbc1..096cfcf24 100644
--- a/paths/src/main/java/coursier/CoursierPaths.java
+++ b/paths/src/main/java/coursier/CoursierPaths.java
@@ -30,18 +30,19 @@ public final class CoursierPaths {
         if (path == null)
             path = System.getProperty("coursier.cache");
 
-        String xdgPath = coursierDirectories.projectCacheDir;
-        File xdgDir = new File(xdgPath);
+        File baseXdgDir = new File(coursierDirectories.projectCacheDir);
+        File xdgDir = new File(baseXdgDir, "v1");
+        String xdgPath = xdgDir.getAbsolutePath();
 
         if (path == null) {
-            if (xdgDir.isDirectory())
+            if (baseXdgDir.isDirectory())
               path = xdgPath;
         }
 
         if (path == null) {
             File coursierDotFile = new File(System.getProperty("user.home") + "/.coursier");
             if (coursierDotFile.isDirectory())
-                path = System.getProperty("user.home") + "/.coursier/cache/";
+                path = System.getProperty("user.home") + "/.coursier/cache/v1/";
         }
 
         if (path == null) {
@@ -49,12 +50,7 @@ public final class CoursierPaths {
             xdgDir.mkdirs();
         }
 
-        File coursierCacheDirectory = new File(path).getAbsoluteFile();
-
-        if (coursierCacheDirectory.getName().equals("v1"))
-            coursierCacheDirectory = coursierCacheDirectory.getParentFile();
-
-        return coursierCacheDirectory;
+        return new File(path).getAbsoluteFile();
     }
 
     public static File cacheDirectory() {