Skip to content

Commit 809af8a

Browse files
author
Andriy Plokhotnyuk
committed
Update build to JDK 11, Scala 2.12.7, Sbt 1.2.3
1 parent f2cf409 commit 809af8a

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

.travis.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@ language: scala
22
matrix:
33
include:
44
- os: linux
5-
jdk: oraclejdk9
6-
scala: 2.12.4
7-
addons:
8-
apt:
9-
packages:
10-
- oracle-java9-installer # Forces use of newer JDK 9 build
5+
jdk: oraclejdk11
6+
scala: 2.12.7
117
- os: linux
128
jdk: openjdk8
13-
scala: 2.12.4
9+
scala: 2.12.7
10+
- os: linux
11+
jdk: oraclejdk11
12+
scala: 2.11.12
1413
- os: linux
1514
jdk: oraclejdk8
1615
scala: 2.11.12

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ lazy val commonSettings = Seq(
4848
url = url("https://github.com/AnderEnder")
4949
),
5050
),
51-
scalaVersion := "2.12.6",
51+
scalaVersion := "2.12.7",
5252
resolvers += Resolver.jcenterRepo,
5353
scalacOptions ++= Seq(
5454
"-deprecation",
@@ -100,7 +100,7 @@ lazy val `fsi-macros` = project
100100
.settings(mimaSettings: _*)
101101
.settings(publishSettings: _*)
102102
.settings(
103-
crossScalaVersions := Seq("2.13.0-M4", "2.12.6", "2.11.12"),
103+
crossScalaVersions := Seq("2.13.0-M4", "2.12.7", "2.11.12"),
104104
libraryDependencies ++= Seq(
105105
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
106106
"org.scalatest" %% "scalatest" % "3.0.6-SNAP2" % Test
@@ -113,7 +113,7 @@ lazy val `fsi-benchmark-core` = project
113113
.settings(commonSettings: _*)
114114
.settings(noPublishSettings: _*)
115115
.settings(
116-
crossScalaVersions := Seq("2.13.0-M4", "2.12.6", "2.11.12"),
116+
crossScalaVersions := Seq("2.13.0-M4", "2.12.7", "2.11.12"),
117117
libraryDependencies ++= Seq(
118118
"pl.project13.scala" % "sbt-jmh-extras" % "0.3.4",
119119
"org.scalatest" %% "scalatest" % "3.0.6-SNAP2" % Test
@@ -126,7 +126,7 @@ lazy val `fsi-benchmark` = project
126126
.settings(commonSettings: _*)
127127
.settings(noPublishSettings: _*)
128128
.settings(
129-
crossScalaVersions := Seq("2.12.6", "2.11.12"),
129+
crossScalaVersions := Seq("2.12.7", "2.11.12"),
130130
libraryDependencies ++= Seq(
131131
"com.dongxiguo" %% "fastring" % "1.0.0",
132132
"com.outr" %% "perfolation" % "1.0.4",

project/build.properties

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

0 commit comments

Comments
 (0)