aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Pretty <jon.pretty@propensive.com>2018-06-13 01:00:06 +0100
committerGitHub <noreply@github.com>2018-06-13 01:00:06 +0100
commit707af80e2e7870a990189bdcf66dd8c532143e38 (patch)
tree8ad3f8c0d7502ce1e8913286ad999b5fe1896129
parenta23741f40a38328662d09ab2353ddf5972c0c53f (diff)
parent1d4a132d11a514f2d75c6cb861030299f5d11597 (diff)
downloadmagnolia-707af80e2e7870a990189bdcf66dd8c532143e38.tar.gz
magnolia-707af80e2e7870a990189bdcf66dd8c532143e38.tar.bz2
magnolia-707af80e2e7870a990189bdcf66dd8c532143e38.zip
Merge pull request #104 from xuwei-k/scalacOptions-2.13
fix scalacOptions for latest Scala 2.13.x
-rw-r--r--build.sbt17
1 files changed, 13 insertions, 4 deletions
diff --git a/build.sbt b/build.sbt
index 697b69c..903933f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -86,14 +86,23 @@ lazy val buildSettings = Seq(
"-deprecation",
"-feature",
"-Xfuture",
- "-Xexperimental",
"-Ywarn-value-discard",
"-Ywarn-dead-code",
- "-Ywarn-nullary-unit",
"-Ywarn-numeric-widen",
- "-Ywarn-inaccessible",
- "-Ywarn-adapted-args"
),
+ scalacOptions ++= {
+ CrossVersion.partialVersion(scalaVersion.value) match {
+ case Some((2, v)) if v <= 12 =>
+ Seq(
+ "-Xexperimental",
+ "-Ywarn-nullary-unit",
+ "-Ywarn-inaccessible",
+ "-Ywarn-adapted-args"
+ )
+ case _ =>
+ Nil
+ }
+ },
scmInfo := Some(
ScmInfo(url("https://github.com/propensive/magnolia"),
"scm:git:git@github.com:propensive/magnolia.git")