Skip to content

Commit cbeab4b

Browse files
committed
Support Mill 0.13.0-M0
1 parent 10814cf commit cbeab4b

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020
- name: Checks
2121
run: |
2222
git config --global user.name "CI"
23-
./mill __.checkStyle + __.test + __.docJar + __.publishLocal
23+
./mill __.checkStyle + __[0.12.0].test + __.docJar + __.publishLocal
2424
- name: Publish
2525
if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') || github.event_name == 'release'
2626
run: |
2727
echo "${{secrets.pgp_secret_key}}" > private.key
2828
gpg --batch --yes --import private.key
2929
rm private.key
3030
31-
./mill mill.scalalib.PublishModule/publishAll --sonatypeCreds ${{secrets.sonatype_credentials}} --publishArtifacts __.publishArtifacts --release true
31+
./mill mill.scalalib.PublishModule/ --sonatypeCreds ${{secrets.sonatype_credentials}}

build.mill

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@ import com.goyeau.mill.scalafix.StyleModule
66
import mill._
77
import mill.Task.dest
88
import mill.scalalib._
9-
import mill.scalalib.api.ZincWorkerUtil.scalaNativeBinaryVersion
109
import mill.scalalib.publish.{Developer, License, PomSettings, VersionControl}
1110
import org.typelevel.scalacoptions.ScalacOptions._
1211
import org.typelevel.scalacoptions.{ScalaVersion, ScalacOptions}
1312

14-
object `mill-git` extends Cross[MillGitCross]("0.12.0")
13+
object `mill-git` extends Cross[MillGitCross]("0.12.0", "0.13.0-M0")
1514
trait MillGitCross extends Cross.Module[String] with StyleModule with GitVersionedPublishModule {
1615
val millVersion = crossValue
17-
override def scalaVersion = "2.13.15"
16+
override def scalaVersion = millBinaryVersion(millVersion) match {
17+
case "0.11" => "2.13.16"
18+
case "0.13" => "3.6.3"
19+
}
1820
override def scalacOptions = super.scalacOptions() ++ ScalacOptions.tokensForVersion(
1921
ScalaVersion.unsafeFromString(scalaVersion()),
2022
ScalacOptions.default + source3 ++ fatalWarningOptions
@@ -58,7 +60,8 @@ trait MillGitCross extends Cross.Module[String] with StyleModule with GitVersion
5860
)
5961
}
6062

61-
def millBinaryVersion(millVersion: String) = scalaNativeBinaryVersion(millVersion) match {
62-
case "0.12" => "0.11" // 0.12.x is binary compatible with 0.11.x
63-
case version => version
63+
def millBinaryVersion(millVersion: String) = millVersion match {
64+
case version if version.startsWith("0.12") => "0.11" // 0.12.x is binary compatible with 0.11.x
65+
case version if version.startsWith("0.13") => "0.13"
66+
case _ => throw new IllegalArgumentException(s"Unsupported Mill version: $millVersion")
6467
}

0 commit comments

Comments
 (0)