Skip to content

Commit

Permalink
Update Mill to build the plugin to 0.11 (#21)
Browse files Browse the repository at this point in the history
  • Loading branch information
lolgab authored Nov 3, 2023
1 parent 20dab48 commit 2936df5
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.10.12
0.11.2
24 changes: 12 additions & 12 deletions build.sc
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import mill._

import mill.scalalib._
import mill.scalalib.api.Util.scalaNativeBinaryVersion
import mill.scalalib.api.ZincWorkerUtil.scalaNativeBinaryVersion
import mill.scalalib.publish._
import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest::0.6.1`
import mill.main.BuildInfo
import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest::0.7.1`
import de.tobiasroeser.mill.integrationtest._
import $ivy.`com.goyeau::mill-scalafix::0.2.11`
import $ivy.`com.goyeau::mill-scalafix::0.3.1`
import com.goyeau.mill.scalafix.ScalafixModule
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.3.0`
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`
import de.tobiasroeser.mill.vcs.version.VcsVersion
import os.Path

Expand Down Expand Up @@ -35,12 +36,13 @@ trait CommonPublish extends PublishModule {
}

object `mill-crossplatform`
extends Cross[MillcrossplatformCross](millBinaryVersions: _*)
class MillcrossplatformCross(millBinaryVersion: String)
extends Cross[MillcrossplatformCross](millBinaryVersions)
trait MillcrossplatformCross
extends ScalaModule
with CommonPublish
with ScalafixModule {
override def millSourcePath = super.millSourcePath / os.up
with ScalafixModule
with Cross.Module[String] {
def millBinaryVersion: String = crossValue
override def artifactName = s"mill-crossplatform_mill$millBinaryVersion"

override def sources = T.sources {
Expand All @@ -57,13 +59,11 @@ class MillcrossplatformCross(millBinaryVersion: String)

def scalacOptions =
super.scalacOptions() ++ Seq("-Ywarn-unused", "-deprecation", "-feature")

def scalafixIvyDeps = Agg(ivy"com.github.liancheng::organize-imports:0.6.0")
}

object itest extends Cross[itestCross]("0.11.0")
class itestCross(millVersion: String) extends MillIntegrationTestModule {
override def millSourcePath: Path = super.millSourcePath / os.up
trait itestCross extends MillIntegrationTestModule with Cross.Module[String] {
def millVersion: String = crossValue
def millTestVersion = millVersion
def pluginsUnderTest = Seq(
`mill-crossplatform`(millBinaryVersion(millVersion))
Expand Down

0 comments on commit 2936df5

Please sign in to comment.