Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Mill to 0.11.2 #101

Merged
merged 2 commits into from
Sep 6, 2023
Merged

Update Mill to 0.11.2 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33ee9b9
Update Scala to 2.12.12
lefou Sep 6, 2023
2e43e9b
Update Mill to 0.11.2
lefou Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .mill-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.10.12
0.11.2
13 changes: 7 additions & 6 deletions build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import mill._, scalalib._, publish._
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`

import mill._, scalalib._, publish._
import de.tobiasroeser.mill.vcs.version.VcsVersion

object Deps {
def acyclicAgg(scalaVersion: String) =
Agg(ivy"com.lihaoyi:::acyclic:0.3.8")
.filter(_ => scalaVersion != "2.13.11" /* exclude unreleased versions, if any */ )
.filter(_ => scalaVersion != "2.13.12" /* exclude unreleased versions, if any */ )

def scalaCompiler(scalaVersion: String) = ivy"org.scala-lang:scala-compiler:${scalaVersion}"
val utest = ivy"com.lihaoyi::utest:0.8.1"
Expand All @@ -14,10 +15,10 @@ object Deps {
val crosses =
Seq("2.11.12") ++
8.to(18).map("2.12." + _) ++
0.to(11).map("2.13." + _)
0.to(12).map("2.13." + _)

object acyclic extends Cross[AcyclicModule](crosses: _*)
class AcyclicModule(val crossScalaVersion: String) extends CrossScalaModule with PublishModule {
object acyclic extends Cross[AcyclicModule](crosses)
trait AcyclicModule extends CrossScalaModule with PublishModule {
override def crossFullScalaVersion = true
override def artifactName = "acyclic"
def publishVersion = VcsVersion.vcsState().format()
Expand All @@ -38,7 +39,7 @@ class AcyclicModule(val crossScalaVersion: String) extends CrossScalaModule with

override def scalacPluginIvyDeps = Deps.acyclicAgg(crossScalaVersion)

object test extends Tests with TestModule.Utest {
object test extends ScalaTests with TestModule.Utest {
override def sources = T.sources(millSourcePath / "src", millSourcePath / "resources")
override def ivyDeps = Agg(
Deps.utest,
Expand Down