Skip to content

Commit 2fac9a2

Browse files
committed
support Scala 2.13.0-M2
also gratuitously bump sbt version, and fix a stray execute bit
1 parent 0ae0a53 commit 2fac9a2

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ env:
3333
- SCALA_VERSION=2.12.1
3434
- SCALA_VERSION=2.12.2
3535
- SCALA_VERSION=2.12.3
36-
- SCALA_VERSION=2.13.0-M1
36+
- SCALA_VERSION=2.13.0-M2
3737

3838
# there's no better way it seems.. https://github.com/travis-ci/travis-ci/issues/1519
3939
matrix:
@@ -46,7 +46,9 @@ matrix:
4646
- jdk: openjdk6
4747
env: SCALA_VERSION=2.12.2
4848
- jdk: openjdk6
49-
env: SCALA_VERSION=2.13.0-M1
49+
env: SCALA_VERSION=2.12.3
50+
- jdk: openjdk6
51+
env: SCALA_VERSION=2.13.0-M2
5052

5153
# Increasing ReservedCodeCacheSize minimizes scala compiler-interface compile times
5254
script:

LICENSE

100755100644
File mode changed.

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ lazy val defaults = Seq(
5656
val latest210 = 6
5757
val latest211 = 11
5858
val latest212 = 3
59-
val pre213 = List("M1")
59+
val pre213 = List("M2")
6060
val skipVersions = Set("2.11.9", "2.11.10")
6161
val scala210and211Versions = (2 to latest210).map(i => s"2.10.$i") ++ (0 to latest211).map(i => s"2.11.$i")
6262
.filterNot(skipVersions.contains(_))
@@ -68,7 +68,7 @@ lazy val defaults = Seq(
6868
},
6969
scalaTestVersion := {
7070
val Some((2, scalaMajor)) = CrossVersion.partialVersion(scalaVersion.value)
71-
if (scalaMajor >= 12) "3.0.3"
71+
if (scalaMajor >= 12) "3.0.4"
7272
else "2.1.3"
7373
},
7474
resolvers += Resolver.mavenLocal,

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.15
1+
sbt.version=0.13.16

0 commit comments

Comments
 (0)