From 0db5d8d6f6d9c5fd1459564dadb7a7fb18731efe Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 3 Jul 2023 18:57:55 +0100 Subject: [PATCH] disable -Werror when using Java 20 (#467) --- project/PekkoDisciplinePlugin.scala | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/project/PekkoDisciplinePlugin.scala b/project/PekkoDisciplinePlugin.scala index 7e141d03e4..f6bfc7a449 100644 --- a/project/PekkoDisciplinePlugin.scala +++ b/project/PekkoDisciplinePlugin.scala @@ -91,6 +91,11 @@ object PekkoDisciplinePlugin extends AutoPlugin { ), Compile / doc / scalacOptions := Seq()) + // ignore Scala compile warnings for Java 20+ + lazy val jvmIgnoreWarnings = { + System.getProperty("java.version").startsWith("2") + } + /** * We are a little less strict in docs */ @@ -115,11 +120,10 @@ object PekkoDisciplinePlugin extends AutoPlugin { Compile / scalacOptions ++= Seq("-Xfatal-warnings"), Test / scalacOptions --= testUndiscipline, Compile / javacOptions ++= ( - if (scalaVersion.value.startsWith("3.")) { - Seq() + if (jvmIgnoreWarnings || scalaVersion.value.startsWith("3.") || nonFatalJavaWarningsFor(name.value)) { + Seq.empty } else { - if (!nonFatalJavaWarningsFor(name.value)) Seq("-Werror", "-Xlint:deprecation", "-Xlint:unchecked") - else Seq.empty + Seq("-Werror", "-Xlint:deprecation", "-Xlint:unchecked") } ), Compile / doc / javacOptions := Seq("-Xdoclint:none"),