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 bb39dfe19..e54f3671c 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 @@ -128,12 +128,18 @@ object InputsTasks { .toVector .map { case (module, v) => + val configurations = v + .getConfigurations + .map { c => + Configuration(c.getName) -> c.getExtends.map(Configuration(_)).toSeq + } + .toMap val deps = v.getDependencies.flatMap(dependencyFromIvy) Project( module, v.getModuleRevisionId.getRevision, deps, - Map(), + configurations, None, Nil, Nil, diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/global-plugins/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/global-plugins/build.sbt new file mode 100644 index 000000000..5642f168f --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/shared-1/global-plugins/build.sbt @@ -0,0 +1 @@ +scalaVersion := "2.12.8" diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/global-plugins/global/plugins/metals.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/global-plugins/global/plugins/metals.sbt new file mode 100644 index 000000000..8aae08736 --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/shared-1/global-plugins/global/plugins/metals.sbt @@ -0,0 +1,2 @@ +addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.2.5") +addSbtPlugin("org.scalameta" % "sbt-metals" % "0.4.4") diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/global-plugins/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/global-plugins/project/plugins.sbt new file mode 100644 index 000000000..3a2d48ea4 --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/shared-1/global-plugins/project/plugins.sbt @@ -0,0 +1 @@ +addSbtCoursier diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/global-plugins/project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/global-plugins/project/project/plugins.sbt new file mode 100644 index 000000000..71a44ffd3 --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/shared-1/global-plugins/project/project/plugins.sbt @@ -0,0 +1,13 @@ +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( + "plugin.version", + sys.error("plugin.version Java property not set") + ) + + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/global-plugins/test b/modules/sbt-coursier/src/sbt-test/shared-1/global-plugins/test new file mode 100644 index 000000000..67a8b1ff1 --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/shared-1/global-plugins/test @@ -0,0 +1,2 @@ +> metalsEnable +> bloopInstall