Part 14 - fix contrib.proguard default options to filter scala.AnyKind

com-lihaoyi · Sep 20, 2024 · e17144d · e17144d
1 parent 89326be
commit e17144d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/contrib/proguard/src/mill/contrib/proguard/Proguard.scala b/contrib/proguard/src/mill/contrib/proguard/Proguard.scala
@@ -170,6 +170,12 @@ trait Proguard extends ScalaModule {
     T.log.error(
       "Proguard is set to not warn about message: can't find referenced method 'void invoke()' in library class java.lang.invoke.MethodHandle"
     )
-    Seq[String]("-dontwarn java.lang.invoke.MethodHandle")
+    T.log.error(
+      """Proguard is set to not warn about message: "scala.quoted.Type: can't find referenced class scala.AnyKind""""
+    )
+    Seq[String](
+      "-dontwarn java.lang.invoke.MethodHandle",
+      "-dontwarn scala.AnyKind"
+    )
   }
 }
diff --git a/contrib/proguard/test/src/mill/contrib/proguard/ProguardTests.scala b/contrib/proguard/test/src/mill/contrib/proguard/ProguardTests.scala
@@ -13,7 +13,7 @@ import utest.framework.TestPath
 object ProguardTests extends TestSuite {
 
   object proguard extends TestBaseModule with ScalaModule with Proguard {
-    override def scalaVersion: T[String] = T(sys.props.getOrElse("MILL_SCALA_2_13_VERSION", ???))
+    override def scalaVersion: T[String] = T(sys.props.getOrElse("MILL_SCALA_3_NEXT_VERSION", ???))
 
     def proguardContribClasspath = Task {
       millProjectModule("mill-contrib-proguard", repositoriesTask())