From 57d85840348d9e575efb55c07a35578023f0db4c Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 25 Jun 2024 10:32:59 +0000 Subject: [PATCH 1/3] Update mill-main to 0.11.8 --- .mill-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mill-version b/.mill-version index b80f98e66f..1ee43fc53c 100644 --- a/.mill-version +++ b/.mill-version @@ -1 +1 @@ -0.11.7 +0.11.8 From 23b7ecc2b6c578a7b134c42bbc5a561f20f615bf Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Tue, 25 Jun 2024 14:25:47 +0200 Subject: [PATCH 2/3] Bump Mill to 0.11.8 in less obvious spots --- mill.bat | 2 +- millw | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mill.bat b/mill.bat index fa75215592..6105c22511 100755 --- a/mill.bat +++ b/mill.bat @@ -16,7 +16,7 @@ rem but I don't think we need to support them in 2019 setlocal enabledelayedexpansion if [!DEFAULT_MILL_VERSION!]==[] ( - set "DEFAULT_MILL_VERSION=0.11.7" + set "DEFAULT_MILL_VERSION=0.11.8" ) set "MILL_REPO_URL=https://github.com/com-lihaoyi/mill" diff --git a/millw b/millw index d5bd9ca618..2412da29bb 100755 --- a/millw +++ b/millw @@ -14,7 +14,7 @@ set -e if [ -z "${DEFAULT_MILL_VERSION}" ] ; then - DEFAULT_MILL_VERSION=0.11.7 + DEFAULT_MILL_VERSION=0.11.8 fi From 23b0bfc7c42706e47f94990f6e1011652d9a762d Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Tue, 25 Jun 2024 14:29:08 +0200 Subject: [PATCH 3/3] Fix Mill configuration --- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sc b/build.sc index 8f880e220c..f81dd0e23d 100644 --- a/build.sc +++ b/build.sc @@ -41,7 +41,7 @@ object cli extends Cross[Cli](Scala.scala3MainVersions) with CrossScalaDefaultTo trait CrossScalaDefault { _: mill.define.Cross[_] => def crossScalaDefaultVersion: String - def defaultCrossSegments = Seq(crossScalaDefaultVersion) + override def defaultCrossSegments = Seq(crossScalaDefaultVersion) } trait CrossScalaDefaultToInternal extends CrossScalaDefault { _: mill.define.Cross[_] =>