Skip to content

Commit 961f782

Browse files
authored
Merge pull request #353 from limansky/scala_2_13
Add Scala 2.13.0-M2 suppport
2 parents 99309ff + ddf65bd commit 961f782

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ notifications:
1414

1515
scala:
1616
- 2.10.6
17-
- 2.11.8
18-
- 2.12.0
17+
- 2.11.11
18+
- 2.12.3
19+
- 2.13.0-M2
1920
jdk:
2021
- oraclejdk8
2122
env:

build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ lazy val isRelease = false
1010
lazy val travisCommit = Option(System.getenv().get("TRAVIS_COMMIT"))
1111

1212
lazy val scalaVersionSettings = Seq(
13-
scalaVersion := "2.12.1",
14-
crossScalaVersions := Seq("2.10.6", "2.11.8", scalaVersion.value)
13+
scalaVersion := "2.12.3",
14+
crossScalaVersions := Seq("2.10.6", "2.11.11", "2.13.0-M2", scalaVersion.value)
1515
)
1616

1717
lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
@@ -56,7 +56,6 @@ lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
5656
"-feature",
5757
"-unchecked",
5858
"-Xfatal-warnings",
59-
"-Xlint",
6059
"-Xfuture",
6160
"-Yno-adapted-args",
6261
"-Ywarn-dead-code",
@@ -65,8 +64,9 @@ lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
6564
"-Ywarn-nullary-unit",
6665
"-Ywarn-numeric-widen") ++ {
6766
scalaBinaryVersion.value match {
68-
case "2.10" => Nil
69-
case _ => Seq("-Ywarn-infer-any", "-Ywarn-unused-import")
67+
case "2.10" => Seq("-Xlint")
68+
case "2.11" => Seq("-Xlint", "-Ywarn-infer-any", "-Ywarn-unused-import")
69+
case _ => Seq("-Xlint:-unused", "-Ywarn-infer-any", "-Ywarn-unused:imports,-patvars,-implicits,-locals,-privates,-params")
7070
}
7171
},
7272

0 commit comments

Comments
 (0)