diff --git a/plugin/src/main/scala-2.10/coursier/Tasks.scala b/plugin/src/main/scala-2.10/coursier/Tasks.scala index ed8aba015..d1a464985 100644 --- a/plugin/src/main/scala-2.10/coursier/Tasks.scala +++ b/plugin/src/main/scala-2.10/coursier/Tasks.scala @@ -267,14 +267,14 @@ object Tasks { rule => if ( rule.artifact != "*" || - rule.configurations.nonEmpty || - rule.crossVersion != sbt.CrossVersion.Disabled + rule.configurations.nonEmpty ) { log.warn(s"Unsupported exclusion rule $rule") anyNonSupportedExclusionRule = true Nil } else - Seq((rule.organization, rule.name)) + Seq((rule.organization, + FromSbt.sbtCrossVersionName(rule.name, rule.crossVersion, sv, sbv))) }.toSet if (anyNonSupportedExclusionRule) diff --git a/plugin/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt b/plugin/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt index 17832bca7..75d83d382 100644 --- a/plugin/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt +++ b/plugin/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt @@ -3,3 +3,4 @@ scalaVersion := "2.11.8" libraryDependencies += "com.github.alexarchambault" %% "argonaut-shapeless_6.1" % "1.0.0-RC1" excludeDependencies += SbtExclusionRule("com.chuusai", "shapeless_2.11") +excludeDependencies += "io.argonaut" %% "argonaut" diff --git a/plugin/src/sbt-test/sbt-coursier/exclude-dependencies/src/main/scala/Main.scala b/plugin/src/sbt-test/sbt-coursier/exclude-dependencies/src/main/scala/Main.scala index c8d199037..a2d8f92e8 100644 --- a/plugin/src/sbt-test/sbt-coursier/exclude-dependencies/src/main/scala/Main.scala +++ b/plugin/src/sbt-test/sbt-coursier/exclude-dependencies/src/main/scala/Main.scala @@ -12,10 +12,12 @@ object Main extends App { ).toOption.nonEmpty val shapelessFound = classFound("shapeless.HList") + val argonautFound = classFound("argonaut.Json") val argonautShapelessFound = classFound("argonaut.derive.MkEncodeJson") assert(argonautShapelessFound) assert(!shapelessFound) + assert(!argonautFound) Files.write(new File("output").toPath, "OK".getBytes("UTF-8")) }