luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch to scala 2.12.5

This commit is contained in:
Alexandre Archambault 2018-03-23 14:50:27 +01:00
parent 2e7df0e8dd
commit 4e4aa7cfa2
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -8,7 +8,7 @@ script:
# - bash <(curl -s https://codecov.io/bash) # - bash <(curl -s https://codecov.io/bash)
matrix: matrix:
include: include:
- env: SCALA_VERSION=2.12.4 NATIVE=1 PUBLISH=1 - env: SCALA_VERSION=2.12.5 NATIVE=1 PUBLISH=1
os: linux os: linux
jdk: oraclejdk8 jdk: oraclejdk8
sudo: required sudo: required
@ -28,10 +28,10 @@ matrix:
sudo: required sudo: required
services: services:
- docker - docker
- env: SCALA_VERSION=2.12.4 SBT_COURSIER=1 - env: SCALA_VERSION=2.12.5 SBT_COURSIER=1
os: linux os: linux
jdk: oraclejdk8 jdk: oraclejdk8
- env: SCALA_VERSION=2.12.4 SBT_SHADING=1 - env: SCALA_VERSION=2.12.5 SBT_SHADING=1
os: linux os: linux
jdk: oraclejdk8 jdk: oraclejdk8
- env: SCALA_VERSION=2.10.7 SBT_COURSIER=1 - env: SCALA_VERSION=2.10.7 SBT_COURSIER=1
@ -42,7 +42,7 @@ matrix:
- env: SCALA_VERSION=2.10.7 SBT_SHADING=1 - env: SCALA_VERSION=2.10.7 SBT_SHADING=1
os: linux os: linux
jdk: oraclejdk8 jdk: oraclejdk8
- env: SCALA_VERSION=2.12.4 SCALA_JS=1 - env: SCALA_VERSION=2.12.5 SCALA_JS=1
os: linux os: linux
jdk: oraclejdk8 jdk: oraclejdk8
- env: SCALA_VERSION=2.11.12 SCALA_JS=1 - env: SCALA_VERSION=2.11.12 SCALA_JS=1

8
appveyor.yml
View File

@ -13,20 +13,20 @@ install:
} }
- cmd: SET JAVA_HOME=C:\Program Files\Java\jdk1.8.0 - cmd: SET JAVA_HOME=C:\Program Files\Java\jdk1.8.0
- cmd: SET PATH=C:\sbt\sbt\bin;%JAVA_HOME%\bin;%PATH% - 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 - git submodule update --init --recursive
build_script: build_script:
- sbt ++2.11.12 clean compile coreJVM/publishLocal - sbt ++2.11.12 clean compile coreJVM/publishLocal
- sbt ++2.10.7 clean compile - 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: test_script:
- ps: Start-Job -filepath .\scripts\start-it-auth-server.ps1 -ArgumentList $pwd - 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-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 - 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.11.12 testsJVM/test testsJVM/it:test
- sbt ++2.10.7 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 - 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: branches:
only: only:

2
project/Settings.scala
View File

@ -12,7 +12,7 @@ import coursier.ShadingPlugin.autoImport._
import Aliases._ import Aliases._
object Settings { object Settings {
val scala212 = "2.12.4" val scala212 = "2.12.5"
val scala211 = "2.11.12" val scala211 = "2.11.12"
val scala210 = "2.10.7" val scala210 = "2.10.7"

4
scripts/travis.sh
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -evx 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}}" PULL_REQUEST="${PULL_REQUEST:-${TRAVIS_PULL_REQUEST:-false}}"
BRANCH="${BRANCH:-${TRAVIS_BRANCH:-$(git rev-parse --abbrev-ref HEAD)}}" BRANCH="${BRANCH:-${TRAVIS_BRANCH:-$(git rev-parse --abbrev-ref HEAD)}}"
PUBLISH="${PUBLISH:-0}" PUBLISH="${PUBLISH:-0}"
@ -41,7 +41,7 @@ launchTestRepo() {
integrationTestsRequirements() { integrationTestsRequirements() {
# Required for ~/.ivy2/local repo tests # 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 # Required for HTTP authentication tests
launchTestRepo --port 8080 --list-pages launchTestRepo --port 8080 --list-pages