From 16bf1570ad5f9f05d231722bace8ab2d6c67ff44 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Thu, 25 Apr 2019 13:18:55 +0200 Subject: [PATCH] Rely on allExcludeDependencies when it's there It excludes sbt itself in meta-builds in particular, see https://github.com/coursier/coursier/issues/1128 --- .../sbtcoursiershared/InputsTasks.scala | 15 ++++++-- .../all-exclude-dependencies/build.sbt | 11 ++++++ .../all-exclude-dependencies/coursier | Bin 0 -> 11811 bytes .../project/build.properties | 1 + .../project/plugins.sbt | 13 +++++++ .../src/main/scala/Main.scala | 32 ++++++++++++++++++ .../shared-1/all-exclude-dependencies/test | 5 +++ .../sbtlmcoursier/LmCoursierPlugin.scala | 8 +++-- 8 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/build.sbt create mode 100755 modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/coursier create mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/project/build.properties create mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/project/plugins.sbt create mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/src/main/scala/Main.scala create mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/test diff --git a/modules/sbt-coursier-shared/src/main/scala/coursier/sbtcoursiershared/InputsTasks.scala b/modules/sbt-coursier-shared/src/main/scala/coursier/sbtcoursiershared/InputsTasks.scala index 3df31e4c2..6968b2970 100644 --- a/modules/sbt-coursier-shared/src/main/scala/coursier/sbtcoursiershared/InputsTasks.scala +++ b/modules/sbt-coursier-shared/src/main/scala/coursier/sbtcoursiershared/InputsTasks.scala @@ -5,15 +5,26 @@ import lmcoursier.definitions.{Attributes, Classifier, Configuration, Dependency import lmcoursier.{FallbackDependency, FromSbt, Inputs} import coursier.sbtcoursiershared.SbtCoursierShared.autoImport._ import coursier.sbtcoursiershared.Structure._ -import sbt.Def +import sbt.{Def, SettingKey} import sbt.Keys._ import sbt.librarymanagement.{InclExclRule, ModuleID} import sbt.util.Logger import scala.collection.JavaConverters._ +import scala.language.reflectiveCalls object InputsTasks { + lazy val actualExcludeDependencies = + try { + sbt.Keys + .asInstanceOf[{ def allExcludeDependencies: SettingKey[scala.Seq[InclExclRule]] }] + .allExcludeDependencies + } catch { + case _: NoSuchMethodException => + excludeDependencies + } + private def coursierProject0( projId: ModuleID, dependencies: Seq[ModuleID], @@ -56,7 +67,7 @@ object InputsTasks { coursierProject0( projectID.in(projectRef).get(state), allDependenciesTask.value, - excludeDependencies.in(projectRef).get(state), + actualExcludeDependencies.in(projectRef).get(state), // should projectID.configurations be used instead? ivyConfigurations.in(projectRef).get(state), scalaVersion.in(projectRef).get(state), diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/build.sbt new file mode 100644 index 000000000..8c2b3c509 --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/build.sbt @@ -0,0 +1,11 @@ + +scalaVersion := "2.11.8" + +organization := "io.get-coursier.test" +name := "sbt-coursier-all-exclude-dependencies" +version := "0.1.0-SNAPSHOT" + +libraryDependencies += "com.github.alexarchambault" %% "argonaut-shapeless_6.1" % "1.0.0-RC1" + +allExcludeDependencies += sbt.ExclusionRule("com.chuusai", "shapeless_2.11") +allExcludeDependencies += "io.argonaut" %% "argonaut" diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/coursier b/modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/coursier new file mode 100755 index 0000000000000000000000000000000000000000..6cada6f8bfeee885fead8a7cbfbeab130ad6b10f GIT binary patch literal 11811 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 run +$ exists output +> publishLocal +$ exec java -jar coursier launch io.get-coursier.test:sbt-coursier-all-exclude-dependencies_2.11:0.1.0-SNAPSHOT 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 54938743f..995d86c1b 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 @@ -3,13 +3,15 @@ package coursier.sbtlmcoursier import lmcoursier.definitions.Authentication import lmcoursier.{CoursierConfiguration, CoursierDependencyResolution, Inputs} import coursier.sbtcoursiershared.InputsTasks.credentialsTask -import coursier.sbtcoursiershared.SbtCoursierShared +import coursier.sbtcoursiershared.{InputsTasks, SbtCoursierShared} import sbt.{AutoPlugin, Classpaths, Def, Setting, Task, taskKey} import sbt.Project.inTask import sbt.KeyRanks.DTask -import sbt.Keys.{appConfiguration, autoScalaLibrary, classpathTypes, dependencyResolution, excludeDependencies, scalaBinaryVersion, scalaModuleInfo, scalaOrganization, scalaVersion, streams, updateClassifiers, updateSbtClassifiers} +import sbt.Keys.{appConfiguration, autoScalaLibrary, classpathTypes, dependencyResolution, scalaBinaryVersion, scalaModuleInfo, scalaOrganization, scalaVersion, streams, updateClassifiers, updateSbtClassifiers} import sbt.librarymanagement.DependencyResolution +import scala.language.reflectiveCalls + object LmCoursierPlugin extends AutoPlugin { import SbtCoursierShared.autoImport._ @@ -78,7 +80,7 @@ object LmCoursierPlugin extends AutoPlugin { val scalaVer = scalaVersion.value val interProjectDependencies = coursierInterProjectDependencies.value val excludeDeps = Inputs.exclusions( - excludeDependencies.value, + InputsTasks.actualExcludeDependencies.value, scalaVer, scalaBinaryVersion.value, streams.value.log