Skip to content

Commit

Permalink
Update build to JDK 11, Scala 2.12.7, Sbt 1.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Andriy Plokhotnyuk committed Oct 6, 2018
1 parent f2cf409 commit 809af8a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
13 changes: 6 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@ language: scala
matrix:
include:
- os: linux
jdk: oraclejdk9
scala: 2.12.4
addons:
apt:
packages:
- oracle-java9-installer # Forces use of newer JDK 9 build
jdk: oraclejdk11
scala: 2.12.7
- os: linux
jdk: openjdk8
scala: 2.12.4
scala: 2.12.7
- os: linux
jdk: oraclejdk11
scala: 2.11.12
- os: linux
jdk: oraclejdk8
scala: 2.11.12
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ lazy val commonSettings = Seq(
url = url("https://github.com/AnderEnder")
),
),
scalaVersion := "2.12.6",
scalaVersion := "2.12.7",
resolvers += Resolver.jcenterRepo,
scalacOptions ++= Seq(
"-deprecation",
Expand Down Expand Up @@ -100,7 +100,7 @@ lazy val `fsi-macros` = project
.settings(mimaSettings: _*)
.settings(publishSettings: _*)
.settings(
crossScalaVersions := Seq("2.13.0-M4", "2.12.6", "2.11.12"),
crossScalaVersions := Seq("2.13.0-M4", "2.12.7", "2.11.12"),
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
"org.scalatest" %% "scalatest" % "3.0.6-SNAP2" % Test
Expand All @@ -113,7 +113,7 @@ lazy val `fsi-benchmark-core` = project
.settings(commonSettings: _*)
.settings(noPublishSettings: _*)
.settings(
crossScalaVersions := Seq("2.13.0-M4", "2.12.6", "2.11.12"),
crossScalaVersions := Seq("2.13.0-M4", "2.12.7", "2.11.12"),
libraryDependencies ++= Seq(
"pl.project13.scala" % "sbt-jmh-extras" % "0.3.4",
"org.scalatest" %% "scalatest" % "3.0.6-SNAP2" % Test
Expand All @@ -126,7 +126,7 @@ lazy val `fsi-benchmark` = project
.settings(commonSettings: _*)
.settings(noPublishSettings: _*)
.settings(
crossScalaVersions := Seq("2.12.6", "2.11.12"),
crossScalaVersions := Seq("2.12.7", "2.11.12"),
libraryDependencies ++= Seq(
"com.dongxiguo" %% "fastring" % "1.0.0",
"com.outr" %% "perfolation" % "1.0.4",
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.1.2
sbt.version=1.2.3

0 comments on commit 809af8a

Please sign in to comment.