Merge branch 'main' into update/mill-main-0.11.5

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
       run: |
         git config --global core.autocrlf false
         git config --global core.eol lf
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
         submodules: true
@@ -49,7 +49,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
         submodules: true

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
     if: github.event_name == 'push'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
         submodules: true

.mill-version

@@ -1 +1 @@
-0.11.5
+0.11.5

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "3.7.11"
+version = "3.7.17"
 
 align.preset = more
 maxColumn = 100

README.md

@@ -29,18 +29,18 @@ $ amm --class-based --tmp-output-directory
 ```
 or use [coursier](https://github.com/coursier/coursier),
 ```
-$ cs launch ammonite:3.0.0-M0-19-62705f47 --scala 2.13.10 -- --class-based --tmp-output-directory
+$ cs launch ammonite:3.0.0-M0-60-89836cd8 --scala 2.13.12 -- --class-based --tmp-output-directory
 ```
 or [Scala CLI](https://github.com/VirtusLab/scala-cli)
 ```
-$ scala-cli repl --amm --ammonite-version 3.0.0-M0-19-62705f47 --scala 2.13.10 -- --class-based --tmp-output-directory
+$ scala-cli repl --amm --ammonite-version 3.0.0-M0-60-89836cd8 --scala 2.13.12 -- --class-based --tmp-output-directory
 ```
 Ensure you are using scala 2.12 or 2.13, the only supported Scala versions as of writing this.
 
 At the Ammonite prompt, load the Spark 2.x or 3.x version of your choice, along with ammonite-spark,
 ```scala
 @ import $ivy.`org.apache.spark::spark-sql:3.3.0`
-@ import $ivy.`sh.almond::ammonite-spark:0.13.9`
+@ import $ivy.`sh.almond::ammonite-spark:0.13.12`
 ```
 (Note the two `::` before `spark-sql` or `ammonite-spark`, as these are scala dependencies.)
 

build.sc

@@ -1,6 +1,6 @@
 import $file.project.deps, deps.{Deps, Versions}
 
-import $ivy.`com.github.lolgab::mill-mima::0.0.24`
+import $ivy.`com.github.lolgab::mill-mima::0.1.0`
 import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`
 
 import com.github.lolgab.mill.mima.Mima

project/deps.sc

@@ -6,7 +6,7 @@ object Versions {
 
   def scala = Seq(scala213, scala212)
 
-  def almond        = "0.14.0-RC12"
+  def almond        = "0.14.0-RC13"
   def ammonite      = "3.0.0-M0-67-83057fea"
   def jsoniterScala = "2.13.5"
 }
@@ -18,7 +18,7 @@ object Deps {
   def ammoniteRepl     = ivy"sh.almond.tmp.ammonite:::ammonite-repl:${Versions.ammonite}"
 
   def classPathUtil = ivy"io.get-coursier::class-path-util:0.1.4"
-  def jettyServer   = ivy"org.eclipse.jetty:jetty-server:9.4.51.v20230217"
+  def jettyServer   = ivy"org.eclipse.jetty:jetty-server:9.4.54.v20240208"
   def jsoniterScalaCore =
     ivy"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-core:${Versions.jsoniterScala}"
   def jsoniterScalaMacros =
@@ -34,5 +34,5 @@ object Deps {
   }
   def sparkSql3  = ivy"org.apache.spark::spark-sql:3.0.0"
   def sparkSql32 = ivy"org.apache.spark::spark-sql:3.2.0"
-  def utest      = ivy"com.lihaoyi::utest:0.8.1"
+  def utest      = ivy"com.lihaoyi::utest:0.8.2"
 }