From 2d4ab344085481ce719fcacb5da33297a9c969fc Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Fri, 9 Mar 2018 09:43:13 +0100 Subject: [PATCH] Switch to latest directories (#806) * Switch to latest directories * bump soc to 6 for Pants --- 3rdparty/jvm/BUILD | 2 +- directories | 2 +- paths/src/main/java/coursier/CoursierPaths.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3rdparty/jvm/BUILD b/3rdparty/jvm/BUILD index edf8f5b55..5eb9340b7 100644 --- a/3rdparty/jvm/BUILD +++ b/3rdparty/jvm/BUILD @@ -138,7 +138,7 @@ jar_library( jar( org = "io.github.soc", name = "directories", - rev = "5", + rev = "6", ), ], ) diff --git a/directories b/directories index 9dcf4937f..4305e70a9 160000 --- a/directories +++ b/directories @@ -1 +1 @@ -Subproject commit 9dcf4937ffbd35a0d87d94b221e6eb8cf7d37afd +Subproject commit 4305e70a93ab9acc6256b10f7f3087e9902d671f diff --git a/paths/src/main/java/coursier/CoursierPaths.java b/paths/src/main/java/coursier/CoursierPaths.java index 096cfcf24..76e6bf23d 100644 --- a/paths/src/main/java/coursier/CoursierPaths.java +++ b/paths/src/main/java/coursier/CoursierPaths.java @@ -30,7 +30,7 @@ public final class CoursierPaths { if (path == null) path = System.getProperty("coursier.cache"); - File baseXdgDir = new File(coursierDirectories.projectCacheDir); + File baseXdgDir = new File(coursierDirectories.cacheDir); File xdgDir = new File(baseXdgDir, "v1"); String xdgPath = xdgDir.getAbsolutePath(); @@ -58,7 +58,7 @@ public final class CoursierPaths { if (cacheDirectory0 == null) synchronized (lock) { if (cacheDirectory0 == null) { - coursierDirectories = ProjectDirectories.fromProjectName("Coursier"); + coursierDirectories = ProjectDirectories.from(null, null, "Coursier"); cacheDirectory0 = computeCacheDirectory(); } }