Switch to scala 2.12.1

This commit is contained in:
Alexandre Archambault 2017-01-30 23:07:14 +01:00
parent 98a4e6e617
commit e94dbc7e68
3 changed files with 3 additions and 3 deletions

View File

@ -12,7 +12,7 @@ script:
# - bash <(curl -s https://codecov.io/bash)
matrix:
include:
- env: TRAVIS_SCALA_VERSION=2.12.0 PUBLISH=1
- env: TRAVIS_SCALA_VERSION=2.12.1 PUBLISH=1
os: linux
jdk: oraclejdk8
- env: TRAVIS_SCALA_VERSION=2.11.8 PUBLISH=1

View File

@ -28,7 +28,7 @@ build_script:
- sbt ++2.10.6 coreJVM/publishLocal cache/publishLocal # to make the scripted tests happy
test_script:
- ps: Start-Job { & java -jar -noverify C:\projects\coursier\coursier launch -r http://dl.bintray.com/scalaz/releases io.get-coursier:http-server-java7_2.11:1.0.0-SNAPSHOT -- -d /C:/projects/coursier/tests/jvm/src/test/resources/test-repo/http/abc.com -u user -P pass -r realm -v }
- sbt ++2.12.0 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.10.6 testsJVM/test testsJVM/it:test plugin/scripted plugin/publishLocal sbt-shading/scripted
cache:

View File

@ -98,7 +98,7 @@ lazy val scalaVersionAgnosticCommonSettings = Seq(
lazy val commonSettings = scalaVersionAgnosticCommonSettings ++ Seq(
scalaVersion := "2.11.8",
crossScalaVersions := Seq("2.12.0", "2.11.8", "2.10.6"),
crossScalaVersions := Seq("2.12.1", "2.11.8", "2.10.6"),
libraryDependencies ++= {
if (scalaBinaryVersion.value == "2.10")
Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full))