From 33af97d81e00bf2899546a6a360dd88783426df6 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 5 May 2020 19:59:59 +0200 Subject: [PATCH] Warn if legacy cache location ~/.coursier/cache is found (#222) --- .../src/main/scala/lmcoursier/CoursierConfiguration.scala | 7 +++++++ .../scala/lmcoursier/CoursierDependencyResolution.scala | 2 ++ .../coursier/sbtcoursiershared/SbtCoursierShared.scala | 2 ++ 3 files changed, 11 insertions(+) diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/CoursierConfiguration.scala b/modules/lm-coursier/src/main/scala/lmcoursier/CoursierConfiguration.scala index 34fa1282e..44f0ab003 100644 --- a/modules/lm-coursier/src/main/scala/lmcoursier/CoursierConfiguration.scala +++ b/modules/lm-coursier/src/main/scala/lmcoursier/CoursierConfiguration.scala @@ -1,6 +1,7 @@ package lmcoursier import java.io.File +import java.util.concurrent.atomic.AtomicBoolean import dataclass.data import coursier.cache.CacheDefaults @@ -82,6 +83,12 @@ import scala.concurrent.duration.Duration } object CoursierConfiguration { + + private var checkedLegacyCache = new AtomicBoolean + def checkLegacyCache(): Unit = + if (!checkedLegacyCache.getAndSet(true)) + coursier.cache.CacheDefaults.warnLegacyCacheLocation() + def apply( log: Logger, resolvers: Vector[Resolver], diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala b/modules/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala index 0adb719f4..6fb48c8fb 100644 --- a/modules/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala +++ b/modules/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala @@ -15,6 +15,8 @@ import sbt.util.Logger class CoursierDependencyResolution(conf: CoursierConfiguration) extends DependencyResolutionInterface { + lmcoursier.CoursierConfiguration.checkLegacyCache() + /* * Based on earlier implementations by @leonardehrenfried (https://github.com/sbt/librarymanagement/pull/190) * and @andreaTP (https://github.com/sbt/librarymanagement/pull/270), then adapted to the code from the former diff --git a/modules/sbt-coursier-shared/src/main/scala/coursier/sbtcoursiershared/SbtCoursierShared.scala b/modules/sbt-coursier-shared/src/main/scala/coursier/sbtcoursiershared/SbtCoursierShared.scala index 544bca381..1f896c1b5 100644 --- a/modules/sbt-coursier-shared/src/main/scala/coursier/sbtcoursiershared/SbtCoursierShared.scala +++ b/modules/sbt-coursier-shared/src/main/scala/coursier/sbtcoursiershared/SbtCoursierShared.scala @@ -14,6 +14,8 @@ import sbt.librarymanagement.{ModuleID, Resolver, URLRepository} object SbtCoursierShared extends AutoPlugin { + lmcoursier.CoursierConfiguration.checkLegacyCache() + override def trigger = allRequirements override def requires = sbt.plugins.JvmPlugin