avoid recursion

5 files changed, 13 insertions, 13 deletions

diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
index 59b7cc63..dbf693ff 100644
--- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
+++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
@@ -150,9 +150,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
     else scalaJSBinaryVersion()
   }
 
-  override def artifactSuffix: T[String] = T {
-    s"_sjs${artifactScalaJSVersion()}_${artifactScalaVersion()}"
-  }
+  override def artifactSuffix: T[String] = s"${platformSuffix()}_${artifactScalaVersion()}"
 
   override def platformSuffix = s"_sjs${artifactScalaJSVersion()}"
 
diff --git a/scalalib/src/mill/scalalib/JavaModule.scala b/scalalib/src/mill/scalalib/JavaModule.scala
index 90ce7058..e2b461b5 100644
--- a/scalalib/src/mill/scalalib/JavaModule.scala
+++ b/scalalib/src/mill/scalalib/JavaModule.scala
@@ -277,4 +277,6 @@ trait JavaModule extends mill.Module with TaskModule { outer =>
   // publish artifact with name "mill_2.12.4" instead of "mill_2.12"
 
   def artifactName: T[String] = millModuleSegments.parts.mkString("-")
+
+  def artifactId: T[String] = artifactName()
 }
\ No newline at end of file
diff --git a/scalalib/src/mill/scalalib/PublishModule.scala b/scalalib/src/mill/scalalib/PublishModule.scala
index bafcb73a..2ab81269 100644
--- a/scalalib/src/mill/scalalib/PublishModule.scala
+++ b/scalalib/src/mill/scalalib/PublishModule.scala
@@ -18,7 +18,7 @@ trait PublishModule extends JavaModule { outer =>
   def publishVersion: T[String]
 
   def publishSelfDependency = T{
-    Artifact(pomSettings().organization, artifactName(), publishVersion()),
+    Artifact(pomSettings().organization, artifactId(), publishVersion()),
   }
 
   def publishXmlDeps = T.task{
@@ -27,8 +27,8 @@ trait PublishModule extends JavaModule { outer =>
     ivyPomDeps ++ modulePomDeps.map(Dependency(_, Scope.Compile))
   }
   def pom = T {
-    val pom = Pom(artifactMetadata(), publishXmlDeps(), artifactName(), pomSettings())
-    val pomPath = T.ctx().dest / s"${artifactName()}-${publishVersion()}.pom"
+    val pom = Pom(artifactMetadata(), publishXmlDeps(), artifactId(), pomSettings())
+    val pomPath = T.ctx().dest / s"${artifactId()}-${publishVersion()}.pom"
     write.over(pomPath, pom)
     PathRef(pomPath)
   }
@@ -41,7 +41,7 @@ trait PublishModule extends JavaModule { outer =>
   }
 
   def artifactMetadata: T[Artifact] = T {
-    Artifact(pomSettings().organization, artifactName(), publishVersion())
+    Artifact(pomSettings().organization, artifactId(), publishVersion())
   }
 
   def publishLocal(): define.Command[Unit] = T.command {
@@ -60,7 +60,7 @@ trait PublishModule extends JavaModule { outer =>
   def sonatypeSnapshotUri: String = "https://oss.sonatype.org/content/repositories/snapshots"
 
   def publishArtifacts = T{
-    val baseName = s"${artifactName()}-${publishVersion()}"
+    val baseName = s"${artifactId()}-${publishVersion()}"
     PublishModule.PublishData(
       artifactMetadata(),
       Seq(
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala
index 69a06efb..5d71a1a9 100644
--- a/scalalib/src/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/mill/scalalib/ScalaModule.scala
@@ -68,7 +68,7 @@ trait ScalaModule extends JavaModule { outer =>
 
     resolveDependencies(
       repositories,
-      Lib.depToDependency(_, scalaVersion(), platformSuffix()),
+      Lib.depToDependency(_, scalaVersion0, platformSuffix()),
       Seq(ivy"org.scala-sbt::compiler-bridge:1.1.0"),
       sources = true
     ).map(_.find(_.path.last == s"compiler-bridge_${scalaBinaryVersion0}-1.1.0-sources.jar").map(_.path).get)
@@ -185,8 +185,10 @@ trait ScalaModule extends JavaModule { outer =>
     else Lib.scalaBinaryVersion(scalaVersion())
   }
 
-  def artifactSuffix: T[String] = T { s"_${artifactScalaVersion()}" }
-  override def artifactName: T[String] = T { s"${artifactName()}${artifactSuffix()}" }
+  def artifactSuffix: T[String] = s"_${artifactScalaVersion()}"
+
+  override def artifactId: T[String] = artifactName() + artifactSuffix()
+
 }
 
 
diff --git a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
index d6980314..21589766 100644
--- a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
+++ b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
@@ -476,6 +476,4 @@ object HelloWorldTests extends TestSuite {
       }
     }
   }
-
-
 }