diff --git a/build.sc b/build.sc index 9cf85751099..a966199ac82 100644 --- a/build.sc +++ b/build.sc @@ -49,7 +49,7 @@ object Settings { object Deps { // The Scala version to use - val scalaVersion = "2.13.11" + val scalaVersion = "2.13.12" // Scoverage 1.x will not get releases for newer Scala versions val scalaVersionForScoverageWorker1 = "2.13.8" // The Scala 2.12.x version to use for some workers @@ -100,7 +100,7 @@ object Deps { } val play = Seq(Play_2_8, Play_2_7, Play_2_6).map(p => (p.playBinVersion, p)).toMap - val acyclic = ivy"com.lihaoyi:::acyclic:0.3.8" + val acyclic = ivy"com.lihaoyi:::acyclic:0.3.9" val ammoniteVersion = "3.0.0-M0-32-96e851cb" val asmTree = ivy"org.ow2.asm:asm-tree:9.5" val bloopConfig = ivy"ch.epfl.scala::bloop-config:1.5.5" @@ -141,7 +141,7 @@ object Deps { val scalafmtDynamic = ivy"org.scalameta::scalafmt-dynamic:3.7.10" def scalaReflect(scalaVersion: String) = ivy"org.scala-lang:scala-reflect:${scalaVersion}" val scalacScoveragePlugin = ivy"org.scoverage:::scalac-scoverage-plugin:1.4.11" - val scoverage2Version = "2.0.10" + val scoverage2Version = "2.0.11" val scalacScoverage2Plugin = ivy"org.scoverage:::scalac-scoverage-plugin:${scoverage2Version}" val scalacScoverage2Reporter = ivy"org.scoverage::scalac-scoverage-reporter:${scoverage2Version}" val scalacScoverage2Domain = ivy"org.scoverage::scalac-scoverage-domain:${scoverage2Version}" @@ -374,7 +374,9 @@ trait MillStableScalaModule extends MillPublishScalaModule with Mima { ProblemFilter.exclude[Problem]("mill.define.Ctx#Impl*"), ProblemFilter.exclude[Problem]("mill.resolve.ResolveNotFoundHandler*"), // See https://github.com/com-lihaoyi/mill/pull/2739 - ProblemFilter.exclude[ReversedMissingMethodProblem]("mill.scalajslib.ScalaJSModule.mill$scalajslib$ScalaJSModule$$super$scalaLibraryIvyDeps") + ProblemFilter.exclude[ReversedMissingMethodProblem]( + "mill.scalajslib.ScalaJSModule.mill$scalajslib$ScalaJSModule$$super$scalaLibraryIvyDeps" + ) ) def mimaPreviousVersions: T[Seq[String]] = Settings.mimaBaseVersions @@ -1793,5 +1795,13 @@ def validate(): Command[Unit] = { object DependencyFetchDummy extends ScalaModule { def scalaVersion = Deps.scalaVersion def compileIvyDeps = - Agg(Deps.millScip, Deps.semanticDbJava, Deps.semanticDB, Deps.testScalaTest, Deps.testZioTest) + Agg( + Deps.millScip, + Deps.semanticDbJava, + Deps.semanticDB, + Deps.testScalaTest, + Deps.testZioTest, + Deps.acyclic, + Deps.scalacScoverage2Plugin + ) } diff --git a/integration/feature/scoverage/repo/build.sc b/integration/feature/scoverage/repo/build.sc index d865cbd7d7a..f3c6cf7664c 100644 --- a/integration/feature/scoverage/repo/build.sc +++ b/integration/feature/scoverage/repo/build.sc @@ -16,14 +16,14 @@ object Deps { object core extends Cross[CoreCross]("2.13.11") trait CoreCross extends CrossScalaModule with ScoverageModule { - override def scoverageVersion = "2.0.10" + override def scoverageVersion = "2.0.11" object test extends ScoverageTests with TestModule.ScalaTest { override def ivyDeps = Agg(Deps.scalaTest, Deps.millMain) } } object extra extends ScalaModule with ScoverageModule { - override def scoverageVersion = "2.0.10" + override def scoverageVersion = "2.0.11" override def scalaVersion = "2.13.11" // customized scoverage data override lazy val scoverage: ScoverageData = new ScoverageData {