From e94dbc7e6868fa5908635ed0e64b835153d5ff59 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 30 Jan 2017 23:07:14 +0100 Subject: [PATCH] Switch to scala 2.12.1 --- .travis.yml | 2 +- appveyor.yml | 2 +- build.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4b2fda4ff..b9d531540 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/appveyor.yml b/appveyor.yml index 8b1a98d8d..a58ad00ae 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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: diff --git a/build.sbt b/build.sbt index 0ff75dd5a..17e290b61 100644 --- a/build.sbt +++ b/build.sbt @@ -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))