From 239d87504875eba4a039064ffc622703287416a8 Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Tue, 20 Nov 2018 17:39:19 +0100
Subject: [PATCH] Make clean scripted test pass with sbt-lm-coursier

---
 .../coursier/sbtcoursiershared/SbtCoursierShared.scala      | 6 ++++++
 .../main/scala/coursier/sbtcoursier/CoursierPlugin.scala    | 5 -----
 .../{sbt-coursier-group-1 => shared-1}/clean/build.sbt      | 0
 .../clean/project/Helper.scala                              | 0
 .../clean/project/plugins.sbt                               | 0
 .../sbt-test/{sbt-coursier-group-1 => shared-1}/clean/test  | 0
 6 files changed, 6 insertions(+), 5 deletions(-)
 rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/clean/build.sbt (100%)
 rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/clean/project/Helper.scala (100%)
 rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/clean/project/plugins.sbt (100%)
 rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/clean/test (100%)

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 96c3f5bfa..401299164 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
@@ -1,7 +1,9 @@
 package coursier.sbtcoursiershared
 
 import coursier.core.{Configuration, Project, Publication}
+import coursier.lmcoursier.SbtCoursierCache
 import sbt.{AutoPlugin, Compile, Setting, TaskKey, Test, settingKey}
+import sbt.Keys.clean
 
 object SbtCoursierShared extends AutoPlugin {
 
@@ -23,6 +25,10 @@ object SbtCoursierShared extends AutoPlugin {
 
   override def projectSettings =
     Seq[Setting[_]](
+      clean := {
+        val noWarningPlz = clean.value
+        SbtCoursierCache.default.clear()
+      },
       coursierGenerateIvyXml := true,
       coursierProject := InputsTasks.coursierProjectTask.value,
       coursierInterProjectDependencies := InputsTasks.coursierInterProjectDependenciesTask.value,
diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala
index 80c425097..59c87f55e 100644
--- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala
+++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala
@@ -4,7 +4,6 @@ import java.io.OutputStreamWriter
 
 import coursier.{Cache, CachePolicy, TermDisplay}
 import coursier.core.{Configuration, ResolutionProcess}
-import coursier.lmcoursier.SbtCoursierCache
 import coursier.sbtcoursiershared.SbtCoursierShared
 import sbt.{Cache => _, Configuration => _, _}
 import sbt.Keys._
@@ -148,10 +147,6 @@ object CoursierPlugin extends AutoPlugin {
   def coursierSettings(
     shadedConfigOpt: Option[(String, Configuration)] = None
   ): Seq[Setting[_]] = hackHack ++ Seq(
-    clean := {
-      val noWarningPlz = clean.value
-      SbtCoursierCache.default.clear()
-    },
     coursierResolvers := RepositoriesTasks.coursierResolversTask.value,
     coursierRecursiveResolvers := RepositoriesTasks.coursierRecursiveResolversTask.value,
     coursierSbtResolvers := {
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/clean/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/build.sbt
rename to modules/sbt-coursier/src/sbt-test/shared-1/clean/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/Helper.scala b/modules/sbt-coursier/src/sbt-test/shared-1/clean/project/Helper.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/Helper.scala
rename to modules/sbt-coursier/src/sbt-test/shared-1/clean/project/Helper.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/clean/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/shared-1/clean/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/test b/modules/sbt-coursier/src/sbt-test/shared-1/clean/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/test
rename to modules/sbt-coursier/src/sbt-test/shared-1/clean/test