From 76bf5b010b3b34ec7d73d6f8553b69477713a54f Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 26 May 2025 10:18:50 +0200 Subject: [PATCH 1/3] . --- .mill-jvm-version | 2 +- dist/package.mill | 15 ++++++++------- libs/init/package.mill | 5 ++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.mill-jvm-version b/.mill-jvm-version index 63100994ebf..358492dda40 100644 --- a/.mill-jvm-version +++ b/.mill-jvm-version @@ -1 +1 @@ -zulu:17.0.14 \ No newline at end of file +zulu:24 diff --git a/dist/package.mill b/dist/package.mill index ccd89949afb..7eca52f0cd6 100644 --- a/dist/package.mill +++ b/dist/package.mill @@ -221,14 +221,15 @@ object `package` extends MillJavaModule with DistModule { prepareBootstrapLauncher(millBootstrapBat().path, Task.dest, build.millVersion(), "mill.bat") } - def examplePathsWithArtifactName: Task[Seq[(PathRef, String)]] = Task.Input { - for { - exampleMod <- build.example.exampleModules - path = exampleMod.moduleDir - } yield { - val example = path.subRelativeTo(Task.workspace) + def examplePathsWithArtifactName0: Task[Seq[PathRef]] = Task.Input { + for (exampleMod <- build.example.exampleModules) yield PathRef(exampleMod.moduleDir) + } + + def examplePathsWithArtifactName = Task { + for (pr <- examplePathsWithArtifactName0()) yield { + val example = pr.path.subRelativeTo(Task.workspace) val artifactName = example.segments.mkString("-") - (PathRef(path), artifactName) + (pr, s"${build.dist.artifactFileNamePrefix()}-$artifactName") } } diff --git a/libs/init/package.mill b/libs/init/package.mill index 6e4e7da31fd..faefee56abb 100644 --- a/libs/init/package.mill +++ b/libs/init/package.mill @@ -19,7 +19,7 @@ object `package` extends MillPublishScalaModule { val data: Seq[(os.SubPath, String)] = build.dist.examplePathsWithArtifactName().map { case (pathRef, str) => val downloadUrl = - s"${build.millDownloadUrl()}/${build.dist.artifactFileNamePrefix()}-$str.zip" + s"${build.millDownloadUrl()}/$str.zip" val subPath = pathRef.path.subRelativeTo(Task.workspace / "example") (subPath, downloadUrl) } @@ -118,8 +118,7 @@ object `package` extends MillPublishScalaModule { ) // An `sbt` plugin is built with Scala 2.12. See https://www.scala-sbt.org/1.x/docs/Plugins.html#Creating+an+auto+plugin. - object models - extends Cross[ModelsModule](Deps.sbtScalaVersion212, Deps.scalaVersion) + object models extends Cross[ModelsModule](Deps.sbtScalaVersion212, Deps.scalaVersion) trait ModelsModule extends MillPublishCrossScalaModule { // def moduleDeps = Seq(buildgen.tree()) def mvnDeps = Seq(Deps.upickle) From b2c73d2c87069c3f9f04fb31b07d15fb8b25f3eb Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 26 May 2025 10:19:47 +0200 Subject: [PATCH 2/3] . --- .mill-jvm-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mill-jvm-version b/.mill-jvm-version index 358492dda40..da1e588164e 100644 --- a/.mill-jvm-version +++ b/.mill-jvm-version @@ -1 +1 @@ -zulu:24 +zulu:17.0.4 From f75ad2d2626f5d7214dd3918c45ec846950d8675 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 26 May 2025 13:11:05 +0200 Subject: [PATCH 3/3] .