From e9cb5759ae0ef401bf09fb06be8d42c7aafc0d3e Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Sat, 26 Oct 2024 15:41:56 +0200 Subject: [PATCH] Rename `millImport` variable to `metaBuild` --- runner/src/mill/runner/FileImportGraph.scala | 4 ++-- runner/src/mill/runner/MillBuildBootstrap.scala | 2 +- runner/src/mill/runner/MillBuildRootModule.scala | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/runner/src/mill/runner/FileImportGraph.scala b/runner/src/mill/runner/FileImportGraph.scala index 6299844dddc..25d84c24af7 100644 --- a/runner/src/mill/runner/FileImportGraph.scala +++ b/runner/src/mill/runner/FileImportGraph.scala @@ -13,7 +13,7 @@ import scala.collection.mutable * @param ivyDeps * @param importGraphEdges * @param errors - * @param millImport If `true`, a meta-build is enabled + * @param metaBuild If `true`, a meta-build is enabled */ @internal case class FileImportGraph( @@ -21,7 +21,7 @@ case class FileImportGraph( repos: Seq[(String, os.Path)], ivyDeps: Set[String], errors: Seq[String], - millImport: Boolean + metaBuild: Boolean ) /** diff --git a/runner/src/mill/runner/MillBuildBootstrap.scala b/runner/src/mill/runner/MillBuildBootstrap.scala index e50b17edd6c..1964c47da02 100644 --- a/runner/src/mill/runner/MillBuildBootstrap.scala +++ b/runner/src/mill/runner/MillBuildBootstrap.scala @@ -107,7 +107,7 @@ class MillBuildBootstrap( output ) - if (parsedScriptFiles.millImport) evaluateRec(depth + 1) + if (parsedScriptFiles.metaBuild) evaluateRec(depth + 1) else { val bootstrapModule = new MillBuildRootModule.BootstrapModule()( diff --git a/runner/src/mill/runner/MillBuildRootModule.scala b/runner/src/mill/runner/MillBuildRootModule.scala index cfc219e30c1..2a193463f59 100644 --- a/runner/src/mill/runner/MillBuildRootModule.scala +++ b/runner/src/mill/runner/MillBuildRootModule.scala @@ -193,13 +193,13 @@ abstract class MillBuildRootModule()(implicit override def sources: T[Seq[PathRef]] = Task { scriptSources() ++ { - if (parseBuildFiles().millImport) super.sources() + if (parseBuildFiles().metaBuild) super.sources() else Seq.empty[PathRef] } } override def resources: T[Seq[PathRef]] = Task { - if (parseBuildFiles().millImport) super.resources() + if (parseBuildFiles().metaBuild) super.resources() else Seq.empty[PathRef] }