diff --git a/.travis.yml b/.travis.yml index ed57860b9..3b031ac2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ script: # - bash <(curl -s https://codecov.io/bash) matrix: include: - - env: SCALA_VERSION=2.12.4 NATIVE=1 PUBLISH=1 + - env: SCALA_VERSION=2.12.5 NATIVE=1 PUBLISH=1 os: linux jdk: oraclejdk8 sudo: required @@ -28,10 +28,10 @@ matrix: sudo: required services: - docker - - env: SCALA_VERSION=2.12.4 SBT_COURSIER=1 + - env: SCALA_VERSION=2.12.5 SBT_COURSIER=1 os: linux jdk: oraclejdk8 - - env: SCALA_VERSION=2.12.4 SBT_SHADING=1 + - env: SCALA_VERSION=2.12.5 SBT_SHADING=1 os: linux jdk: oraclejdk8 - env: SCALA_VERSION=2.10.7 SBT_COURSIER=1 @@ -42,7 +42,7 @@ matrix: - env: SCALA_VERSION=2.10.7 SBT_SHADING=1 os: linux jdk: oraclejdk8 - - env: SCALA_VERSION=2.12.4 SCALA_JS=1 + - env: SCALA_VERSION=2.12.5 SCALA_JS=1 os: linux jdk: oraclejdk8 - env: SCALA_VERSION=2.11.12 SCALA_JS=1 diff --git a/appveyor.yml b/appveyor.yml index 983ea5eed..c2be2b6d8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,20 +13,20 @@ install: } - cmd: SET JAVA_HOME=C:\Program Files\Java\jdk1.8.0 - cmd: SET PATH=C:\sbt\sbt\bin;%JAVA_HOME%\bin;%PATH% - - cmd: SET SBT_OPTS=-XX:MaxPermSize=2g -Xmx4g + - cmd: SET SBT_OPTS=-XX:MaxPermSize=2g -Xmx4g -Xss2m - git submodule update --init --recursive build_script: - sbt ++2.11.12 clean compile coreJVM/publishLocal - sbt ++2.10.7 clean compile - - sbt ++2.12.4 coreJVM/publishLocal cacheJVM/publishLocal extra/publishLocal scalazJVM/publishLocal cli/publishLocal + - sbt ++2.12.5 coreJVM/publishLocal cacheJVM/publishLocal extra/publishLocal scalazJVM/publishLocal cli/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.12.5 testsJVM/test testsJVM/it:test # Would node be around for testsJS/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-shading/scripted sbt-shading/*" # for sbt 1.0 + - sbt ++2.12.5 "sbt-coursier/scripted sbt-coursier/simple" "sbt-shading/scripted sbt-shading/*" # for sbt 1.0 - sbt ++2.10.7 "sbt-coursier/scripted sbt-coursier/*" "sbt-coursier/scripted sbt-coursier-0.13/*" "sbt-shading/scripted sbt-shading/*" "sbt-shading/scripted sbt-shading-0.13/*" # for sbt 0.13 branches: only: diff --git a/project/Settings.scala b/project/Settings.scala index be5dfb024..435f46f50 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -12,7 +12,7 @@ import coursier.ShadingPlugin.autoImport._ import Aliases._ object Settings { - val scala212 = "2.12.4" + val scala212 = "2.12.5" val scala211 = "2.11.12" val scala210 = "2.10.7" diff --git a/scripts/travis.sh b/scripts/travis.sh index 51939af71..357da18d9 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -evx -SCALA_VERSION="${SCALA_VERSION:-${TRAVIS_SCALA_VERSION:-2.12.4}}" +SCALA_VERSION="${SCALA_VERSION:-${TRAVIS_SCALA_VERSION:-2.12.5}}" PULL_REQUEST="${PULL_REQUEST:-${TRAVIS_PULL_REQUEST:-false}}" BRANCH="${BRANCH:-${TRAVIS_BRANCH:-$(git rev-parse --abbrev-ref HEAD)}}" PUBLISH="${PUBLISH:-0}" @@ -41,7 +41,7 @@ launchTestRepo() { integrationTestsRequirements() { # Required for ~/.ivy2/local repo tests - sbt ++2.11.12 coreJVM/publishLocal ++2.12.4 cli/publishLocal + sbt ++2.11.12 coreJVM/publishLocal ++2.12.5 cli/publishLocal # Required for HTTP authentication tests launchTestRepo --port 8080 --list-pages