Skip to content

Commit e17144d

Browse files
committed
Part 14 - fix contrib.proguard default options to filter scala.AnyKind
1 parent 89326be commit e17144d

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

contrib/proguard/src/mill/contrib/proguard/Proguard.scala

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,12 @@ trait Proguard extends ScalaModule {
170170
T.log.error(
171171
"Proguard is set to not warn about message: can't find referenced method 'void invoke()' in library class java.lang.invoke.MethodHandle"
172172
)
173-
Seq[String]("-dontwarn java.lang.invoke.MethodHandle")
173+
T.log.error(
174+
"""Proguard is set to not warn about message: "scala.quoted.Type: can't find referenced class scala.AnyKind""""
175+
)
176+
Seq[String](
177+
"-dontwarn java.lang.invoke.MethodHandle",
178+
"-dontwarn scala.AnyKind"
179+
)
174180
}
175181
}

contrib/proguard/test/src/mill/contrib/proguard/ProguardTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import utest.framework.TestPath
1313
object ProguardTests extends TestSuite {
1414

1515
object proguard extends TestBaseModule with ScalaModule with Proguard {
16-
override def scalaVersion: T[String] = T(sys.props.getOrElse("MILL_SCALA_2_13_VERSION", ???))
16+
override def scalaVersion: T[String] = T(sys.props.getOrElse("MILL_SCALA_3_NEXT_VERSION", ???))
1717

1818
def proguardContribClasspath = Task {
1919
millProjectModule("mill-contrib-proguard", repositoriesTask())

0 commit comments

Comments
 (0)