From c13c69764b95bbeb74b1a6d6c0c520f55920dd0d Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 12 Mar 2018 11:18:18 +0100 Subject: [PATCH] Really switch to latest scala 2.10 / 2.11 --- .travis.yml | 12 ++++++------ appveyor.yml | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index fbdf255cf..4617e8340 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,13 +18,13 @@ matrix: - curl https://raw.githubusercontent.com/scala-native/scala-native/v0.3.6/bin/travis_setup.sh | bash -x services: - docker - - env: SCALA_VERSION=2.11.11 PUBLISH=1 + - env: SCALA_VERSION=2.11.12 PUBLISH=1 os: linux jdk: oraclejdk8 sudo: required services: - docker - - env: SCALA_VERSION=2.10.6 PUBLISH=1 + - env: SCALA_VERSION=2.10.7 PUBLISH=1 os: linux jdk: oraclejdk8 sudo: required @@ -36,21 +36,21 @@ matrix: - env: SCALA_VERSION=2.12.4 SBT_SHADING=1 os: linux jdk: oraclejdk8 - - env: SCALA_VERSION=2.10.6 SBT_COURSIER=1 + - env: SCALA_VERSION=2.10.7 SBT_COURSIER=1 os: linux jdk: oraclejdk8 services: - docker - - env: SCALA_VERSION=2.10.6 SBT_SHADING=1 + - env: SCALA_VERSION=2.10.7 SBT_SHADING=1 os: linux jdk: oraclejdk8 - env: SCALA_VERSION=2.12.4 SCALA_JS=1 os: linux jdk: oraclejdk8 - - env: SCALA_VERSION=2.11.11 SCALA_JS=1 + - env: SCALA_VERSION=2.11.12 SCALA_JS=1 os: linux jdk: oraclejdk8 - - env: SCALA_VERSION=2.10.6 SCALA_JS=1 + - env: SCALA_VERSION=2.10.7 SCALA_JS=1 os: linux jdk: oraclejdk8 - os: linux diff --git a/appveyor.yml b/appveyor.yml index 6871207ed..ec18d34ea 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,18 +16,18 @@ install: - git submodule update --init --recursive build_script: - sbt ++2.11.12 clean compile coreJVM/publishLocal - - sbt ++2.10.6 clean compile + - sbt ++2.10.7 clean compile - sbt ++2.12.4 coreJVM/publishLocal cache/publishLocal cli/publishLocal extra/publishLocal sbt-shared/publishLocal - - sbt ++2.10.6 coreJVM/publishLocal cache/publishLocal extra/publishLocal sbt-shared/publishLocal + - sbt ++2.10.7 coreJVM/publishLocal cache/publishLocal extra/publishLocal sbt-shared/publishLocal test_script: - ps: Start-Job -filepath .\scripts\start-it-auth-server.ps1 -ArgumentList $pwd - ps: Start-Sleep -s 15 # wait for the first server to have downloaded its dependencies - ps: Start-Job -filepath .\scripts\start-it-no-listing-server.ps1 -ArgumentList $pwd - sbt ++2.12.4 testsJVM/test testsJVM/it:test # Would node be around for testsJS/test? - - sbt ++2.11.11 testsJVM/test testsJVM/it:test - - sbt ++2.10.6 testsJVM/test testsJVM/it:test + - sbt ++2.11.12 testsJVM/test testsJVM/it:test + - sbt ++2.10.7 testsJVM/test testsJVM/it:test - sbt ++2.12.4 "sbt-coursier/scripted sbt-coursier/simple" sbt-coursier/publishLocal "sbt-shading/scripted sbt-shading/*" # for sbt 1.0 - - sbt ++2.10.6 "sbt-coursier/scripted sbt-coursier/*" "sbt-coursier/scripted sbt-coursier-0.13/*" sbt-coursier/publishLocal "sbt-shading/scripted sbt-shading/*" "sbt-shading/scripted sbt-shading-0.13/*" # for sbt 0.13 + - sbt ++2.10.7 "sbt-coursier/scripted sbt-coursier/*" "sbt-coursier/scripted sbt-coursier-0.13/*" sbt-coursier/publishLocal "sbt-shading/scripted sbt-shading/*" "sbt-shading/scripted sbt-shading-0.13/*" # for sbt 0.13 branches: only: - master