Skip to content

Commit f61500d

Browse files
committed
Fix scala version condition on warning silencing
1 parent 788d754 commit f61500d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ lazy val runtime = (projectMatrix in file("scalapb-runtime"))
8181
),
8282
scalacOptions ++= {
8383
CrossVersion.partialVersion(scalaVersion.value) match {
84-
case Some((v, n)) if v == 2 && n >= 13 | v == 3 =>
84+
case Some((2, _)) =>
8585
Seq(
8686
"-Wconf:msg=[Uu]nused&origin=scala[.]collection[.]compat._:s",
8787
"-Wconf:cat=deprecation&msg=.*[Jj]avaGenerateEqualsAndHash.*deprecated.*:s"
@@ -319,7 +319,7 @@ val e2eCommonSettings = commonSettings ++ Seq(
319319
Compile / PB.recompile := true, // always regenerate protos, not cache
320320
scalacOptions ++= {
321321
CrossVersion.partialVersion(scalaVersion.value) match {
322-
case Some((v, n)) if v == 2 && n >= 13 | v == 3 =>
322+
case Some((2, _)) =>
323323
Seq(
324324
"-Wconf:msg=[uU]nused&origin=com.thesamet.pb.MisplacedMapper.weatherMapper:s",
325325
"-Wconf:cat=deprecation&src=.*custom_options.*:s",

0 commit comments

Comments
 (0)