Skip to content

Commit c999e42

Browse files
authored
Merge pull request #219 from dwijnand/versions
Test against latest Scala 2.12.6 & sbt 1.1.5
2 parents 2187e2b + a90e4fc commit c999e42

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.travis.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ env:
2020
- TEST_COMMAND="scripted"
2121
- TEST_COMMAND="testFunctional"
2222
- TEST_COMMAND="-Dmima.testScalaVersion=2.11.12 testFunctional"
23-
- TEST_COMMAND="-Dmima.testScalaVersion=2.12.4 testFunctional"
23+
- TEST_COMMAND="-Dmima.testScalaVersion=2.12.6 testFunctional"
2424
- TEST_COMMAND="it:test"
2525
- TEST_COMMAND="mimaReportBinaryIssues"
26-
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.4 ^^1.0.0 test"
27-
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.4 ^^1.0.0 scripted"
28-
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.4 ^^1.1.1 test"
29-
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.4 ^^1.1.1 scripted"
30-
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.4 testFunctional"
31-
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.4 it:test"
32-
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.4 ^^1.0.0 mimaReportBinaryIssues"
33-
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.4 ^^1.1.1 mimaReportBinaryIssues"
26+
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.6 ^^1.0.0 test"
27+
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.6 ^^1.0.0 scripted"
28+
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.6 ^^1.1.5 test"
29+
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.6 ^^1.1.5 scripted"
30+
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.6 testFunctional"
31+
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.6 it:test"
32+
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.6 ^^1.0.0 mimaReportBinaryIssues"
33+
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.6 ^^1.1.5 mimaReportBinaryIssues"
3434

3535
script:
3636
- sbt $TEST_COMMAND

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ object BuildSettings {
2424
scalaVersion := sys.props.getOrElse("mima.buildScalaVersion",
2525
(CrossVersion partialVersion (sbtVersion in pluginCrossBuild).value match {
2626
case Some((0, 13)) => "2.10.7"
27-
case Some((1, _)) => "2.12.4"
27+
case Some((1, _)) => "2.12.6"
2828
case _ => sys error s"Unhandled sbt version ${(sbtVersion in pluginCrossBuild).value}"
2929
})
3030
),

0 commit comments

Comments
 (0)