Merge branch 'main' into multi-build-file

.config/mill-version

@@ -1 +1 @@
-0.11.10
+0.11.11

CONTRIBUTING.adoc

@@ -12,7 +12,7 @@ Here are some direct links:
 * xref:readme.adoc#project-layout[Project Layout] - The source code repository structure from a high level view
 * xref:readme.adoc#manual-automated-testing[Manual and Automated Testing] - How we test Mill
 * xref:readme.adoc#project-maintenance[Project Maintenance] - Details about authoring pull request and commit messages
-* https://mill-build.com/mill/Intro_to_Mill.html[Mill Documentation] - Documentation for users and developers
+* https://mill-build.org/mill/Intro_to_Mill.html[Mill Documentation] - Documentation for users and developers
 * {link-github}/discussions[Discussion Forum on GitHub] - A place to ask question and discuss all kind of questions around Mill
 * {link-github}/issues[Issue Tracker on GitHub] - Our issue tracker for bugs and features
 * {link-github}/pulls[Pull Requests on GitHub] - All new features and bug fixes find their way into Mill via a pull request. You can also sketch new ideas by creating a draft pull requests.

build.sc

@@ -34,7 +34,7 @@ object Settings {
   val projectUrl = s"https://github.com/${githubOrg}/${githubRepo}"
   val changelogUrl = s"${projectUrl}#changelog"
   val newIssueUrl = s"${projectUrl}/issues/new/choose"
-  val docUrl = "https://mill-build.com"
+  val docUrl = "https://mill-build.org"
   // the exact branches containing a doc root
   val docBranches = Seq()
   // the exact tags containing a doc root
@@ -211,7 +211,7 @@ object Deps {
     // tests framework (test)
     val scalaCheck = ivy"org.scalacheck::scalacheck:1.18.0"
     val scalaTest = ivy"org.scalatest::scalatest:3.2.19"
-    val utest = ivy"com.lihaoyi::utest:0.8.3"
+    val utest = ivy"com.lihaoyi::utest:0.8.4"
     val zioTest = ivy"dev.zio::zio-test:2.0.22"
   }
 

ci/test-mill-dev.sh

@@ -6,12 +6,12 @@ EXAMPLE=example/scalabuilds/9-realistic
 
 rm -rf $EXAMPLE/out
 
-test ! -d $EXAMPLE/out/foo/3.2.2/compile.dest
+test ! -d $EXAMPLE/out/foo/3.3.3/compile.dest
 test ! -f $EXAMPLE/out/bar/2.13.8/assembly.dest/out.jar
 
-./mill -i dev.run $EXAMPLE -i "foo[3.2.2].run"
+./mill -i dev.run $EXAMPLE -i "foo[3.3.3].run"
 
-test -d $EXAMPLE/out/foo/3.2.2/compile.dest
+test -d $EXAMPLE/out/foo/3.3.3/compile.dest
 
 ./mill -i dev.run $EXAMPLE show "bar[2.13.8].assembly"
 

ci/test-mill-release.sh

@@ -9,12 +9,12 @@ EXAMPLE=example/scalabuilds/9-realistic
 
 rm -rf $EXAMPLE/out
 
-test ! -d $EXAMPLE/out/foo/3.2.2/compile.dest
+test ! -d $EXAMPLE/out/foo/3.3.3/compile.dest
 test ! -f $EXAMPLE/out/bar/2.13.8/assembly.dest/out.jar
 
-(cd $EXAMPLE && ../../../out/dev/assembly.dest/mill -i "foo[3.2.2].run")
+(cd $EXAMPLE && ../../../out/dev/assembly.dest/mill -i "foo[3.3.3].run")
 
-test -d $EXAMPLE/out/foo/3.2.2/compile.dest
+test -d $EXAMPLE/out/foo/3.3.3/compile.dest
 
 (cd $EXAMPLE && ../../../out/dev/assembly.dest/mill show "bar[2.13.8].assembly")
 

example/basic/1-simple/build.sc

@@ -10,7 +10,7 @@ object foo extends RootModule with ScalaModule {
   )
 
   object test extends ScalaTests {
-    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.7.11")
+    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.8.4")
     def testFramework = "utest.runner.Framework"
   }
 }

example/basic/3-multi-module/build.sc

@@ -4,7 +4,7 @@ import mill._, scalalib._
 trait MyModule extends ScalaModule {
   def scalaVersion = "2.13.11"
   object test extends ScalaTests {
-    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.7.11")
+    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.8.4")
     def testFramework = "utest.runner.Framework"
   }
 }

example/basic/5-multiple-test-frameworks/build.sc

@@ -11,7 +11,7 @@ object foo extends RootModule with ScalaModule {
 
   object test extends ScalaTests {
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest:0.7.11",
+      ivy"com.lihaoyi::utest:0.8.4",
       ivy"org.scalatest::scalatest-freespec:3.2.18"
     )
     def testFramework = "utest.runner.Framework"

example/scalabuilds/5-test-suite/build.sc

@@ -4,7 +4,7 @@ import mill._, scalalib._
 object foo extends ScalaModule {
   def scalaVersion = "2.13.8"
   object test extends ScalaTests {
-    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.7.11")
+    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.8.4")
     def testFramework = "utest.runner.Framework"
   }
 }
@@ -52,7 +52,7 @@ object bar extends ScalaModule {
   def scalaVersion = "2.13.8"
 
   object test extends ScalaTests with TestModule.Utest {
-    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.7.11")
+    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.8.4")
   }
 }
 //// SNIPPET:END
@@ -92,10 +92,10 @@ object qux extends ScalaModule {
   def scalaVersion = "2.13.8"
 
   object test extends ScalaTests with TestModule.Utest {
-    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.7.11")
+    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.8.4")
   }
   object integration extends ScalaTests with TestModule.Utest {
-    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.7.11")
+    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.8.4")
   }
 }
 //// SNIPPET:END

example/scalabuilds/8-compat-modules/build.sc

@@ -4,7 +4,7 @@ import mill._, scalalib._
 object foo extends SbtModule {
   def scalaVersion = "2.13.8"
   object test extends SbtTests {
-    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.7.11")
+    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.8.4")
     def testFramework = "utest.runner.Framework"
   }
 }
@@ -13,7 +13,7 @@ object foo extends SbtModule {
 object bar extends Cross[BarModule]("2.12.17", "2.13.8")
 trait BarModule extends CrossSbtModule {
   object test extends CrossSbtTests {
-    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.7.11")
+    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.8.4")
     def testFramework = "utest.runner.Framework"
   }
 }

example/scalabuilds/9-realistic/build.sc

@@ -17,12 +17,12 @@ trait MyModule extends PublishModule {
 trait MyScalaModule extends MyModule with CrossScalaModule {
   def ivyDeps = Agg(ivy"com.lihaoyi::scalatags:0.12.0")
   object test extends ScalaTests {
-    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.7.11")
+    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.8.4")
     def testFramework = "utest.runner.Framework"
   }
 }
 
-val scalaVersions = Seq("2.13.8", "3.2.2")
+val scalaVersions = Seq("2.13.8", "3.3.3")
 
 object foo extends Cross[FooModule](scalaVersions)
 trait FooModule extends MyScalaModule {
@@ -84,12 +84,12 @@ object qux extends JavaModule with MyModule
 > mill resolve __.run
 bar[2.13.8].run
 bar[2.13.8].test.run
-bar[3.2.2].run
-bar[3.2.2].test.run
+bar[3.3.3].run
+bar[3.3.3].test.run
 foo[2.13.8].run
 foo[2.13.8].test.run
-foo[3.2.2].run
-foo[3.2.2].test.run
+foo[3.3.3].run
+foo[3.3.3].test.run
 qux.run
 
 > mill foo[2.13.8].run
@@ -98,7 +98,7 @@ Foo.value: <h1>hello</h1>
 Bar.value: <p>world Specific code for Scala 2.x</p>
 Qux.value: 31337
 
-> mill bar[3.2.2].test
+> mill bar[3.3.3].test
 + bar.BarTests.test ... <p>world Specific code for Scala 3.x</p>
 
 > mill qux.run

example/scalamodule/12-contrib-scoverage/build.sc

@@ -12,7 +12,7 @@ object foo extends RootModule with ScoverageModule {
   )
 
   object test extends ScoverageTests /*with TestModule.Utest */{
-    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.7.11")
+    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.8.4")
     def testFramework = "utest.runner.Framework"
   }
 }

example/scalamodule/4-test-deps/build.sc

@@ -18,7 +18,7 @@ object qux extends ScalaModule {
   def moduleDeps = Seq(baz)
 
   object test extends ScalaTests {
-    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.7.11")
+    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.8.4")
     def testFramework = "utest.runner.Framework"
     def moduleDeps = super.moduleDeps ++ Seq(baz.test)
   }
@@ -29,7 +29,7 @@ object baz extends ScalaModule {
   def scalaVersion = "2.13.8"
 
   object test extends ScalaTests {
-    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.7.11")
+    def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.8.4")
     def testFramework = "utest.runner.Framework"
   }
 }

example/thirdparty/acyclic/build.sc

@@ -3,7 +3,7 @@ import mill._, scalalib._, publish._
 object Deps {
   def acyclic = ivy"com.lihaoyi:::acyclic:0.3.6"
   def scalaCompiler(scalaVersion: String) = ivy"org.scala-lang:scala-compiler:$scalaVersion"
-  val utest = ivy"com.lihaoyi::utest:0.8.1"
+  val utest = ivy"com.lihaoyi::utest:0.8.4"
 }
 
 val crosses =

example/thirdparty/fansi/build.sc

@@ -21,7 +21,7 @@ trait FansiModule extends PublishModule with CrossScalaModule with PlatformScala
   def ivyDeps = Agg(ivy"com.lihaoyi::sourcecode::0.3.0")
 
   trait FansiTests extends ScalaTests with TestModule.Utest {
-    def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.8.1")
+    def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.8.4")
   }
 }
 
@@ -33,7 +33,7 @@ object fansi extends Module {
 
   object js extends Cross[JsFansiModule](scalaVersions)
   trait JsFansiModule extends FansiModule with ScalaJSModule {
-    def scalaJSVersion = "1.10.1"
+    def scalaJSVersion = "1.16.0"
     object test extends FansiTests with ScalaJSTests
   }
 

example/web/1-todo-webapp/build.sc

@@ -11,7 +11,7 @@ object root extends RootModule with ScalaModule {
     def testFramework = "utest.runner.Framework"
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::utest::0.8.4",
       ivy"com.lihaoyi::requests::0.6.9",
     )
   }

example/web/2-webapp-cache-busting/build.sc

@@ -27,7 +27,7 @@ object root extends RootModule with ScalaModule {
   object test extends ScalaTests {
     def testFramework = "utest.runner.Framework"
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::utest::0.8.4",
       ivy"com.lihaoyi::requests::0.6.9",
     )
   }

example/web/3-scalajs-module/build.sc

@@ -1,11 +1,11 @@
 import mill._, scalalib._, scalajslib._
 
 object foo extends ScalaJSModule {
-  def scalaVersion = "2.13.8"
-  def scalaJSVersion = "1.13.0"
+  def scalaVersion = "2.13.14"
+  def scalaJSVersion = "1.16.0"
   def ivyDeps = Agg(ivy"com.lihaoyi::scalatags::0.12.0")
   object test extends ScalaJSTests {
-    def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.7.11")
+    def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.8.4")
     def testFramework = "utest.runner.Framework"
   }
 }

example/web/4-webapp-scalajs/build.sc

@@ -2,7 +2,7 @@ import mill._, scalalib._, scalajslib._
 
 object root extends RootModule with ScalaModule {
 
-  def scalaVersion = "2.13.8"
+  def scalaVersion = "2.13.14"
   def ivyDeps = Agg(
     ivy"com.lihaoyi::cask:0.9.1",
     ivy"com.lihaoyi::scalatags:0.12.0"
@@ -22,14 +22,14 @@ object root extends RootModule with ScalaModule {
     def testFramework = "utest.runner.Framework"
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::utest::0.8.4",
       ivy"com.lihaoyi::requests::0.6.9",
     )
   }
 
   object client extends ScalaJSModule {
-    def scalaVersion = "2.13.8"
-    def scalaJSVersion = "1.13.0"
+    def scalaVersion = "2.13.14"
+    def scalaJSVersion = "1.16.0"
     def ivyDeps = Agg(ivy"org.scala-js::scalajs-dom::2.2.0")
   }
 }
@@ -57,7 +57,7 @@ object root extends RootModule with ScalaModule {
 ...
 
 > curl http://localhost:8082/static/main.js
-...Scala.js...
+..."org.scalajs.linker.runtime.RuntimeLong"...
 ...
 
 > ./mill clean runBackground

example/web/5-webapp-scalajs-shared/build.sc

@@ -5,7 +5,7 @@ trait AppScalaModule extends ScalaModule {
 }
 
 trait AppScalaJSModule extends AppScalaModule with ScalaJSModule {
-  def scalaJSVersion = "1.13.0"
+  def scalaJSVersion = "1.16.0"
 }
 
 object root extends RootModule with AppScalaModule {
@@ -23,7 +23,7 @@ object root extends RootModule with AppScalaModule {
   object test extends ScalaTests with TestModule.Utest {
 
     def ivyDeps = Agg(
-      ivy"com.lihaoyi::utest::0.7.10",
+      ivy"com.lihaoyi::utest::0.8.4",
       ivy"com.lihaoyi::requests::0.6.9",
     )
   }