Skip to content

Commit

Permalink
Update Mill to 0.11.5-9-1cd494 (#139)
Browse files Browse the repository at this point in the history
  • Loading branch information
lolgab authored Nov 3, 2023
1 parent 07d2234 commit 8a336c3
Show file tree
Hide file tree
Showing 2 changed files with 14 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.5-9-1cd494
25 changes: 13 additions & 12 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import $file.utils

import mill._
import mill.scalalib._
import mill.scalalib.api.Util.scalaNativeBinaryVersion
import mill.scalalib.api.ZincWorkerUtil.scalaNativeBinaryVersion
import mill.scalalib.publish._
import $ivy.`com.lihaoyi::mill-contrib-buildinfo:`
import mill.contrib.buildinfo.BuildInfo
import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest::0.7.1`
import de.tobiasroeser.mill.integrationtest._
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.1`
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`
import de.tobiasroeser.mill.vcs.version.VcsVersion
import $ivy.`com.github.lolgab::mill-mima::0.0.24`
import com.github.lolgab.mill.mima._
Expand Down Expand Up @@ -61,14 +61,15 @@ trait Common extends ScalaModule with PublishModule with ScalafixModule {
def scalafixIvyDeps = Agg(ivy"com.github.liancheng::organize-imports:0.6.0")
}

object `mill-mima` extends Cross[MillMimaCross](millBinaryVersions: _*)
class MillMimaCross(val millBinaryVersion: String)
object `mill-mima` extends Cross[MillMimaCross](millBinaryVersions)
trait MillMimaCross
extends Common
with BuildInfo
with Mima {
with Mima
with Cross.Module[String] {
val millBinaryVersion = crossValue
override def moduleDeps = super.moduleDeps ++ Seq(`mill-mima-worker-api`)
override def artifactName = s"mill-mima_mill$millBinaryVersion"
override def millSourcePath = super.millSourcePath / os.up
def mimaPreviousVersions = Seq("0.0.17")
override def sources = T.sources(
super.sources() ++ Seq(
Expand All @@ -79,11 +80,11 @@ class MillMimaCross(val millBinaryVersion: String)
override def compileIvyDeps = super.compileIvyDeps() ++ Agg(
ivy"com.lihaoyi::mill-scalalib:${millVersion(millBinaryVersion)}"
)
override def buildInfoMembers = Map(
"publishVersion" -> publishVersion()
override def buildInfoMembers = Seq(
BuildInfo.Value("publishVersion", publishVersion())
)
override def buildInfoObjectName = "MimaBuildInfo"
override def buildInfoPackageName = Some("com.github.lolgab.mill.mima.worker")
override def buildInfoPackageName = "com.github.lolgab.mill.mima.worker"
}

object `mill-mima-worker-api` extends Common
Expand All @@ -94,9 +95,9 @@ object `mill-mima-worker-impl` extends Common {
)
}

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

0 comments on commit 8a336c3

Please sign in to comment.