Bump Mill to 0.11.0 (#67)

Author: lihaoyi

.github/workflows/actions.yml

@@ -26,7 +26,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
       - name: Run tests
-        run: ./mill -i all __.publishArtifacts __.test
+        run: ./mill -i __.publishArtifacts + __.test
   check-binary-compatibility:
     runs-on: ubuntu-latest
     steps:

.mill-version

@@ -1 +1,2 @@
-0.10.12
+0.11.0
+

build.sc

@@ -1,9 +1,9 @@
 import mill._, scalalib._, scalajslib._, scalanativelib._, publish._
 import mill.scalalib.api.ZincWorkerUtil.isScala3
-import scalalib._
-import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.3.1`
+import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`
+import $ivy.`com.github.lolgab::mill-mima::0.0.23`
 import de.tobiasroeser.mill.vcs.version.VcsVersion
-import $ivy.`com.github.lolgab::mill-mima::0.0.22`
+
 import com.github.lolgab.mill.mima._
 
 val scala212 = "2.12.17"
@@ -15,21 +15,19 @@ val acyclic = "0.3.8"
 
 val scalaVersions = List(scala212, scala213, scala3)
 
-val scalaJSVersions = scalaVersions.map((_, "1.10.1"))
-val scalaNativeVersions = scalaVersions.map((_, "0.4.7"))
+trait MainArgsPublishModule
+  extends PublishModule
+    with CrossScalaModule
+    with Mima
+    with PlatformScalaModule {
 
-trait MainArgsPublishModule extends PublishModule with CrossScalaModule with Mima {
   def publishVersion = VcsVersion.vcsState().format()
-  override def mimaPreviousVersions =
-    Seq("0.5.0")
 
-  override def mimaPreviousArtifacts: T[Agg[Dep]] = T {
-    if (mimaPreviousVersions().isEmpty) Agg.empty[Dep] else super.mimaPreviousArtifacts()
-  }
+  override def mimaPreviousVersions = Seq("0.5.0")
+
 
   override def versionScheme: T[Option[VersionScheme]] = T(Some(VersionScheme.EarlySemVer))
 
-  override def artifactName = "mainargs"
   def pomSettings = PomSettings(
     description = "Main method argument parser for Scala",
     organization = "com.lihaoyi",
@@ -41,21 +39,20 @@ trait MainArgsPublishModule extends PublishModule with CrossScalaModule with Mim
     )
   )
 
-  def scalacOptions = super.scalacOptions() ++ (if (!isScala3(crossScalaVersion))
-                                                  Seq("-P:acyclic:force")
-                                                else Seq.empty)
+  def scalacOptions =
+    super.scalacOptions() ++
+    Option.when(!isScala3(scalaVersion()))("-P:acyclic:force")
 
   def scalacPluginIvyDeps =
-    super.scalacPluginIvyDeps() ++ (if (!isScala3(crossScalaVersion))
-                                      Agg(ivy"com.lihaoyi:::acyclic:${acyclic}")
-                                    else Agg.empty)
+    super.scalacPluginIvyDeps() ++
+    Option.when(!isScala3(scalaVersion()))(ivy"com.lihaoyi:::acyclic:${acyclic}")
 
   def compileIvyDeps =
-    super.compileIvyDeps() ++ (if (!isScala3(crossScalaVersion)) Agg(
-                                 ivy"com.lihaoyi:::acyclic:${acyclic}",
-                                 ivy"org.scala-lang:scala-reflect:$crossScalaVersion"
-                               )
-                               else Agg.empty)
+    super.compileIvyDeps() ++
+    Agg.when(!isScala3(crossScalaVersion))(
+      ivy"com.lihaoyi:::acyclic:${acyclic}",
+      ivy"org.scala-lang:scala-reflect:$crossScalaVersion"
+    )
 
   def ivyDeps = Agg(
     ivy"org.scala-lang.modules::scala-collection-compat::2.8.1"
@@ -64,64 +61,36 @@ trait MainArgsPublishModule extends PublishModule with CrossScalaModule with Mim
 
 def scalaMajor(scalaVersion: String) = if (isScala3(scalaVersion)) "3" else "2"
 
-trait Common extends CrossScalaModule {
-  def millSourcePath = build.millSourcePath / "mainargs"
-  def sources = T.sources(
-    millSourcePath / "src",
-    millSourcePath / s"src-$platform",
-    millSourcePath / s"src-${scalaMajor(scalaVersion())}",
-    millSourcePath / s"src-${platform}-${scalaMajor(scalaVersion())}"
-  )
-  def platform: String
-}
-
 trait CommonTestModule extends ScalaModule with TestModule.Utest {
   def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.8.1")
-  def sources = T.sources(
-    millSourcePath / "src",
-    millSourcePath / s"src-$platform",
-    millSourcePath / s"src-${scalaMajor(scalaVersion())}",
-    millSourcePath / s"src-${platform}-${scalaMajor(scalaVersion())}"
-  )
-  def platform: String
 }
 
 object mainargs extends Module {
-  object jvm extends Cross[JvmMainArgsModule](scalaVersions: _*)
-  class JvmMainArgsModule(val crossScalaVersion: String)
-      extends Common with ScalaModule with MainArgsPublishModule {
-    def platform = "jvm"
-    object test extends Tests with CommonTestModule {
-      def platform = "jvm"
+  object jvm extends Cross[JvmMainArgsModule](scalaVersions)
+  trait JvmMainArgsModule extends MainArgsPublishModule {
+    object test extends ScalaTests with CommonTestModule {
       def ivyDeps = super.ivyDeps() ++ Agg(ivy"com.lihaoyi::os-lib:${osLib}")
     }
   }
 
-  object js extends Cross[JSMainArgsModule](scalaJSVersions: _*)
-  class JSMainArgsModule(val crossScalaVersion: String, crossJSVersion: String)
-      extends Common with MainArgsPublishModule with ScalaJSModule {
-    def platform = "js"
-    def scalaJSVersion = crossJSVersion
-    object test extends Tests with CommonTestModule {
-      def platform = "js"
-    }
+  object js extends Cross[JSMainArgsModule](scalaVersions)
+  trait JSMainArgsModule extends MainArgsPublishModule with ScalaJSModule {
+    def scalaJSVersion = "1.10.1"
+    object test extends ScalaJSTests with CommonTestModule
   }
 
-  object native extends Cross[NativeMainArgsModule](scalaNativeVersions: _*)
-  class NativeMainArgsModule(val crossScalaVersion: String, crossScalaNativeVersion: String)
-      extends Common with MainArgsPublishModule with ScalaNativeModule {
-    def scalaNativeVersion = crossScalaNativeVersion
-    def platform = "native"
-    object test extends Tests with CommonTestModule {
-      def platform = "native"
-    }
+  object native extends Cross[NativeMainArgsModule](scalaVersions)
+  trait NativeMainArgsModule extends MainArgsPublishModule with ScalaNativeModule {
+    def scalaNativeVersion = "0.4.7"
+    object test extends ScalaNativeTests with CommonTestModule
   }
 }
 
 trait ExampleModule extends ScalaModule {
   def scalaVersion = scala213
   def moduleDeps = Seq(mainargs.jvm(scala213))
 }
+
 object example {
   object hello extends ExampleModule
   object hello2 extends ExampleModule

mill

@@ -3,13 +3,18 @@
 # This is a wrapper script, that automatically download mill from GitHub release pages
 # You can give the required mill version with MILL_VERSION env variable
 # If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
-DEFAULT_MILL_VERSION=0.10.5
 
 set -e
 
+if [ -z "${DEFAULT_MILL_VERSION}" ] ; then
+  DEFAULT_MILL_VERSION=0.11.0
+fi
+
 if [ -z "$MILL_VERSION" ] ; then
   if [ -f ".mill-version" ] ; then
     MILL_VERSION="$(head -n 1 .mill-version 2> /dev/null)"
+  elif [ -f ".config/mill-version" ] ; then
+    MILL_VERSION="$(head -n 1 .config/mill-version 2> /dev/null)"
   elif [ -f "mill" ] && [ "$0" != "mill" ] ; then
     MILL_VERSION=$(grep -F "DEFAULT_MILL_VERSION=" "mill" | head -n 1 | cut -d= -f2)
   else
@@ -35,15 +40,26 @@ if [ ! -s "$MILL_EXEC_PATH" ] ; then
   fi
   DOWNLOAD_FILE=$MILL_EXEC_PATH-tmp-download
   MILL_VERSION_TAG=$(echo $MILL_VERSION | sed -E 's/([^-]+)(-M[0-9]+)?(-.*)?/\1\2/')
-  MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION_TAG}/$MILL_VERSION${ASSEMBLY}"
+  MILL_DOWNLOAD_URL="https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/$MILL_VERSION/mill-dist-$MILL_VERSION.jar"
   curl --fail -L -o "$DOWNLOAD_FILE" "$MILL_DOWNLOAD_URL"
   chmod +x "$DOWNLOAD_FILE"
   mv "$DOWNLOAD_FILE" "$MILL_EXEC_PATH"
   unset DOWNLOAD_FILE
   unset MILL_DOWNLOAD_URL
 fi
 
+if [ -z "$MILL_MAIN_CLI" ] ; then
+  MILL_MAIN_CLI="${0}"
+fi
+
+MILL_FIRST_ARG=""
+if [ "$1" = "--bsp" ] || [ "$1" = "-i" ] || [ "$1" = "--interactive" ] || [ "$1" = "--no-server" ] || [ "$1" = "--repl" ] || [ "$1" = "--help" ] ; then
+  # Need to preserve the first position of those listed options
+  MILL_FIRST_ARG=$1
+  shift
+fi
+
 unset MILL_DOWNLOAD_PATH
 unset MILL_VERSION
 
-exec $MILL_EXEC_PATH "$@"
+exec $MILL_EXEC_PATH $MILL_FIRST_ARG -D "mill.main.cli=${MILL_MAIN_CLI}" "$@"