From ff6913dd569756b22a90f6960647c1236e657a3d Mon Sep 17 00:00:00 2001 From: "Diego E. Alonso-Blas" Date: Tue, 8 Jan 2019 00:09:18 +0000 Subject: [PATCH 1/2] Upgrade CI build Upgrade Ruby version to 2.3.0. Add othe JDKs Upgrade Scala version 2.12 to 2.12.8 --- .travis.yml | 6 ++++-- project/ProjectPlugin.scala | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28196b2e..423233f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,12 @@ language: scala scala: - 2.11.12 -- 2.12.6 +- 2.12.8 jdk: +- oraclejdk9 - oraclejdk8 +- openjdk8 before_install: - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc @@ -14,7 +16,7 @@ before_install: - export PATH=${PATH}:./vendor/bundle install: -- rvm use 2.2.8 --install --fuzzy +- rvm use 2.3.0 --install --fuzzy - gem update --system - gem install sass - gem install jekyll -v 3.2.1 diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala index 467a17b7..352cdd85 100644 --- a/project/ProjectPlugin.scala +++ b/project/ProjectPlugin.scala @@ -111,8 +111,8 @@ object ProjectPlugin extends AutoPlugin { ), orgUpdateDocFilesSetting += baseDirectory.value / "tut", scalaOrganization := "org.scala-lang", - scalaVersion := "2.12.6", - crossScalaVersions := List("2.11.12", "2.12.6"), + scalaVersion := "2.12.8", + crossScalaVersions := List("2.11.12", "2.12.8"), resolvers += Resolver.sonatypeRepo("snapshots"), resolvers += Resolver.sonatypeRepo("releases"), addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.7"), From db69d834a65f4da709b9dac56254c06e6ca6c99f Mon Sep 17 00:00:00 2001 From: "Diego E. Alonso-Blas" Date: Tue, 8 Jan 2019 14:03:12 +0000 Subject: [PATCH 2/2] Back to Scala 2.12.6, ScalaJs is not yet for 2.12.8. --- .travis.yml | 2 +- project/ProjectPlugin.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 423233f2..3c21197d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: scala scala: - 2.11.12 -- 2.12.8 +- 2.12.6 jdk: - oraclejdk9 diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala index 352cdd85..467a17b7 100644 --- a/project/ProjectPlugin.scala +++ b/project/ProjectPlugin.scala @@ -111,8 +111,8 @@ object ProjectPlugin extends AutoPlugin { ), orgUpdateDocFilesSetting += baseDirectory.value / "tut", scalaOrganization := "org.scala-lang", - scalaVersion := "2.12.8", - crossScalaVersions := List("2.11.12", "2.12.8"), + scalaVersion := "2.12.6", + crossScalaVersions := List("2.11.12", "2.12.6"), resolvers += Resolver.sonatypeRepo("snapshots"), resolvers += Resolver.sonatypeRepo("releases"), addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.7"),