more fixes for sonatype central compat

Author: lihaoyi

build.mill

@@ -422,6 +422,17 @@ trait MillJavaModule extends JavaModule {
 }
 
 trait MillPublishJavaModule extends MillJavaModule with PublishModule {
+
+  def artifactName = "mill-" + super.artifactName()
+  def publishVersion = millVersion()
+  def publishProperties = super.publishProperties() ++ Map(
+    "info.releaseNotesURL" -> Settings.changelogUrl
+  )
+  def pomSettings = MillPublishJavaModule.commonPomSettings(artifactName())
+  def javacOptions = Seq("-source", "1.8", "-target", "1.8", "-encoding", "UTF-8")
+}
+
+object MillPublishJavaModule {
   def commonPomSettings(artifactName: String) = {
     PomSettings(
       description = artifactName,
@@ -436,15 +447,7 @@ trait MillPublishJavaModule extends MillJavaModule with PublishModule {
     )
   }
 
-  def artifactName = "mill-" + super.artifactName()
-  def publishVersion = millVersion()
-  def publishProperties = super.publishProperties() ++ Map(
-    "info.releaseNotesURL" -> Settings.changelogUrl
-  )
-  def pomSettings = commonPomSettings(artifactName())
-  def javacOptions = Seq("-source", "1.8", "-target", "1.8", "-encoding", "UTF-8")
 }
-
 /**
  * Some custom scala settings and test convenience
  */
@@ -641,7 +644,7 @@ trait BridgeModule extends MillPublishCrossScalaModule {
   def scalaVersion = crossScalaVersion
   def publishVersion = bridgeVersion
   def artifactName = "mill-scala-compiler-bridge"
-  def pomSettings = commonPomSettings(artifactName())
+  def pomSettings = MillPublishJavaModule.commonPomSettings(artifactName())
   def crossFullScalaVersion = true
   def ivyDeps = Agg(
     ivy"org.scala-sbt:compiler-interface:${Deps.zinc.version}",

dist/package.mill

@@ -15,7 +15,6 @@ trait InstallModule extends build.MillPublishJavaModule {
   }
   def moduleDeps = Seq(build.runner, build.idea, build.main.init)
 
-  def jar = executableRaw()
   def executableRaw: T[PathRef]
 
   def executable = Task {
@@ -60,6 +59,45 @@ trait InstallModule extends build.MillPublishJavaModule {
     )
     targetFile
   }
+
+  def artifact = Task {
+    Artifact(build.Settings.pomOrg, artifactName(), build.millVersion())
+  }
+
+  def pomSettings = Task {
+    build.MillPublishJavaModule.commonPomSettings(artifactName())
+  }
+
+  def artifactFileNamePrefix = Task {
+    s"${artifactName()}-${build.millVersion()}"
+  }
+
+  def pom: T[PathRef] = Task {
+    val pom = Pom(
+      artifact = artifact(),
+      dependencies = Nil,
+      name = artifactName(),
+      pomSettings = pomSettings(),
+      properties = Map(),
+      packagingType = "jar",
+      parentProject = None,
+      bomDependencies = Nil,
+      dependencyManagement = Nil
+    )
+    val pomPath = Task.dest / s"${artifactFileNamePrefix()}.pom"
+    os.write.over(pomPath, pom)
+    PathRef(pomPath)
+  }
+
+  def publishArtifacts = Task {
+    PublishModule.PublishData(
+      meta = artifact(),
+      payload = Seq(
+        executableRaw() -> s"${artifactFileNamePrefix()}.exe",
+        pom() -> s"${artifactFileNamePrefix()}.pom"
+      )
+    )
+  }
 }
 
 object `package` extends RootModule with InstallModule {
@@ -233,20 +271,20 @@ object `package` extends RootModule with InstallModule {
     prepareBootstrapLauncher(millBootstrapBat().path, Task.dest, build.millVersion(), "mill.bat")
   }
 
-  def examplePathsWithArtifactName: Task[Seq[(os.Path, String)]] = Task.Anon {
+  def examplePathsWithArtifactName: Task[Seq[(PathRef, String)]] = Task.Anon {
     for {
       exampleMod <- build.example.exampleModules
       path = exampleMod.millSourcePath
     } yield {
       val example = path.subRelativeTo(Task.workspace)
       val artifactName = example.segments.mkString("-")
-      (path, artifactName)
+      (PathRef(path), artifactName)
     }
   }
 
   def exampleZips: T[Seq[PathRef]] = Task {
     examplePathsWithArtifactName().map { case (examplePath, exampleStr) =>
-      os.copy(examplePath, Task.dest / exampleStr, createFolders = true)
+      os.copy(examplePath.path, Task.dest / exampleStr, createFolders = true)
       os.write(Task.dest / exampleStr / ".mill-version", build.millLastTag())
       os.copy(bootstrapLauncher().path, Task.dest / exampleStr / "mill")
       os.copy(bootstrapLauncherBat().path, Task.dest / exampleStr / "mill.bat")
@@ -257,12 +295,14 @@ object `package` extends RootModule with InstallModule {
   }
 
   def publishArtifacts = Task {
-    super.publishArtifacts()
-      .copy(payload =
-        super.publishArtifacts().payload ++
-          exampleZips().map(z => (z, z.path.last)) ++
-          Seq((bootstrapLauncher(), "mill"), (bootstrapLauncherBat(), "mill.bat"))
-      )
+    super.publishArtifacts().copy(payload =
+      super.publishArtifacts().payload ++
+        exampleZips().map(z => (z, s"${artifactFileNamePrefix()}-${z.path.last}")) ++
+        Seq(
+          (bootstrapLauncher(), s"${artifactFileNamePrefix()}-mill.sh"),
+          (bootstrapLauncherBat(), s"${artifactFileNamePrefix()}-mill.bat")
+        )
+    )
   }
 
   def uploadToGithub(authKey: String) = Task.Command {

docs/modules/ROOT/pages/cli/installation-ide.adoc

@@ -20,15 +20,15 @@ bootstrap script, included. You can also download the boostrap script manually:
 .Mac/Linux
 [source,console,subs="verbatim,attributes"]
 ----
-> curl -L {mill-download-url}/mill -o mill
+> curl -L {mill-download-url}/mill-dist-{mill-version}-mill.sh -o mill
 > chmod +x mill
 > echo {mill-version} > .mill-version
 ----
 
 .Windows
 [source,console,subs="verbatim,attributes"]
 ----
-> curl -L {mill-download-url}/mill.bat -o mill.bat
+> curl -L {mill-download-url}/mill-dist-{mill-version}-mill.bat -o mill.bat
 > echo {mill-version}> .mill-version
 ----
 

main/init/package.mill

@@ -15,9 +15,10 @@ object `package` extends RootModule with build.MillPublishScalaModule {
 
   def exampleList: T[PathRef] = Task {
     val data: Seq[(os.SubPath, String)] =
-      build.dist.examplePathsWithArtifactName().map { case (path, str) =>
-        val downloadUrl = s"${build.millDownloadUrl()}/$str.zip"
-        val subPath = path.subRelativeTo(Task.workspace / "example")
+      build.dist.examplePathsWithArtifactName().map { case (pathRef, str) =>
+        val downloadUrl =
+          s"${build.millDownloadUrl()}/mill-dist-${build.dist.artifactFileNamePrefix()}-$str.zip"
+        val subPath = pathRef.path.subRelativeTo(Task.workspace / "example")
         (subPath, downloadUrl)
       }