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.11.11

This commit is contained in:
Alexandre Archambault 2017-04-26 14:11:38 +02:00
parent 916488393a
commit b65fdf3c7b
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -13,7 +13,7 @@ matrix:
- env: TRAVIS_SCALA_VERSION=2.12.1 PUBLISH=1 - env: TRAVIS_SCALA_VERSION=2.12.1 PUBLISH=1
os: linux os: linux
jdk: oraclejdk8 jdk: oraclejdk8
- env: TRAVIS_SCALA_VERSION=2.11.8 PUBLISH=1 - env: TRAVIS_SCALA_VERSION=2.11.11 PUBLISH=1
os: linux os: linux
jdk: oraclejdk8 jdk: oraclejdk8
sudo: required sudo: required
@ -28,7 +28,7 @@ matrix:
- env: TRAVIS_SCALA_VERSION=2.12.1 PUBLISH=1 SCALA_JS=1 - env: TRAVIS_SCALA_VERSION=2.12.1 PUBLISH=1 SCALA_JS=1
os: linux os: linux
jdk: oraclejdk8 jdk: oraclejdk8
- env: TRAVIS_SCALA_VERSION=2.11.8 PUBLISH=1 SCALA_JS=1 - env: TRAVIS_SCALA_VERSION=2.11.11 PUBLISH=1 SCALA_JS=1
os: linux os: linux
jdk: oraclejdk8 jdk: oraclejdk8
- env: TRAVIS_SCALA_VERSION=2.10.6 PUBLISH=1 SCALA_JS=1 - env: TRAVIS_SCALA_VERSION=2.10.6 PUBLISH=1 SCALA_JS=1

4
appveyor.yml
View File

@ -22,7 +22,7 @@ install:
Set-Location -Path .. Set-Location -Path ..
} }
build_script: build_script:
- sbt ++2.11.8 clean compile coreJVM/publishLocal http-server/publishLocal - sbt ++2.11.11 clean compile coreJVM/publishLocal http-server/publishLocal
- sbt ++2.10.6 clean compile - sbt ++2.10.6 clean compile
- sbt ++2.10.6 coreJVM/publishLocal cache/publishLocal # to make the scripted tests happy - sbt ++2.10.6 coreJVM/publishLocal cache/publishLocal # to make the scripted tests happy
test_script: test_script:
@ -30,7 +30,7 @@ test_script:
- 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.1 testsJVM/test testsJVM/it:test # Would node be around for testsJS/test? - sbt ++2.12.1 testsJVM/test testsJVM/it:test # Would node be around for testsJS/test?
- sbt ++2.11.8 testsJVM/test testsJVM/it:test - sbt ++2.11.11 testsJVM/test testsJVM/it:test
- sbt ++2.10.6 testsJVM/test testsJVM/it:test sbt-coursier/scripted sbt-coursier/publishLocal sbt-shading/scripted - sbt ++2.10.6 testsJVM/test testsJVM/it:test sbt-coursier/scripted sbt-coursier/publishLocal sbt-shading/scripted
cache: cache:
- C:\Users\appveyor\.ivy2\cache - C:\Users\appveyor\.ivy2\cache

2
project/CoursierSettings.scala
View File

@ -55,7 +55,7 @@ object CoursierSettings {
lazy val shared = javaScalaPluginShared ++ Seq( lazy val shared = javaScalaPluginShared ++ Seq(
scalaVersion := "2.12.1", scalaVersion := "2.12.1",
crossScalaVersions := Seq("2.12.1", "2.11.8", "2.10.6"), crossScalaVersions := Seq("2.12.1", "2.11.11", "2.10.6"),
libs ++= { libs ++= {
if (scalaBinaryVersion.value == "2.10") if (scalaBinaryVersion.value == "2.10")
Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)) Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full))

2
scripts/generate-launcher.sh
View File

@ -6,7 +6,7 @@ CACHE_VERSION=v1
SBTPACK_LAUNCHER="$(dirname "$0")/../cli/target/pack/bin/coursier" SBTPACK_LAUNCHER="$(dirname "$0")/../cli/target/pack/bin/coursier"
if [ ! -f "$SBTPACK_LAUNCHER" ]; then if [ ! -f "$SBTPACK_LAUNCHER" ]; then
sbt ++2.11.8 cli/pack sbt ++2.11.11 cli/pack
fi fi
"$SBTPACK_LAUNCHER" bootstrap \ "$SBTPACK_LAUNCHER" bootstrap \

2
scripts/generate-standalone-launcher.sh
View File

@ -5,7 +5,7 @@ cd "$(dirname "$0")/.."
if [ ! -e cli/target/scala-2.11/proguard/coursier-standalone.jar ]; then if [ ! -e cli/target/scala-2.11/proguard/coursier-standalone.jar ]; then
echo "Generating proguarded JAR..." 1>&2 echo "Generating proguarded JAR..." 1>&2
sbt ++2.11.8 cli/proguard:proguard sbt ++2.11.11 cli/proguard:proguard
fi fi
cat > coursier-standalone << EOF cat > coursier-standalone << EOF

2
scripts/travis.sh
View File

@ -26,7 +26,7 @@ launchTestRepo() {
integrationTestsRequirements() { integrationTestsRequirements() {
# Required for ~/.ivy2/local repo tests # Required for ~/.ivy2/local repo tests
sbt ++2.11.8 coreJVM/publishLocal http-server/publishLocal sbt ++2.11.11 coreJVM/publishLocal http-server/publishLocal
# Required for HTTP authentication tests # Required for HTTP authentication tests
launchTestRepo --port 8080 --list-pages launchTestRepo --port 8080 --list-pages

2
tests/shared/src/test/resources/resolutions/io.get-coursier/coursier_2.11/1.0.0-SNAPSHOT
View File

@ -1,5 +1,5 @@
io.get-coursier:coursier_2.11:1.0.0-SNAPSHOT:compile io.get-coursier:coursier_2.11:1.0.0-SNAPSHOT:compile
org.jsoup:jsoup:1.10.2:default org.jsoup:jsoup:1.10.2:default
org.scala-lang:scala-library:2.11.8:default org.scala-lang:scala-library:2.11.11:default
org.scala-lang.modules:scala-xml_2.11:1.0.6:default org.scala-lang.modules:scala-xml_2.11:1.0.6:default
org.scalaz:scalaz-core_2.11:7.2.8:default org.scalaz:scalaz-core_2.11:7.2.8:default