From adfc9e6ff79bbc1aad42443fb2c61c6fdbef8cf9 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 15 Sep 2023 22:28:26 +0200 Subject: [PATCH 1/4] Update scala-library to 2.13.12 (#39) Pull request: https://github.com/lefou/mill-jbake/pull/39 --- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sc b/build.sc index 141bb07..3c0f180 100644 --- a/build.sc +++ b/build.sc @@ -14,7 +14,7 @@ import mill.define.{Target, Task} trait Setup { val millPlatform: String val millVersion: String - def scalaVersion = "2.13.11" + def scalaVersion = "2.13.12" def testMillVersions: Seq[String] } From f9148a340b83c37635d3ce47d07d9bd93f6dde67 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 21 Sep 2023 21:50:47 +0200 Subject: [PATCH 2/4] Update scala-library to 2.12.18 (#38) Pull request: https://github.com/lefou/mill-jbake/pull/38 --- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sc b/build.sc index 3c0f180..04753fe 100644 --- a/build.sc +++ b/build.sc @@ -38,7 +38,7 @@ object Setup { object R06 extends Setup { override val millPlatform = "0.6" override val millVersion = "0.6.0" - override val scalaVersion = "2.12.15" + override val scalaVersion = "2.12.18" override val testMillVersions = Seq("0.6.3", "0.6.2", "0.6.1", "0.6.0") } } From 8b1cf294d3c246bdf083c24228f59ee033cea3fb Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 21 Sep 2023 21:51:18 +0200 Subject: [PATCH 3/4] Update de.tobiasroeser.mill.vcs.version to 0.4.0 (#37) Pull request: https://github.com/lefou/mill-jbake/pull/37 --- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sc b/build.sc index 04753fe..e7bc22c 100644 --- a/build.sc +++ b/build.sc @@ -1,7 +1,7 @@ // build.sc import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest::0.6.0` -import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.1.4` +import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0` import mill._ import mill.scalalib._ From 1c7b7021372d13886b87b310ebdb50190faf740e Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Sat, 23 Sep 2023 13:39:04 +0200 Subject: [PATCH 4/4] Tighten the used versions in cross-build (#42) Pull request: https://github.com/lefou/mill-jbake/pull/42 --- build.sc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/build.sc b/build.sc index e7bc22c..32c19dc 100644 --- a/build.sc +++ b/build.sc @@ -16,30 +16,35 @@ trait Setup { val millVersion: String def scalaVersion = "2.13.12" def testMillVersions: Seq[String] + def osLibVersion: String } object Setup { object R010 extends Setup { override val millPlatform = "0.10" - override val millVersion = "0.10.0" + override val millVersion = "0.10.0" // scala-steward:off // we skip 0.10.4 tests, as these don't run under windows properly override val testMillVersions = Seq("0.10.12", millVersion) + override val osLibVersion = "0.8.0" // scala-steward:off } object R09 extends Setup { override val millPlatform = "0.9" - override val millVersion = "0.9.3" + override val millVersion = "0.9.3" // scala-steward:off override val testMillVersions = Seq("0.9.12", millVersion) + override val osLibVersion = "0.7.1" // scala-steward:off } object R07 extends Setup { override val millPlatform = "0.7" - override val millVersion = "0.7.0" + override val millVersion = "0.7.0" // scala-steward:off override val testMillVersions = Seq("0.8.0", "0.7.3", millVersion) + override val osLibVersion = "0.7.0" // scala-steward:off } object R06 extends Setup { override val millPlatform = "0.6" - override val millVersion = "0.6.0" + override val millVersion = "0.6.0" // scala-steward:off override val scalaVersion = "2.12.18" override val testMillVersions = Seq("0.6.3", "0.6.2", "0.6.1", "0.6.0") + override val osLibVersion = "0.6.3" // scala-steward:off } } @@ -59,7 +64,7 @@ trait JbakeConfig extends CrossScalaModule with PublishModule { override def compileIvyDeps = Agg( ivy"com.lihaoyi::mill-main:${millVersion}", ivy"com.lihaoyi::mill-scalalib:${millVersion}", - ivy"com.lihaoyi::os-lib:0.6.3" + ivy"com.lihaoyi::os-lib:${setup.osLibVersion}" ) override def artifactName = T("de.tobiasroeser.mill.jbake")