From caa1123c1fe9f354b5099038c8fe13e37e6899f1 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Fri, 29 May 2020 15:53:47 +0200 Subject: [PATCH] Set csrConfiguration too, in sbt-lm-coursier sbt-lm-coursier uses its own coursierConfiguration, rather than csrConfiguration from sbt. Setting the latter just-in-case some other plugin, or users, rely on csrConfiguration. --- .../sbtlmcoursier/LmCoursierPlugin.scala | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/sbt-lm-coursier/src/main/scala/coursier/sbtlmcoursier/LmCoursierPlugin.scala b/modules/sbt-lm-coursier/src/main/scala/coursier/sbtlmcoursier/LmCoursierPlugin.scala index 00c4be4e1..fb7041b92 100644 --- a/modules/sbt-lm-coursier/src/main/scala/coursier/sbtlmcoursier/LmCoursierPlugin.scala +++ b/modules/sbt-lm-coursier/src/main/scala/coursier/sbtlmcoursier/LmCoursierPlugin.scala @@ -62,6 +62,7 @@ object LmCoursierPlugin extends AutoPlugin { Def.task(sbt.hack.Foo.updateTask(lm).value) }.value ) ++ + setCsrConfiguration ++ inTask(updateClassifiers)( Seq( dependencyResolution := mkDependencyResolution.value, @@ -86,6 +87,21 @@ object LmCoursierPlugin extends AutoPlugin { } } + private def setCsrConfiguration: Seq[Setting[_]] = { + val csrConfigurationOpt = try { + val key = sbt.Keys.asInstanceOf[{ + def csrConfiguration: TaskKey[CoursierConfiguration] + }].csrConfiguration + Some(key) + } catch { + case _: NoSuchMethodException => + None + } + + csrConfigurationOpt.toSeq.map { csrConfiguration => + csrConfiguration := coursierConfiguration.value + } + } private def mkCoursierConfiguration(withClassifiers: Boolean = false, sbtClassifiers: Boolean = false): Def.Initialize[Task[CoursierConfiguration]] = Def.taskDyn {