From 2b76117fb4f660850cec8256670976e32d72084e Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Sat, 2 Apr 2022 15:08:29 +0200 Subject: [PATCH] Update internal Mill to 0.10 (#40) * Update internal Mill to 0.10 * Fix deprecation warning --- .mill-version | 2 +- build.sc | 8 ++++---- mill | 2 +- .../com/github/lolgab/mill/mima/internal/Utils.scala | 7 +++++++ .../com/github/lolgab/mill/mima/internal/Utils.scala | 7 +++++++ mill-mima/src/com/github/lolgab/mill/mima/MimaBase.scala | 2 +- 6 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 mill-mima/src-mill0.10/com/github/lolgab/mill/mima/internal/Utils.scala create mode 100644 mill-mima/src-mill0.9/com/github/lolgab/mill/mima/internal/Utils.scala diff --git a/.mill-version b/.mill-version index 6889a31..5eef0f1 100644 --- a/.mill-version +++ b/.mill-version @@ -1 +1 @@ -0.9.11 \ No newline at end of file +0.10.2 diff --git a/build.sc b/build.sc index ffb228a..9a16936 100644 --- a/build.sc +++ b/build.sc @@ -4,13 +4,13 @@ import mill.scalalib._ import mill.scalalib.api.Util.scalaNativeBinaryVersion import mill.scalalib.publish._ import $ivy.`com.lihaoyi::mill-contrib-bloop:$MILL_VERSION` -import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest_mill0.9:0.4.1-16-63f11c` +import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest::0.5.0` import de.tobiasroeser.mill.integrationtest._ -import $ivy.`com.goyeau::mill-scalafix:0.2.5` +import $ivy.`com.goyeau::mill-scalafix::0.2.8` import com.goyeau.mill.scalafix.ScalafixModule -import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version_mill0.9:0.1.1` +import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.1.4` import de.tobiasroeser.mill.vcs.version.VcsVersion -import $ivy.`com.github.lolgab::mima_mill0.9:0.0.1` +import $ivy.`com.github.lolgab::mill-mima::0.0.9` import com.github.lolgab.mill.mima._ import os.Path diff --git a/mill b/mill index f896b71..c8ff9ea 100755 --- a/mill +++ b/mill @@ -3,7 +3,7 @@ # This is a wrapper script, that automatically download mill from GitHub release pages # You can give the required mill version with MILL_VERSION env variable # If no version is given, it falls back to the value of DEFAULT_MILL_VERSION -DEFAULT_MILL_VERSION=0.9.8 +DEFAULT_MILL_VERSION=0.10.2 set -e diff --git a/mill-mima/src-mill0.10/com/github/lolgab/mill/mima/internal/Utils.scala b/mill-mima/src-mill0.10/com/github/lolgab/mill/mima/internal/Utils.scala new file mode 100644 index 0000000..680ed94 --- /dev/null +++ b/mill-mima/src-mill0.10/com/github/lolgab/mill/mima/internal/Utils.scala @@ -0,0 +1,7 @@ +package com.github.lolgab.mill.mima.internal + +private[mima] object Utils { + def scalaBinaryVersion(version: String): String = { + mill.scalalib.api.ZincWorkerUtil.scalaBinaryVersion(version) + } +} diff --git a/mill-mima/src-mill0.9/com/github/lolgab/mill/mima/internal/Utils.scala b/mill-mima/src-mill0.9/com/github/lolgab/mill/mima/internal/Utils.scala new file mode 100644 index 0000000..e3b6f7a --- /dev/null +++ b/mill-mima/src-mill0.9/com/github/lolgab/mill/mima/internal/Utils.scala @@ -0,0 +1,7 @@ +package com.github.lolgab.mill.mima.internal + +private[mima] object Utils { + def scalaBinaryVersion(version: String): String = { + mill.scalalib.api.Util.scalaBinaryVersion(version) + } +} diff --git a/mill-mima/src/com/github/lolgab/mill/mima/MimaBase.scala b/mill-mima/src/com/github/lolgab/mill/mima/MimaBase.scala index fdc5b13..9112d8c 100644 --- a/mill-mima/src/com/github/lolgab/mill/mima/MimaBase.scala +++ b/mill-mima/src/com/github/lolgab/mill/mima/MimaBase.scala @@ -2,6 +2,7 @@ package com.github.lolgab.mill.mima import scala.util.chaining._ +import com.github.lolgab.mill.mima.internal.Utils.scalaBinaryVersion import com.typesafe.tools.mima.core.MyProblemReporting import com.typesafe.tools.mima.core.Problem import com.typesafe.tools.mima.core.ProblemFilters @@ -12,7 +13,6 @@ import mill.api.Result import mill.define.Command import mill.define.Target import mill.scalalib._ -import mill.scalalib.api.Util.scalaBinaryVersion private[mima] trait MimaBase extends ScalaModule