From a592ee587ab3b722d57bb8df644f7095333538eb Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 20 Nov 2018 17:49:20 +0100 Subject: [PATCH] Move more stuff from sbt-coursier to sbt-coursier-shared So that these are picked by sbt-lm-coursier too --- .../coursier/sbtcoursiershared/SbtCoursierShared.scala | 7 +++++-- .../main/scala/coursier/sbtcoursier/CoursierPlugin.scala | 5 +---- .../classifiers/build.sbt | 0 .../classifiers/project/plugins.sbt | 0 .../classifiers/src/main/scala/Main.scala | 5 +++-- .../{sbt-coursier-group-1 => shared-1}/classifiers/test | 0 6 files changed, 9 insertions(+), 8 deletions(-) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/classifiers/build.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/classifiers/project/plugins.sbt (100%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/classifiers/src/main/scala/Main.scala (59%) rename modules/sbt-coursier/src/sbt-test/{sbt-coursier-group-1 => shared-1}/classifiers/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 401299164..af500deb7 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 @@ -3,7 +3,7 @@ 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 +import sbt.Keys.{classpathTypes, clean} object SbtCoursierShared extends AutoPlugin { @@ -32,7 +32,10 @@ object SbtCoursierShared extends AutoPlugin { coursierGenerateIvyXml := true, coursierProject := InputsTasks.coursierProjectTask.value, coursierInterProjectDependencies := InputsTasks.coursierInterProjectDependenciesTask.value, - publicationsSetting(Seq(Compile, Test).map(c => c -> Configuration(c.name))) + publicationsSetting(Seq(Compile, Test).map(c => c -> Configuration(c.name))), + // Tests artifacts from Maven repositories are given this type. + // Adding it here so that these work straightaway. + classpathTypes += "test-jar" ) ++ IvyXml.generateIvyXmlSettings() 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 59c87f55e..e51212fa4 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala @@ -265,10 +265,7 @@ object CoursierPlugin extends AutoPlugin { ) confs ++ extraSources.toSeq ++ extraDocs.toSeq - }, - // Tests artifacts from Maven repositories are given this type. - // Adding it here so that these work straightaway. - classpathTypes += "test-jar" + } ) override lazy val buildSettings = super.buildSettings ++ Seq( diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/classifiers/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-1/classifiers/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/classifiers/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-1/classifiers/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-1/classifiers/src/main/scala/Main.scala similarity index 59% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-1/classifiers/src/main/scala/Main.scala index 7fedd9551..b1a40797d 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/src/main/scala/Main.scala +++ b/modules/sbt-coursier/src/sbt-test/shared-1/classifiers/src/main/scala/Main.scala @@ -11,7 +11,8 @@ object Main extends App { .loadClass(clsName) ).toOption.nonEmpty - val classifierTest = classFound("org.jclouds.openstack.nova.functions.ParseServerFromJsonResponseTest") + val name = "org.jclouds.openstack.nova.functions.ParseServerFromJsonResponseTest" + val classifierTest = classFound(name) - assert(classifierTest, s"Couldn't find classifierTest") + assert(classifierTest, s"Couldn't find $name") } diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/test b/modules/sbt-coursier/src/sbt-test/shared-1/classifiers/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/test rename to modules/sbt-coursier/src/sbt-test/shared-1/classifiers/test