From 1f5c66413f68afcff4ce5be080d00aee8d5b4637 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 7 Jul 2019 18:21:11 -0400 Subject: [PATCH] set default name to id --- src/main/scala/sbt/ProjectMatrix.scala | 1 + src/sbt-test/projectMatrix/jvm/build.sbt | 6 +++++- src/sbt-test/projectMatrix/jvm/test | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/scala/sbt/ProjectMatrix.scala b/src/main/scala/sbt/ProjectMatrix.scala index 3bc51aca0..b3a945d10 100644 --- a/src/main/scala/sbt/ProjectMatrix.scala +++ b/src/main/scala/sbt/ProjectMatrix.scala @@ -149,6 +149,7 @@ object ProjectMatrix { .setPlugins(plugins) .configs(configurations: _*) .settings( + name := self.id, Keys.scalaVersion := sv, target := base.getAbsoluteFile / "target" / svDirSuffix.dropWhile(_ == '-'), crossTarget := Keys.target.value, diff --git a/src/sbt-test/projectMatrix/jvm/build.sbt b/src/sbt-test/projectMatrix/jvm/build.sbt index 7cf2133f6..f5e6ae67e 100644 --- a/src/sbt-test/projectMatrix/jvm/build.sbt +++ b/src/sbt-test/projectMatrix/jvm/build.sbt @@ -1,3 +1,5 @@ +lazy val check = taskKey[Unit]("") + // lazy val root = (project in file(".")) // .aggregate(core.projectRefs ++ app.projectRefs: _*) // .settings( @@ -5,7 +7,9 @@ lazy val core = (projectMatrix in file("core")) .settings( - name := "core" + check := { + assert(moduleName.value == "core", s"moduleName is ${moduleName.value}") + }, ) .jvmPlatform(scalaVersions = Seq("2.12.8", "2.11.12")) diff --git a/src/sbt-test/projectMatrix/jvm/test b/src/sbt-test/projectMatrix/jvm/test index 9873bfe86..a0ccaf5e7 100644 --- a/src/sbt-test/projectMatrix/jvm/test +++ b/src/sbt-test/projectMatrix/jvm/test @@ -2,3 +2,5 @@ $ exists core/target/jvm-2.12/classes/a/Core.class $ exists core/target/jvm-2.11/classes/a/Core.class + +> coreJVM2_12/check