From bb46ac55332ddcd075ab57b3b5c989b51c659f50 Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Fri, 16 Jan 2026 11:43:56 +0100 Subject: [PATCH] Migrate to Mill 1.1.0-RC4 --- .mill-version | 2 +- build.mill.scala => build.mill | 4 ++-- mill.bat | 2 +- millw | 2 +- .../scala/scala/cli/exportCmd/MillProject.scala | 2 +- .../cli/integration/ExportMill10Tests212.scala | 3 --- .../cli/integration/ExportMill10Tests3Lts.scala | 3 --- .../integration/ExportMill10Tests3NextRc.scala | 3 --- .../integration/ExportMill10TestsDefault.scala | 3 --- .../cli/integration/ExportMill1Tests212.scala | 3 +++ ...Tests213.scala => ExportMill1Tests213.scala} | 2 +- .../cli/integration/ExportMill1Tests3Lts.scala | 3 +++ .../integration/ExportMill1Tests3NextRc.scala | 3 +++ .../integration/ExportMill1TestsDefault.scala | 3 +++ .../integration/ExportMillTestDefinitions.scala | 4 ++-- .../deps/{package.mill.scala => package.mill} | 17 ++++++++--------- project/{package.mill.scala => package.mill} | 0 .../{package.mill.scala => package.mill} | 2 +- .../{package.mill.scala => package.mill} | 0 .../utils/{package.mill.scala => package.mill} | 0 .../{package.mill.scala => package.mill} | 0 website/docs/reference/cli-options.md | 2 +- 22 files changed, 31 insertions(+), 32 deletions(-) rename build.mill.scala => build.mill (99%) delete mode 100644 modules/integration/src/test/scala/scala/cli/integration/ExportMill10Tests212.scala delete mode 100644 modules/integration/src/test/scala/scala/cli/integration/ExportMill10Tests3Lts.scala delete mode 100644 modules/integration/src/test/scala/scala/cli/integration/ExportMill10Tests3NextRc.scala delete mode 100644 modules/integration/src/test/scala/scala/cli/integration/ExportMill10TestsDefault.scala create mode 100644 modules/integration/src/test/scala/scala/cli/integration/ExportMill1Tests212.scala rename modules/integration/src/test/scala/scala/cli/integration/{ExportMill10Tests213.scala => ExportMill1Tests213.scala} (89%) create mode 100644 modules/integration/src/test/scala/scala/cli/integration/ExportMill1Tests3Lts.scala create mode 100644 modules/integration/src/test/scala/scala/cli/integration/ExportMill1Tests3NextRc.scala create mode 100644 modules/integration/src/test/scala/scala/cli/integration/ExportMill1TestsDefault.scala rename project/deps/{package.mill.scala => package.mill} (97%) rename project/{package.mill.scala => package.mill} (100%) rename project/publish/{package.mill.scala => package.mill} (98%) rename project/settings/{package.mill.scala => package.mill} (100%) rename project/utils/{package.mill.scala => package.mill} (100%) rename project/website/{package.mill.scala => package.mill} (100%) diff --git a/.mill-version b/.mill-version index af0b7ddbff..b8b9e270ba 100644 --- a/.mill-version +++ b/.mill-version @@ -1 +1 @@ -1.0.6 +1.1.0-RC4 diff --git a/build.mill.scala b/build.mill similarity index 99% rename from build.mill.scala rename to build.mill index b929fdd11d..e3279f5b8e 100644 --- a/build.mill.scala +++ b/build.mill @@ -863,7 +863,7 @@ trait Cli extends CrossSbtModule with ProtoBuildModule with CliLaunchers | def signingCliJvmVersion = ${Deps.Versions.signingCliJvmVersion} | def defaultMillVersion = "${BuildInfo.millVersion}" | def mill012Version = "${Deps.Versions.mill012Version}" - | def mill10Version = "${Deps.Versions.mill10Version}" + | def mill1Version = "${Deps.Versions.mill1Version}" | def defaultSbtVersion = "${Deps.Versions.sbtVersion}" | def defaultMavenVersion = "${Deps.Versions.mavenVersion}" | def defaultMavenScalaCompilerPluginVersion = "${Deps.Versions.mavenScalaCompilerPluginVersion}" @@ -1121,7 +1121,7 @@ trait CliIntegration extends SbtModule | def jmhGeneratorBytecodeModule = "${Deps.jmhGeneratorBytecode.dep.module.name.value}" | def defaultMillVersion = "${BuildInfo.millVersion}" | def mill012Version = "${Deps.Versions.mill012Version}" - | def mill10Version = "${Deps.Versions.mill10Version}" + | def mill1Version = "${Deps.Versions.mill1Version}" |} |""".stripMargin if (!os.isFile(dest) || os.read(dest) != code) diff --git a/mill.bat b/mill.bat index f7f143c8e6..aa0fbc19da 100755 --- a/mill.bat +++ b/mill.bat @@ -2,7 +2,7 @@ setlocal enabledelayedexpansion -if [!DEFAULT_MILL_VERSION!]==[] ( set "DEFAULT_MILL_VERSION=0.12.17" ) +if [!DEFAULT_MILL_VERSION!]==[] ( set "DEFAULT_MILL_VERSION=1.1.0-RC4" ) if [!MILL_GITHUB_RELEASE_CDN!]==[] ( set "MILL_GITHUB_RELEASE_CDN=" ) diff --git a/millw b/millw index 01b25fe528..27dcb4633a 100755 --- a/millw +++ b/millw @@ -2,7 +2,7 @@ set -e -if [ -z "${DEFAULT_MILL_VERSION}" ] ; then DEFAULT_MILL_VERSION="0.12.17"; fi +if [ -z "${DEFAULT_MILL_VERSION}" ] ; then DEFAULT_MILL_VERSION="1.1.0-RC4"; fi if [ -z "${GITHUB_RELEASE_CDN}" ] ; then GITHUB_RELEASE_CDN=""; fi diff --git a/modules/cli/src/main/scala/scala/cli/exportCmd/MillProject.scala b/modules/cli/src/main/scala/scala/cli/exportCmd/MillProject.scala index 7ad097bc81..0cdbfbe9a4 100644 --- a/modules/cli/src/main/scala/scala/cli/exportCmd/MillProject.scala +++ b/modules/cli/src/main/scala/scala/cli/exportCmd/MillProject.scala @@ -176,7 +176,7 @@ final case class MillProject( os.write(path0, content, createFolders = true) } - val outputBuildFile = if isMill1OrNewer then dir / "build.mill.scala" else dir / "build.sc" + val outputBuildFile = if isMill1OrNewer then dir / "build.mill" else dir / "build.sc" os.write(outputBuildFile, buildFileContent.getBytes(charSet)) } } diff --git a/modules/integration/src/test/scala/scala/cli/integration/ExportMill10Tests212.scala b/modules/integration/src/test/scala/scala/cli/integration/ExportMill10Tests212.scala deleted file mode 100644 index 32b57506b1..0000000000 --- a/modules/integration/src/test/scala/scala/cli/integration/ExportMill10Tests212.scala +++ /dev/null @@ -1,3 +0,0 @@ -package scala.cli.integration - -class ExportMill10Tests212 extends ExportMillTestDefinitions with Test212 with TestMill10 diff --git a/modules/integration/src/test/scala/scala/cli/integration/ExportMill10Tests3Lts.scala b/modules/integration/src/test/scala/scala/cli/integration/ExportMill10Tests3Lts.scala deleted file mode 100644 index a6b9df90a0..0000000000 --- a/modules/integration/src/test/scala/scala/cli/integration/ExportMill10Tests3Lts.scala +++ /dev/null @@ -1,3 +0,0 @@ -package scala.cli.integration - -class ExportMill10Tests3Lts extends ExportMillTestDefinitions with Test3Lts with TestMill10 diff --git a/modules/integration/src/test/scala/scala/cli/integration/ExportMill10Tests3NextRc.scala b/modules/integration/src/test/scala/scala/cli/integration/ExportMill10Tests3NextRc.scala deleted file mode 100644 index 6983894c78..0000000000 --- a/modules/integration/src/test/scala/scala/cli/integration/ExportMill10Tests3NextRc.scala +++ /dev/null @@ -1,3 +0,0 @@ -package scala.cli.integration - -class ExportMill10Tests3NextRc extends ExportMillTestDefinitions with Test3NextRc with TestMill10 diff --git a/modules/integration/src/test/scala/scala/cli/integration/ExportMill10TestsDefault.scala b/modules/integration/src/test/scala/scala/cli/integration/ExportMill10TestsDefault.scala deleted file mode 100644 index 50287d035e..0000000000 --- a/modules/integration/src/test/scala/scala/cli/integration/ExportMill10TestsDefault.scala +++ /dev/null @@ -1,3 +0,0 @@ -package scala.cli.integration - -class ExportMill10TestsDefault extends ExportMillTestDefinitions with TestDefault with TestMill10 diff --git a/modules/integration/src/test/scala/scala/cli/integration/ExportMill1Tests212.scala b/modules/integration/src/test/scala/scala/cli/integration/ExportMill1Tests212.scala new file mode 100644 index 0000000000..0e5a41f0ec --- /dev/null +++ b/modules/integration/src/test/scala/scala/cli/integration/ExportMill1Tests212.scala @@ -0,0 +1,3 @@ +package scala.cli.integration + +class ExportMill1Tests212 extends ExportMillTestDefinitions with Test212 with TestMill1 diff --git a/modules/integration/src/test/scala/scala/cli/integration/ExportMill10Tests213.scala b/modules/integration/src/test/scala/scala/cli/integration/ExportMill1Tests213.scala similarity index 89% rename from modules/integration/src/test/scala/scala/cli/integration/ExportMill10Tests213.scala rename to modules/integration/src/test/scala/scala/cli/integration/ExportMill1Tests213.scala index a31bf6d49d..12021be121 100644 --- a/modules/integration/src/test/scala/scala/cli/integration/ExportMill10Tests213.scala +++ b/modules/integration/src/test/scala/scala/cli/integration/ExportMill1Tests213.scala @@ -1,6 +1,6 @@ package scala.cli.integration -class ExportMill10Tests213 extends ExportMillTestDefinitions with Test213 with TestMill10 { +class ExportMill1Tests213 extends ExportMillTestDefinitions with Test213 with TestMill1 { if runExportTests then { test(s"scalac options$commonTestDescriptionSuffix") { simpleTest( diff --git a/modules/integration/src/test/scala/scala/cli/integration/ExportMill1Tests3Lts.scala b/modules/integration/src/test/scala/scala/cli/integration/ExportMill1Tests3Lts.scala new file mode 100644 index 0000000000..34084736d7 --- /dev/null +++ b/modules/integration/src/test/scala/scala/cli/integration/ExportMill1Tests3Lts.scala @@ -0,0 +1,3 @@ +package scala.cli.integration + +class ExportMill1Tests3Lts extends ExportMillTestDefinitions with Test3Lts with TestMill1 diff --git a/modules/integration/src/test/scala/scala/cli/integration/ExportMill1Tests3NextRc.scala b/modules/integration/src/test/scala/scala/cli/integration/ExportMill1Tests3NextRc.scala new file mode 100644 index 0000000000..b5a209a2e8 --- /dev/null +++ b/modules/integration/src/test/scala/scala/cli/integration/ExportMill1Tests3NextRc.scala @@ -0,0 +1,3 @@ +package scala.cli.integration + +class ExportMill1Tests3NextRc extends ExportMillTestDefinitions with Test3NextRc with TestMill1 diff --git a/modules/integration/src/test/scala/scala/cli/integration/ExportMill1TestsDefault.scala b/modules/integration/src/test/scala/scala/cli/integration/ExportMill1TestsDefault.scala new file mode 100644 index 0000000000..b38b52c016 --- /dev/null +++ b/modules/integration/src/test/scala/scala/cli/integration/ExportMill1TestsDefault.scala @@ -0,0 +1,3 @@ +package scala.cli.integration + +class ExportMill1TestsDefault extends ExportMillTestDefinitions with TestDefault with TestMill1 diff --git a/modules/integration/src/test/scala/scala/cli/integration/ExportMillTestDefinitions.scala b/modules/integration/src/test/scala/scala/cli/integration/ExportMillTestDefinitions.scala index 3b88723c1c..fa241b2763 100644 --- a/modules/integration/src/test/scala/scala/cli/integration/ExportMillTestDefinitions.scala +++ b/modules/integration/src/test/scala/scala/cli/integration/ExportMillTestDefinitions.scala @@ -118,6 +118,6 @@ sealed trait TestMillVersion: trait TestMill012 extends TestMillVersion: self: ExportMillTestDefinitions => override def millVersion: String = Constants.mill012Version -trait TestMill10 extends TestMillVersion: +trait TestMill1 extends TestMillVersion: self: ExportMillTestDefinitions => - override def millVersion: String = Constants.mill10Version + override def millVersion: String = Constants.mill1Version diff --git a/project/deps/package.mill.scala b/project/deps/package.mill similarity index 97% rename from project/deps/package.mill.scala rename to project/deps/package.mill index e6fee1690b..3266c1ab7e 100644 --- a/project/deps/package.mill.scala +++ b/project/deps/package.mill @@ -147,15 +147,14 @@ object Deps { def bloop = "2.0.17" def sbtVersion = "1.11.7" def mill012Version = "0.12.17" - def mill10Version = - if (BuildInfo.millVersion.startsWith("1.0.")) BuildInfo.millVersion else "1.0.6" - def mavenVersion = "3.8.1" - def mavenScalaCompilerPluginVersion = "4.9.1" - def mavenExecPluginVersion = "3.3.0" - def mavenAppArtifactId = "maven-app" - def mavenAppGroupId = "com.example" - def mavenAppVersion = "0.1-SNAPSHOT" - def scalafix = "0.14.4" + def mill1Version = BuildInfo.millVersion + def mavenVersion = "3.8.1" + def mavenScalaCompilerPluginVersion = "4.9.1" + def mavenExecPluginVersion = "3.3.0" + def mavenAppArtifactId = "maven-app" + def mavenAppGroupId = "com.example" + def mavenAppVersion = "0.1-SNAPSHOT" + def scalafix = "0.14.4" } // DO NOT hardcode a Scala version in this dependency string diff --git a/project/package.mill.scala b/project/package.mill similarity index 100% rename from project/package.mill.scala rename to project/package.mill diff --git a/project/publish/package.mill.scala b/project/publish/package.mill similarity index 98% rename from project/publish/package.mill.scala rename to project/publish/package.mill index 19bbd20dcd..f258a063b0 100644 --- a/project/publish/package.mill.scala +++ b/project/publish/package.mill @@ -1,7 +1,7 @@ package build.project.publish import build.project.settings -import com.lumidion.sonatype.central.client.core.{PublishingType, SonatypeCredentials} +import mill.javalib.publish.{PublishingType, SonatypeCredentials} import settings.{PublishLocalNoFluff, workspaceDirName} import mill.* import mill.javalib.publish.Artifact diff --git a/project/settings/package.mill.scala b/project/settings/package.mill similarity index 100% rename from project/settings/package.mill.scala rename to project/settings/package.mill diff --git a/project/utils/package.mill.scala b/project/utils/package.mill similarity index 100% rename from project/utils/package.mill.scala rename to project/utils/package.mill diff --git a/project/website/package.mill.scala b/project/website/package.mill similarity index 100% rename from project/website/package.mill.scala rename to project/website/package.mill diff --git a/website/docs/reference/cli-options.md b/website/docs/reference/cli-options.md index e043268740..c24b232092 100644 --- a/website/docs/reference/cli-options.md +++ b/website/docs/reference/cli-options.md @@ -388,7 +388,7 @@ Version of SBT to be used for the export (1.11.7 by default) ### `--mill-version` -Version of Mill to be used for the export (1.0.6 by default) +Version of Mill to be used for the export (1.1.0-RC4 by default) ### `--mvn-version`