build: Update Mill to 0.11.1

nightscape · Aug 1, 2023 · 3d855e8 · 3d855e8
1 parent 01f8395
commit 3d855e8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -146,6 +146,6 @@ jobs:
 
       - uses: jodersky/setup-mill@master
         with:
-          mill-version: 0.10.8
+          mill-version: 0.11.1
       - name: Publish
         run: mill -i io.kipp.mill.ci.release.ReleaseModule/publishAll
diff --git a/.mill-version b/.mill-version
@@ -0,0 +1 @@
+0.11.1
diff --git a/build.sc b/build.sc
@@ -4,10 +4,10 @@ import coursier.maven.MavenRepository
 import mill._, scalalib._, publish._
 import mill.modules.Assembly._
 
-class SparkModule(_scalaVersion: String, sparkVersion: String) extends SbtModule with CiReleaseModule {
+trait SparkModule extends Cross.Module2[String, String] with SbtModule with CiReleaseModule {
   outer =>
-
-  override def scalaVersion = _scalaVersion
+  override def scalaVersion = crossValue
+  val sparkVersion = crossValue2
 
   override def millSourcePath = super.millSourcePath / os.up / os.up / os.up
 
@@ -95,7 +95,7 @@ class SparkModule(_scalaVersion: String, sparkVersion: String) extends SbtModule
     }
   }
 
-  object test extends Tests with SbtModule with TestModule.ScalaTest {
+  object test extends SbtModuleTests with TestModule.ScalaTest {
 
     override def millSourcePath = super.millSourcePath
 
@@ -143,4 +143,4 @@ val crossMatrix = {
   //  (spark34).map(spark => (scala212, spark))
 }
 
-object `spark-excel` extends Cross[SparkModule](crossMatrix: _*) {}
+object `spark-excel` extends Cross[SparkModule](crossMatrix) {}