From 81ae1dca4a3e659eafa0ac626d7f679923307532 Mon Sep 17 00:00:00 2001
From: Joan Goyeau <joan@goyeau.com>
Date: Wed, 21 Oct 2020 01:37:14 -0700
Subject: [PATCH] Omit the suffix in artifactName for cross modules (#953)

Pull request: https://github.com/lihaoyi/mill/pull/953
---
 scalalib/src/MiscModule.scala           | 1 +
 scalalib/test/src/HelloWorldTests.scala | 7 +++++++
 2 files changed, 8 insertions(+)

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"