Updated mill and millw

Author: hmf

.bloop/bloop.settings.json

@@ -1,22 +1,23 @@
 {
-  "semanticDBVersion": "4.4.30",
-  "supportedScalaVersions": [
-      "2.13.7",
-      "2.12.15",
-      "2.12.14",
-      "2.12.13",
-      "2.12.12",
-      "2.12.11",
-      "2.13.4",
-      "2.13.5",
-      "2.13.6",
-      "2.11.12",
-      "2.12.8",
-      "2.12.9",
-      "2.12.10",
-      "2.13.0",
-      "2.13.1",
-      "2.13.2",
-      "2.13.3"
-  ]
+    "javaSemanticDBVersion": "0.7.4",
+    "semanticDBVersion": "4.5.0",
+    "supportedScalaVersions": [
+        "2.13.8",
+        "2.12.15",
+        "2.12.14",
+        "2.12.13",
+        "2.12.12",
+        "2.12.11",
+        "2.13.5",
+        "2.13.6",
+        "2.13.7",
+        "2.11.12",
+        "2.12.8",
+        "2.12.9",
+        "2.12.10",
+        "2.13.1",
+        "2.13.2",
+        "2.13.3",
+        "2.13.4"
+    ]
 }

.gitignore

@@ -3,4 +3,4 @@
 /.idea_modules/
 /.metals
 /.vscode
-/.bloop/
+/.bloop

mill

@@ -3,14 +3,14 @@
 # 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.5.6
+DEFAULT_MILL_VERSION=0.10.2
 
 set -e
 
 if [ -z "$MILL_VERSION" ] ; then
   if [ -f ".mill-version" ] ; then
     MILL_VERSION="$(head -n 1 .mill-version 2> /dev/null)"
-  elif [ -f "mill" ] && [ "$BASH_SOURCE" != "mill" ] ; then
+  elif [ -f "mill" ] && [ "$0" != "mill" ] ; then
     MILL_VERSION=$(grep -F "DEFAULT_MILL_VERSION=" "mill" | head -n 1 | cut -d= -f2)
   else
     MILL_VERSION=$DEFAULT_MILL_VERSION
@@ -28,13 +28,14 @@ version_remainder="$MILL_VERSION"
 MILL_MAJOR_VERSION="${version_remainder%%.*}"; version_remainder="${version_remainder#*.}"
 MILL_MINOR_VERSION="${version_remainder%%.*}"; version_remainder="${version_remainder#*.}"
 
-if [ ! -x "$MILL_EXEC_PATH" ] ; then
-  mkdir -p $MILL_DOWNLOAD_PATH
+if [ ! -s "$MILL_EXEC_PATH" ] ; then
+  mkdir -p "$MILL_DOWNLOAD_PATH"
   if [ "$MILL_MAJOR_VERSION" -gt 0 ] || [ "$MILL_MINOR_VERSION" -ge 5 ] ; then
     ASSEMBLY="-assembly"
   fi
   DOWNLOAD_FILE=$MILL_EXEC_PATH-tmp-download
-  MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION%%-*}/$MILL_VERSION${ASSEMBLY}"
+  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}"
   curl --fail -L -o "$DOWNLOAD_FILE" "$MILL_DOWNLOAD_URL"
   chmod +x "$DOWNLOAD_FILE"
   mv "$DOWNLOAD_FILE" "$MILL_EXEC_PATH"

millw

@@ -5,25 +5,25 @@
 # If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
 #
 # Project page: https://github.com/lefou/millw
-# Script Version: 0.4.0
+# Script Version: 0.4.2
 #
 # If you want to improve this script, please also contribute your changes back!
 #
 # Licensed under the Apache License, Version 2.0
 
 
-DEFAULT_MILL_VERSION=0.9.10
+DEFAULT_MILL_VERSION=0.10.0
 
 set -e
 
 MILL_REPO_URL="https://github.com/com-lihaoyi/mill"
 
-if [ "x${CURL_CMD}" = "x" ] ; then
+if [ -z "${CURL_CMD}" ] ; then
   CURL_CMD=curl
 fi
 
 # Explicit commandline argument takes precedence over all other methods
-if [ "x$1" = "x--mill-version" ] ; then
+if [ "$1" = "--mill-version" ] ; then
   shift
   if [ "x$1" != "x" ] ; then
     MILL_VERSION="$1"
@@ -40,20 +40,20 @@ fi
 # We reuse it's value and skip searching for a value.
 
 # If not already set, read .mill-version file
-if [ "x${MILL_VERSION}" = "x" ] ; then
+if [ -z "${MILL_VERSION}" ] ; then
   if [ -f ".mill-version" ] ; then
     MILL_VERSION="$(head -n 1 .mill-version 2> /dev/null)"
   fi
 fi
 
-if [ "x${XDG_CACHE_HOME}" != "x" ] ; then
+if [ -n "${XDG_CACHE_HOME}" ] ; then
   MILL_DOWNLOAD_PATH="${XDG_CACHE_HOME}/mill/download"
 else
   MILL_DOWNLOAD_PATH="${HOME}/.cache/mill/download"
 fi
 
 # If not already set, try to fetch newest from Github
-if [ "x${MILL_VERSION}" = "x" ] ; then
+if [ -z "${MILL_VERSION}" ] ; then
   # TODO: try to load latest version from release page
   echo "No mill version specified." 1>&2
   echo "You should provide a version via '.mill-version' file or --mill-version option." 1>&2
@@ -68,20 +68,22 @@ if [ "x${MILL_VERSION}" = "x" ] ; then
     # to show the (previously suppressed) error message
     LANG=C touch -d '1 hour ago' "${MILL_DOWNLOAD_PATH}/.expire_latest"
   )
-  
-  if [ "${MILL_DOWNLOAD_PATH}/.latest" -nt "${MILL_DOWNLOAD_PATH}/.expire_latest" ] ; then
+
+  # POSIX shell variant of bash's -nt operator, see https://unix.stackexchange.com/a/449744/6993
+  # if [ "${MILL_DOWNLOAD_PATH}/.latest" -nt "${MILL_DOWNLOAD_PATH}/.expire_latest" ] ; then
+  if [ -n "$(find -L "${MILL_DOWNLOAD_PATH}/.latest" -prune -newer "${MILL_DOWNLOAD_PATH}/.expire_latest")" ]; then
     # we know a current latest version
-    MILL_VERSION="$(head -n 1 ${MILL_DOWNLOAD_PATH}/.latest 2> /dev/null)"
+    MILL_VERSION=$(head -n 1 "${MILL_DOWNLOAD_PATH}"/.latest 2> /dev/null)
   fi
 
-  if [ "x${MILL_VERSION}" = "x" ] ; then
+  if [ -z "${MILL_VERSION}" ] ; then
     # we don't know a current latest version
     echo "Retrieving latest mill version ..." 1>&2
     LANG=C ${CURL_CMD} -s -i -f -I ${MILL_REPO_URL}/releases/latest 2> /dev/null  | grep --ignore-case Location: | sed s'/^.*tag\///' | tr -d '\r\n' > "${MILL_DOWNLOAD_PATH}/.latest"
-    MILL_VERSION="$(head -n 1 ${MILL_DOWNLOAD_PATH}/.latest 2> /dev/null)"
+    MILL_VERSION=$(head -n 1 "${MILL_DOWNLOAD_PATH}"/.latest 2> /dev/null)
   fi
 
-  if [ "x${MILL_VERSION}" = "x" ] ; then
+  if [ -z "${MILL_VERSION}" ] ; then
     # Last resort
     MILL_VERSION="${DEFAULT_MILL_VERSION}"
     echo "Falling back to hardcoded mill version ${MILL_VERSION}" 1>&2
@@ -92,16 +94,49 @@ fi
 
 MILL="${MILL_DOWNLOAD_PATH}/${MILL_VERSION}"
 
+try_to_use_system_mill() {
+  MILL_IN_PATH="$(command -v mill || true)"
+
+  if [ -z "${MILL_IN_PATH}" ]; then
+    return
+  fi
+
+  UNIVERSAL_SCRIPT_MAGIC="@ 2>/dev/null # 2>nul & echo off & goto BOF"
+
+  if ! head -c 128 "${MILL_IN_PATH}" | grep -qF "${UNIVERSAL_SCRIPT_MAGIC}"; then
+    if [ -n "${MILLW_VERBOSE}" ]; then
+      echo "Could not determine mill version of ${MILL_IN_PATH}, as it does not start with the universal script magic2" 1>&2
+    fi
+    return
+  fi
+
+  # Roughly the size of the universal script.
+  MILL_VERSION_SEARCH_RANGE="2403"
+  MILL_IN_PATH_VERSION=$(head -c "${MILL_VERSION_SEARCH_RANGE}" "${MILL_IN_PATH}" |\
+                         sed -n 's/^.*-DMILL_VERSION=\([^\s]*\) .*$/\1/p' |\
+                         head -n 1)
+
+  if [ -z "${MILL_IN_PATH_VERSION}" ]; then
+    echo "Could not determine mill version, even though ${MILL_IN_PATH} has the universal script magic" 1>&2
+    return
+  fi
+
+  if [ "${MILL_IN_PATH_VERSION}" = "${MILL_VERSION}" ]; then
+    MILL="${MILL_IN_PATH}"
+  fi
+}
+try_to_use_system_mill
+
 # If not already downloaded, download it
 if [ ! -s "${MILL}" ] ; then
-  
+
   # support old non-XDG download dir
   MILL_OLD_DOWNLOAD_PATH="${HOME}/.mill/download"
   OLD_MILL="${MILL_OLD_DOWNLOAD_PATH}/${MILL_VERSION}"
   if [ -x "${OLD_MILL}" ] ; then
     MILL="${OLD_MILL}"
   else
-    VERSION_PREFIX="$(echo -n $MILL_VERSION | cut -b -4)"
+    VERSION_PREFIX="$(echo $MILL_VERSION | cut -b -4)"
     case $VERSION_PREFIX in
       0.0. | 0.1. | 0.2. | 0.3. | 0.4. )
         DOWNLOAD_SUFFIX=""
@@ -133,4 +168,4 @@ unset MILL_VERSION
 unset MILL_VERSION_TAG
 unset MILL_REPO_URL
 
-exec $MILL "$@"
+exec "${MILL}" "$@"

millw.bat

@@ -5,7 +5,7 @@ rem You can give the required mill version with --mill-version parameter
 rem If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
 rem
 rem Project page: https://github.com/lefou/millw
-rem Script Version: 0.4.0
+rem Script Version: 0.4.2
 rem
 rem If you want to improve this script, please also contribute your changes back!
 rem
@@ -15,7 +15,7 @@ rem setlocal seems to be unavailable on Windows 95/98/ME
 rem but I don't think we need to support them in 2019
 setlocal enabledelayedexpansion
 
-set "DEFAULT_MILL_VERSION=0.9.10"
+set "DEFAULT_MILL_VERSION=0.10.0"
 
 set "MILL_REPO_URL=https://github.com/com-lihaoyi/mill"