raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

allow minor versions after Scala 3.0 (#30331)

Browse source
This commit is contained in:
Patrik Nordwall 2021-07-09 10:48:14 +02:00 • committed by GitHub
parent 0bafbce327
commit 8468e6ae03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
project/AkkaDisciplinePlugin.scala
View file

@ -67,7 +67,7 @@ object AkkaDisciplinePlugin extends AutoPlugin {
lazy val nowarnSettings = { lazy val nowarnSettings = {
Dependencies.getScalaVersion() match { Dependencies.getScalaVersion() match {
case three if three.startsWith("3.0") => case three if three.startsWith("3.") =>
Seq(Compile / scalacOptions := Seq(), Compile / doc / scalacOptions := Seq()) Seq(Compile / scalacOptions := Seq(), Compile / doc / scalacOptions := Seq())
case _ => case _ =>
Seq( Seq(
@ -99,7 +99,7 @@ object AkkaDisciplinePlugin extends AutoPlugin {
Compile / scalacOptions ++= Seq("-Xfatal-warnings"), Compile / scalacOptions ++= Seq("-Xfatal-warnings"),
Test / scalacOptions --= testUndicipline, Test / scalacOptions --= testUndicipline,
Compile / javacOptions ++= ( Compile / javacOptions ++= (
if (Dependencies.getScalaVersion().startsWith("3.0")) { if (Dependencies.getScalaVersion().startsWith("3.")) {
Seq() Seq()
} else { } else {
if (!nonFatalJavaWarningsFor(name.value)) Seq("-Werror", "-Xlint:deprecation", "-Xlint:unchecked") if (!nonFatalJavaWarningsFor(name.value)) Seq("-Werror", "-Xlint:deprecation", "-Xlint:unchecked")

8
project/Dependencies.scala
View file

@ -36,14 +36,14 @@ object Dependencies {
val sslConfigVersion = "0.4.2" val sslConfigVersion = "0.4.2"
val scalaTestVersion = { val scalaTestVersion = {
if (getScalaVersion().startsWith("3.0")) { if (getScalaVersion().startsWith("3.")) {
"3.2.9" "3.2.9"
} else { } else {
"3.1.4" "3.1.4"
} }
} }
val scalaTestScalaCheckVersion = { val scalaTestScalaCheckVersion = {
if (getScalaVersion().startsWith("3.0")) { if (getScalaVersion().startsWith("3.")) {
"1-15" "1-15"
} else { } else {
"1-14" "1-14"
@ -56,10 +56,10 @@ object Dependencies {
System.getProperty("akka.build.scalaVersion", "default") match { System.getProperty("akka.build.scalaVersion", "default") match {
case twoThirteen if twoThirteen.startsWith("2.13") => scala213Version case twoThirteen if twoThirteen.startsWith("2.13") => scala213Version
case twoTwelve if twoTwelve.startsWith("2.12") => scala212Version case twoTwelve if twoTwelve.startsWith("2.12") => scala212Version
case three if three.startsWith("3.0") => scala3Version case three if three.startsWith("3.") => scala3Version
case "default" => scala213Version case "default" => scala213Version
case other => case other =>
throw new IllegalArgumentException(s"Unsupported scala version [$other]. Must be 2.12, 2.13 or 3.0.") throw new IllegalArgumentException(s"Unsupported scala version [$other]. Must be 2.12, 2.13 or 3.x.")
} }
} }