Bump mill to 0.11.12

VirtusLab · Sep 16, 2024 · 2697b76 · 2697b76
1 parent 2b6ecc8
commit 2697b76
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/.mill-jvm-opts b/.mill-jvm-opts
@@ -1,4 +1,4 @@
--Xmx768m
+-Xmx2048m
 -Xms128m
 -Xss8m
 -Dxsbt.skip.cp.lookup=true
diff --git a/.mill-version b/.mill-version
@@ -1 +1 @@
-0.10.12
+0.11.12
diff --git a/build.sc b/build.sc
@@ -53,7 +53,8 @@ trait ScalaCliSigningPublish extends PublishModule {
 }
 
 object shared extends Cross[Shared](Scala.scala213, Scala.scala3)
-class Shared(val crossScalaVersion: String) extends CrossScalaModule with ScalaCliSigningPublish {
+trait Shared extends CrossScalaModule with ScalaCliSigningPublish {
+  override val crossScalaVersion = crossValue
   def ivyDeps = super.ivyDeps() ++ Seq(
     Deps.jsoniterCore,
     Deps.osLib
@@ -89,8 +90,9 @@ trait CliNativeImage extends NativeImage {
 }
 
 object cli extends Cross[Cli](Scala.scala213, Scala.scala3)
-class Cli(val crossScalaVersion: String) extends CrossScalaModule with ScalaCliSigningPublish {
+trait Cli extends CrossScalaModule with ScalaCliSigningPublish {
   self =>
+  override val crossScalaVersion = crossValue
   def ivyDeps = super.ivyDeps() ++ Seq(
     Deps.bouncycastle,
     Deps.caseApp,
@@ -156,7 +158,7 @@ trait CliTests extends ScalaModule {
   def testLauncher: T[PathRef]
   def cliKind: T[String]
 
-  def scalaVersion = Scala.scala3
+  override def scalaVersion = Scala.scala3
 
   def prefix = "integration-"
   private def updateRef(name: String, ref: PathRef): PathRef = {
@@ -184,7 +186,7 @@ trait CliTests extends ScalaModule {
     super.resources() ++ Seq(mainPath)
   }
 
-  trait Tests extends super.Tests {
+  trait Tests extends ScalaTests with TestModule.Munit {
     def ivyDeps = super.ivyDeps() ++ Agg(
       Deps.expecty,
       Deps.munit
@@ -213,9 +215,11 @@ trait CliTests extends ScalaModule {
 }
 
 object `jvm-integration` extends Cross[JvmIntegration](Scala.scala213, Scala.scala3)
-class JvmIntegration(val crossScalaVersion: String) extends CliTests {
-  def testLauncher = cli(crossScalaVersion).launcher()
-  def cliKind      = "jvm"
+trait JvmIntegration extends CrossScalaModule with CliTests { self =>
+  scalaVersion
+  override val crossScalaVersion = crossValue
+  def testLauncher               = cli(crossScalaVersion).launcher()
+  def cliKind                    = "jvm"
 
   object test extends Tests
 }

diff --git a/mill b/mill
@@ -12,7 +12,7 @@
 # Licensed under the Apache License, Version 2.0
 
 
-DEFAULT_MILL_VERSION=0.10.12
+DEFAULT_MILL_VERSION=0.11.12
 
 set -e
 

diff --git a/mill.bat b/mill.bat
@@ -15,7 +15,7 @@ rem setlocal seems to be unavailable on Windows 95/98/ME
 rem but I don't think we need to support them in 2019
 setlocal enabledelayedexpansion
 
-set "DEFAULT_MILL_VERSION=0.10.12"
+set "DEFAULT_MILL_VERSION=0.11.12"
 
 set "MILL_REPO_URL=https://github.com/com-lihaoyi/mill"