Skip to content

Commit e911d0c

Browse files
committed
build: Update Mill to 0.11.1
1 parent 01f8395 commit e911d0c

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
7474
- uses: jodersky/setup-mill@master
7575
with:
76-
mill-version: 0.10.8
76+
mill-version: 0.11.1
7777
- name: Cache mill
7878
uses: actions/cache@v2
7979
with:
@@ -146,6 +146,6 @@ jobs:
146146
147147
- uses: jodersky/setup-mill@master
148148
with:
149-
mill-version: 0.10.8
149+
mill-version: 0.11.1
150150
- name: Publish
151151
run: mill -i io.kipp.mill.ci.release.ReleaseModule/publishAll

.mill-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.11.1

build.sc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import coursier.maven.MavenRepository
44
import mill._, scalalib._, publish._
55
import mill.modules.Assembly._
66

7-
class SparkModule(_scalaVersion: String, sparkVersion: String) extends SbtModule with CiReleaseModule {
7+
trait SparkModule extends Cross.Module2[String, String] with SbtModule with CiReleaseModule {
88
outer =>
9-
10-
override def scalaVersion = _scalaVersion
9+
override def scalaVersion = crossValue
10+
val sparkVersion = crossValue2
1111

1212
override def millSourcePath = super.millSourcePath / os.up / os.up / os.up
1313

@@ -95,7 +95,7 @@ class SparkModule(_scalaVersion: String, sparkVersion: String) extends SbtModule
9595
}
9696
}
9797

98-
object test extends Tests with SbtModule with TestModule.ScalaTest {
98+
object test extends SbtModuleTests with TestModule.ScalaTest {
9999

100100
override def millSourcePath = super.millSourcePath
101101

@@ -143,4 +143,4 @@ val crossMatrix = {
143143
// (spark34).map(spark => (scala212, spark))
144144
}
145145

146-
object `spark-excel` extends Cross[SparkModule](crossMatrix: _*) {}
146+
object `spark-excel` extends Cross[SparkModule](crossMatrix) {}

0 commit comments

Comments
 (0)