From a5d24b619007c9f9734153fe61c5a7740ce7835b Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Fri, 23 Dec 2022 15:53:54 +0100 Subject: [PATCH] Update geny to 1.0.0 - Update Mill to 0.10.10 - Update Scala versions --- .mill-version | 1 + build.sc | 17 ++++++++++------- mill | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 .mill-version diff --git a/.mill-version b/.mill-version new file mode 100644 index 0000000..ddf1d4a --- /dev/null +++ b/.mill-version @@ -0,0 +1 @@ +0.10.10 diff --git a/build.sc b/build.sc index e66c377..3ad7082 100644 --- a/build.sc +++ b/build.sc @@ -1,19 +1,22 @@ import mill._ import mill.scalalib.publish.{Developer, License, PomSettings, VersionControl} import scalalib._ -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 $ivy.`com.github.lolgab::mill-mima::0.0.10` +import $ivy.`com.github.lolgab::mill-mima::0.0.13` import com.github.lolgab.mill.mima._ -val dottyVersion = Option(sys.props("dottyVersion")) +val dottyVersion = sys.props.get("dottyVersion") -object requests extends Cross[RequestsModule]((List("2.12.13", "2.13.5", "2.11.12", "3.0.0") ++ dottyVersion): _*) +val scalaVersions = List("2.12.17", "2.13.10", "2.11.12", "3.1.1") ++ dottyVersion + +object requests extends Cross[RequestsModule](scalaVersions: _*) class RequestsModule(val crossScalaVersion: String) extends CrossScalaModule with PublishModule with Mima { def publishVersion = VcsVersion.vcsState().format() - def mimaPreviousVersions = Seq("0.7.0") ++ VcsVersion.vcsState().lastTag.toSeq + def mimaPreviousVersions = (Seq("0.7.0", "0.7.1") ++ VcsVersion.vcsState().lastTag.toSeq).distinct override def mimaBinaryIssueFilters = Seq( - ProblemFilter.exclude[ReversedMissingMethodProblem]("requests.BaseSession.send") + ProblemFilter.exclude[ReversedMissingMethodProblem]("requests.BaseSession.send"), + ProblemFilter.exclude[DirectMissingMethodProblem]("requests.Response.string") ) def artifactName = "requests" def pomSettings = PomSettings( @@ -27,7 +30,7 @@ class RequestsModule(val crossScalaVersion: String) extends CrossScalaModule wit ) ) def ivyDeps = Agg( - ivy"com.lihaoyi::geny::0.6.10" + ivy"com.lihaoyi::geny::1.0.0" ) object test extends Tests with TestModule.Utest { def ivyDeps = Agg( diff --git a/mill b/mill index c04905e..fb46cad 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.10.4 +DEFAULT_MILL_VERSION=0.10.10 set -e