From eb761e9f8df701f4ee647186146325cfb49e01ad Mon Sep 17 00:00:00 2001 From: Joan Goyeau Date: Mon, 14 Oct 2024 09:39:24 -0400 Subject: [PATCH] Upgrade scalac-options to 0.1.7 --- build.sc | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/build.sc b/build.sc index c87ead8..5902c78 100644 --- a/build.sc +++ b/build.sc @@ -1,6 +1,6 @@ import $ivy.`com.goyeau::mill-git::0.2.5` import $ivy.`com.goyeau::mill-scalafix::0.3.1` -import $ivy.`org.typelevel::scalac-options:0.1.4` +import $ivy.`org.typelevel::scalac-options:0.1.7` import $file.project.Dependencies import Dependencies.Dependencies._ @@ -13,7 +13,7 @@ import mill.scalalib.TestModule.Munit import mill.scalalib._ import mill.scalalib.api.ZincWorkerUtil.isScala3 import mill.scalalib.publish.{Developer, License, PomSettings, VersionControl} -import org.typelevel.scalacoptions.ScalacOptions.{advancedOption, fatalWarningOptions, release, source3} +import org.typelevel.scalacoptions.ScalacOptions._ import org.typelevel.scalacoptions.{ScalaVersion, ScalacOptions} object `kubernetes-client` extends Cross[KubernetesClientModule]("3.3.1", "2.13.10", "2.12.17") @@ -25,13 +25,8 @@ class KubernetesClientModule(val crossScalaVersion: String) lazy val jvmVersion = "11" override def javacOptions = super.javacOptions() ++ Seq("-source", jvmVersion, "-target", jvmVersion) override def scalacOptions = super.scalacOptions() ++ ScalacOptions.tokensForVersion( - scalaVersion() match { - case "3.3.1" => ScalaVersion.V3_3_1 - case "2.13.10" => ScalaVersion.V2_13_9 - case "2.12.17" => ScalaVersion.V2_12_13 - }, - ScalacOptions.default + release(jvmVersion) + source3 + - advancedOption("max-inlines", List("50"), _.isAtLeast(ScalaVersion.V3_0_0)) // ++ fatalWarningOptions + ScalaVersion.unsafeFromString(scalaVersion()), + ScalacOptions.default + release(jvmVersion) + source3 + maxInlines(50) // ++ fatalWarningOptions ) override def ivyDeps =