Add scala JS version suffix to ivy deps for published JS ivy.xml (#376)

2 files changed, 10 insertions, 4 deletions

diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala
index 9262b6e0..3ce84088 100644
--- a/scalalib/src/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/mill/scalalib/ScalaModule.scala
@@ -38,7 +38,12 @@ trait ScalaModule extends JavaModule { outer =>
   }
 
   override def resolvePublishDependency: Task[Dep => publish.Dependency] = T.task{
-    publish.Artifact.fromDep(_: Dep, scalaVersion(), Lib.scalaBinaryVersion(scalaVersion()))
+    publish.Artifact.fromDep(
+      _: Dep,
+      scalaVersion(),
+      Lib.scalaBinaryVersion(scalaVersion()),
+      platformSuffix()
+    )
   }
 
   override def finalMainClassOpt: T[Either[String, String]] = T{
diff --git a/scalalib/src/mill/scalalib/publish/settings.scala b/scalalib/src/mill/scalalib/publish/settings.scala
index 2cd92eb2..9a59f09d 100644
--- a/scalalib/src/mill/scalalib/publish/settings.scala
+++ b/scalalib/src/mill/scalalib/publish/settings.scala
@@ -20,14 +20,15 @@ object Artifact {
   }
   def fromDep(dep: Dep,
               scalaFull: String,
-              scalaBin: String): Dependency = {
+              scalaBin: String,
+              platformSuffix: String): Dependency = {
     dep match {
       case d: Dep.Java => fromDepJava(d)
       case Dep.Scala(dep, cross, force) =>
         Dependency(
           Artifact(
             dep.module.organization,
-            s"${dep.module.name}_${scalaBin}",
+            s"${dep.module.name}${platformSuffix}_${scalaBin}",
             dep.version
           ),
           Scope.Compile,
@@ -38,7 +39,7 @@ object Artifact {
         Dependency(
           Artifact(
             dep.module.organization,
-            s"${dep.module.name}_${scalaFull}",
+            s"${dep.module.name}${platformSuffix}_${scalaFull}",
             dep.version
           ),
           Scope.Compile,