From c8f31be6f2de84a07808e5fc6d6cf3fa911a5e20 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Tue, 19 Sep 2023 23:17:24 +0200 Subject: [PATCH 1/3] Fix some hardcoded scala versions --- build.sc | 4 ++-- runner/src/mill/runner/MillBuildRootModule.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sc b/build.sc index 9f139dc674d..8514d0f27ab 100644 --- a/build.sc +++ b/build.sc @@ -519,14 +519,14 @@ object main extends MillStableScalaModule with BuildInfo { trait CaseModule extends ScalaModule with Cross.Module[String] { def caseName = crossValue object external extends ScalaModule { - def scalaVersion = "2.13.10" + def scalaVersion = Deps.scalaVersion } def moduleDeps = Seq(external) val Array(prefix, suffix, rest) = caseName.split("-", 3) def millSourcePath = super.millSourcePath / prefix / suffix / rest - def scalaVersion = "2.13.10" + def scalaVersion = Deps.scalaVersion def ivyDeps = T { if (!caseName.contains("realistic") && !caseName.contains("sourcecode")) super.ivyDeps() else Agg( diff --git a/runner/src/mill/runner/MillBuildRootModule.scala b/runner/src/mill/runner/MillBuildRootModule.scala index f0974754fa9..f84fcf3a007 100644 --- a/runner/src/mill/runner/MillBuildRootModule.scala +++ b/runner/src/mill/runner/MillBuildRootModule.scala @@ -41,7 +41,7 @@ class MillBuildRootModule()(implicit override def millSourcePath = millBuildRootModuleInfo.projectRoot / os.up / "mill-build" override def intellijModulePath: os.Path = millSourcePath / os.up - override def scalaVersion: T[String] = "2.13.10" + override def scalaVersion: T[String] = BuildInfo.scalaVersion /** * All script files (that will get wrapped later) From 3eae2d6a90e0f034e24b4c8f66e895900d6bc95f Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Wed, 20 Sep 2023 07:16:27 +0200 Subject: [PATCH 2/3] Exclude one more message --- .../watch-source-input/test/src/WatchSourceInputTests.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/integration/feature/watch-source-input/test/src/WatchSourceInputTests.scala b/integration/feature/watch-source-input/test/src/WatchSourceInputTests.scala index febd6b21690..0668d792ed1 100644 --- a/integration/feature/watch-source-input/test/src/WatchSourceInputTests.scala +++ b/integration/feature/watch-source-input/test/src/WatchSourceInputTests.scala @@ -47,6 +47,7 @@ object WatchSourceInputTests extends IntegrationTestSuite { val res = f(expectedOut, expectedErr, expectedShows) val (shows, out) = res.out.linesIterator.toVector.partition(_.startsWith("\"")) val err = res.err.linesIterator.toVector + .filter(!_.contains("Compiling compiler interface...")) .filter(!_.contains("Watching for changes")) .filter(!_.contains("[info] compiling")) .filter(!_.contains("[info] done compiling")) From 05f76188e907a582edb946de22be8112b72b62b8 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Wed, 20 Sep 2023 07:16:34 +0200 Subject: [PATCH 3/3] Cleanup --- runner/src/mill/runner/MillBuildRootModule.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runner/src/mill/runner/MillBuildRootModule.scala b/runner/src/mill/runner/MillBuildRootModule.scala index f84fcf3a007..3155785e9d3 100644 --- a/runner/src/mill/runner/MillBuildRootModule.scala +++ b/runner/src/mill/runner/MillBuildRootModule.scala @@ -4,7 +4,7 @@ import coursier.Repository import mill._ import mill.api.{PathRef, Result, internal} import mill.define.{Discover, Task} -import mill.scalalib.{BoundDep, Dep, DepSyntax, Lib, ScalaModule} +import mill.scalalib.{Dep, DepSyntax, Lib, ScalaModule} import mill.util.CoursierSupport import mill.util.Util.millProjectModule import mill.scalalib.api.Versions