Upgrade scalac-options to 0.1.7

joan38 · Oct 14, 2024 · eb761e9 · eb761e9
1 parent fd0e441
commit eb761e9
Showing 1 changed file with 4 additions and 9 deletions.
diff --git 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 =