diff --git a/scalalib/src/MiscModule.scala b/scalalib/src/MiscModule.scala index bf64f1f3714..edb2d156882 100644 --- a/scalalib/src/MiscModule.scala +++ b/scalalib/src/MiscModule.scala @@ -16,6 +16,7 @@ trait CrossModuleBase extends ScalaModule { def scalaVersion = T{ crossScalaVersion } override def millSourcePath = super.millSourcePath / ammonite.ops.up + override def artifactName: T[String] = millModuleSegments.parts.init.mkString("-") implicit def crossSbtModuleResolver: Resolver[CrossModuleBase] = new Resolver[CrossModuleBase]{ def resolve[V <: CrossModuleBase](c: Cross[V]): V = { crossScalaVersion.split('.') diff --git a/scalalib/test/src/HelloWorldTests.scala b/scalalib/test/src/HelloWorldTests.scala index 4b509465955..a1ce8a7b40f 100644 --- a/scalalib/test/src/HelloWorldTests.scala +++ b/scalalib/test/src/HelloWorldTests.scala @@ -492,6 +492,13 @@ object HelloWorldTests extends TestSuite { } } + 'artifactNameCross - { + workspaceTest(CrossHelloWorld) { eval => + val Right((artifactName, _)) = eval.apply(CrossHelloWorld.core("2.13.1").artifactName) + assert(artifactName == "core") + } + } + 'runMain - { 'runMainObject - workspaceTest(HelloWorld){eval => val runResult = eval.outPath / 'core / 'runMain / 'dest / "hello-mill"