From f8133eae348054e03f0a7770f705b865a2e418ec Mon Sep 17 00:00:00 2001 From: Alex Archambault Date: Wed, 6 Nov 2024 14:23:11 +0100 Subject: [PATCH 1/5] Update Mill to 0.11.12 --- .mill-version | 2 +- project/settings.sc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.mill-version b/.mill-version index 12edb292a..5746d36d5 100644 --- a/.mill-version +++ b/.mill-version @@ -1 +1 @@ -0.11.7 \ No newline at end of file +0.11.12 \ No newline at end of file diff --git a/project/settings.sc b/project/settings.sc index 077cf3969..7aa70362d 100644 --- a/project/settings.sc +++ b/project/settings.sc @@ -275,7 +275,7 @@ trait AlmondTestModule sysProps = props, outputPath = outputPath, colored = T.log.colored, - testCp = compile().classes.path, + testCp = Seq(compile().classes.path), home = T.home, globSelectors = globSelectors() ) @@ -808,7 +808,7 @@ trait TestCommand extends TestModule { sysProps = props, outputPath = outputPath, colored = T.log.colored, - testCp = compile().classes.path, + testCp = Seq(compile().classes.path), home = T.home, globSelectors = globSelectors ) From 288cc2ac6d808528caf488298607c4390e572af2 Mon Sep 17 00:00:00 2001 From: Alex Archambault Date: Wed, 6 Nov 2024 14:23:21 +0100 Subject: [PATCH 2/5] Address build compilation warnings --- build.sc | 4 ++-- project/settings.sc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sc b/build.sc index 56814a740..a27a2069f 100644 --- a/build.sc +++ b/build.sc @@ -468,7 +468,7 @@ trait Examples extends SbtModule { private def examplesScalaVersion = "2.12.19" private def baseRepoRoot = os.sub / "out" / "repo" def scalaVersion = ScalaVersions.scala3Latest - object test extends SbtModuleTests { + object test extends SbtTests { def testFramework = "munit.Framework" def ivyDeps = T { super.ivyDeps() ++ Agg( @@ -570,7 +570,7 @@ trait Integration extends SbtModule { Deps.testUtil ) - object test extends SbtModuleTests with TestCommand { + object test extends SbtTests with TestCommand { object helper extends ScalaModule { def scalaVersion = ScalaVersions.scala3Latest def scala213 = T { diff --git a/project/settings.sc b/project/settings.sc index 7aa70362d..e71cc2ac4 100644 --- a/project/settings.sc +++ b/project/settings.sc @@ -47,7 +47,7 @@ trait CrossSbtModule extends mill.scalalib.SbtModule with mill.scalalib.CrossMod PathRef(millSourcePath / "src" / "main" / s"scala-$s") ) } - trait CrossSbtModuleTests extends SbtModuleTests { + trait CrossSbtModuleTests extends SbtTests { override def millSourcePath = outer.millSourcePath def sources = T.sources { super.sources() ++ scalaVersionDirectoryNames.map(s => From c002a6584569a750a68842e4ee413029a073bb08 Mon Sep 17 00:00:00 2001 From: Alex Archambault Date: Wed, 6 Nov 2024 14:27:53 +0100 Subject: [PATCH 3/5] Use explicit names for Mill command args Seems they're required with Mill 0.12 --- .github/workflows/release.yml | 2 +- docs/pages/dev-from-sources.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a47b1d17f..ce8debbc8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: ./mill -i '__['"$SV"'].publishLocal' done ./mill -i __.publishLocal - ./mill -i ci.publishSonatype __.publishArtifacts + ./mill -i ci.publishSonatype --tasks __.publishArtifacts shell: bash env: PGP_PASSWORD: ${{ secrets.PUBLISH_SECRET_KEY_PASSWORD }} diff --git a/docs/pages/dev-from-sources.md b/docs/pages/dev-from-sources.md index 747946639..d94ecee44 100644 --- a/docs/pages/dev-from-sources.md +++ b/docs/pages/dev-from-sources.md @@ -63,7 +63,7 @@ Once done building, this should print the path to the kernel launcher, like Optionally, pass a Scala version, like ```text -$ ./mill dev.launcherFast 2.12.13 +$ ./mill dev.launcherFast --scalaVersion 2.12.13 ``` You can then run that launcher to install it on your system: From eca943fb2b6f7f29c3792287f19261c64ff2f9f0 Mon Sep 17 00:00:00 2001 From: Alex Archambault Date: Wed, 6 Nov 2024 14:27:45 +0100 Subject: [PATCH 4/5] Update Mill to 0.12.1 --- .mill-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mill-version b/.mill-version index 5746d36d5..aac2dacab 100644 --- a/.mill-version +++ b/.mill-version @@ -1 +1 @@ -0.11.12 \ No newline at end of file +0.12.1 \ No newline at end of file From d3af950dcda718d92dfded6df09f23b12e0a54fe Mon Sep 17 00:00:00 2001 From: Alex Archambault Date: Wed, 6 Nov 2024 14:34:00 +0100 Subject: [PATCH 5/5] Update Ammonite to 3.0.0-2-6342755f --- project/deps.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/deps.sc b/project/deps.sc index 2abf1f91a..cc751b2aa 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -2,7 +2,7 @@ import mill._ import mill.scalalib._ object Versions { - def ammonite = "3.0.0-M2-30-486378af" + def ammonite = "3.0.0-2-6342755f" def caseApp = "2.1.0-M26" def coursier = "2.1.14" def jsoniterScala = "2.13.5"