From 279ca03d984a77138d5776929023795654396fa3 Mon Sep 17 00:00:00 2001 From: Chris Kipp Date: Mon, 24 Oct 2022 18:39:50 +0200 Subject: [PATCH] chore(deps): update various version This pr updates the following: - Scala 2.13 to the latest 2.13.10 - mill-integrationtest to 0.6.1 - mill.vcs.version to 0.3.0 and remove the stripping of v (done by default now) - Mill to latest 0.10.8 with a .mill-version file --- .mill-version | 1 + build.sc | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 .mill-version diff --git a/.mill-version b/.mill-version new file mode 100644 index 0000000..1a46c7f --- /dev/null +++ b/.mill-version @@ -0,0 +1 @@ +0.10.8 diff --git a/build.sc b/build.sc index 19c213a..a343faf 100644 --- a/build.sc +++ b/build.sc @@ -1,23 +1,23 @@ -import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest::0.6.0` +import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest::0.6.1` import de.tobiasroeser.mill.integrationtest._ -import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.1.4` +import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.3.0` import de.tobiasroeser.mill.vcs.version.VcsVersion import mill._ import mill.scalalib._ import mill.scalalib.api.Util.scalaNativeBinaryVersion import publish._ -val millVersions = Seq("0.10.5", "0.9.12") +val millVersions = Seq("0.10.8", "0.9.12") def millBinaryVersion(millVersion: String) = scalaNativeBinaryVersion(millVersion) object `mill-tpolecat` extends Cross[MillTpolecatCross](millVersions: _*) class MillTpolecatCross(millVersion: String) extends CrossModuleBase with PublishModule { - override def crossScalaVersion = "2.13.7" + override def crossScalaVersion = "2.13.10" override def artifactSuffix = s"_mill${millBinaryVersion(millVersion)}" + super.artifactSuffix() def compileIvyDeps = Agg(ivy"com.lihaoyi::mill-scalalib:$millVersion") - def publishVersion: T[String] = VcsVersion.vcsState().format(tagModifier = _.dropWhile(_ == 'v')) + def publishVersion: T[String] = VcsVersion.vcsState().format() def pomSettings = PomSettings( description = "scalac options for the enlightened",