merge

Author: lihaoyi

build.mill

@@ -128,7 +128,7 @@ val bridgeScalaVersions = Seq(
 // on the fly anyway. For publishing, we publish everything or a specific version
 // if given.
 val compilerBridgeScalaVersions =
-  interp.watchValue(sys.env.get("MILL_COMPILER_BRIDGE_VERSIONS")) match {
+  mill.define.BuildCtx.watchValue(sys.env.get("MILL_COMPILER_BRIDGE_VERSIONS")) match {
     case None | Some("") | Some("none") => Seq.empty[String]
     case Some("all") => (essentialBridgeScalaVersions ++ bridgeScalaVersions).distinct
     case Some("essential") => essentialBridgeScalaVersions
@@ -185,7 +185,7 @@ def formatDep(dep: Dep) = {
   s"${d.module.organization.value}:${d.module.name.value}:${d.versionConstraint.asString}"
 }
 
-def listIn(path: os.Path) = interp.watchValue(os.list(path).map(_.last))
+def listIn(path: os.Path) = mill.define.BuildCtx.watchValue(os.list(path).map(_.last))
 
 val dummyDeps: Seq[Dep] = Seq(
   Deps.DocDeps.millScip,

integration/package.mill

@@ -14,6 +14,7 @@ import mill.T
 import mill.define.Cross
 import mill.testrunner.TestResult
 import millbuild.*
+import upickle.implicits.namedTuples.default.given
 
 object `package` extends mill.Module {
   // We compile the test code once and then offer multiple modes to

runner/codesig/package.mill

@@ -18,7 +18,7 @@ object `package` extends MillPublishScalaModule {
 
   override lazy val test: CodeSigTests = new CodeSigTests {}
   trait CodeSigTests extends MillScalaTests {
-    val caseKeys = build.interp.watchValue(
+    val caseKeys = mill.define.BuildCtx.watchValue(
       os.walk(moduleDir / "cases", maxDepth = 3)
         .map(_.subRelativeTo(moduleDir / "cases").segments)
         .collect { case Seq(a, b, c) => s"$a-$b-$c" }