From b428c06e265f021391a15362809152cc298ecdb1 Mon Sep 17 00:00:00 2001 From: Mirco Dotta Date: Wed, 7 Jun 2017 17:13:11 +0200 Subject: [PATCH] Test resolution for distinct configurations is run separately. The original issue was likely resolved in 8002910a433fa21e40faa072408ad2448b440383 --- .../config-deps-resolution/build.sbt | 5 +++++ .../project/plugins.sbt | 11 +++++++++++ .../project/src/main/scala/sbt/MyPlugin.scala | 19 +++++++++++++++++++ .../src/main/scala/App.scala | 6 ++++++ .../sbt-coursier/config-deps-resolution/test | 2 ++ 5 files changed, 43 insertions(+) create mode 100644 sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/build.sbt create mode 100644 sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/project/plugins.sbt create mode 100644 sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala create mode 100644 sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/src/main/scala/App.scala create mode 100644 sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/test diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/build.sbt new file mode 100644 index 000000000..a764c1f42 --- /dev/null +++ b/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/build.sbt @@ -0,0 +1,5 @@ +name := "config-deps-resolution" +libraryDependencies ++= Seq( + "org.slf4j" % "slf4j-api" % "1.7.2", + "ch.qos.logback" % "logback-classic" % "1.1.1" +) diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/project/plugins.sbt new file mode 100644 index 000000000..152225a9e --- /dev/null +++ b/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/project/plugins.sbt @@ -0,0 +1,11 @@ +{ + val pluginVersion = sys.props.getOrElse( + "plugin.version", + throw new RuntimeException( + """|The system property 'plugin.version' is not defined. + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) + ) + + addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) +} diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala b/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala new file mode 100644 index 000000000..342c802a9 --- /dev/null +++ b/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala @@ -0,0 +1,19 @@ +package sbt + +import sbt._ +import Keys._ + +object MyPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + val FooConfig = config("foo") + + override def projectSettings = Seq( + libraryDependencies ++= Seq( + "org.slf4j" % "slf4j-api" % "1.7.0", + "ch.qos.logback" % "logback-classic" % "1.1.7" + ).map(_ % FooConfig), + ivyConfigurations += FooConfig + ) +} diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/src/main/scala/App.scala b/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/src/main/scala/App.scala new file mode 100644 index 000000000..4949c6dac --- /dev/null +++ b/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/src/main/scala/App.scala @@ -0,0 +1,6 @@ +import ch.qos.logback.classic.BasicConfigurator +import ch.qos.logback.classic.LoggerContext + +object GcMetricsApp extends App { + BasicConfigurator.configure(new LoggerContext()) +} diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/test b/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/test new file mode 100644 index 000000000..8a33e63a9 --- /dev/null +++ b/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/test @@ -0,0 +1,2 @@ +> compile +