Skip to content

Commit efb7e62

Browse files
authored
Merge pull request #182 from SethTisue/version-bumps
bump Scala, sbt, Scala.js versions
2 parents 653aa67 + 719cf5f commit efb7e62

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ jdk:
4343

4444
scala:
4545
- 2.11.12
46-
- 2.12.7
46+
- 2.12.8
4747
- 2.13.0-M5
4848

4949
matrix:
5050
exclude:
5151
- jdk: openjdk11
52-
env: SCALAJS_VERSION=0.6.25
52+
env: SCALAJS_VERSION=0.6.26
5353
- jdk: openjdk11
5454
env: SCALAJS_VERSION=1.0.0-M6
5555
- scala: 2.11.12
@@ -58,7 +58,7 @@ matrix:
5858
jdk: oraclejdk8
5959
- scala: 2.11.12
6060
jdk: openjdk11
61-
- scala: 2.12.7
61+
- scala: 2.12.8
6262
jdk: openjdk6
6363
- scala: 2.13.0-M5
6464
jdk: openjdk6

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import ScalaModulePlugin._
22
import sbtcrossproject.crossProject
33

4-
crossScalaVersions in ThisBuild := List("2.12.7", "2.11.12", "2.13.0-M5")
4+
crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-M5")
55

66
lazy val root = project.in(file("."))
77
.aggregate(`scala-parser-combinatorsJS`, `scala-parser-combinatorsJVM`, `scala-parser-combinatorsNative`)

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.17
1+
sbt.version=0.13.18

0 commit comments

Comments
 (0)