Switch to scala 2.11.8, SBT scala-js 0.6.7

This commit is contained in:
Alexandre Archambault 2016-03-13 22:57:23 +01:00
parent 32a4ccc072
commit 29f8d49c83
5 changed files with 8 additions and 8 deletions

View File

@ -6,13 +6,13 @@ install:
os:
- osx
script:
- project/travis.sh "${TRAVIS_SCALA_VERSION:-2.11.7}" "$TRAVIS_PULL_REQUEST" "$TRAVIS_BRANCH" "$PUBLISH"
- project/travis.sh "${TRAVIS_SCALA_VERSION:-2.11.8}" "$TRAVIS_PULL_REQUEST" "$TRAVIS_BRANCH" "$PUBLISH"
# Uncomment once https://github.com/scoverage/sbt-scoverage/issues/111 is fixed
# after_success:
# - bash <(curl -s https://codecov.io/bash)
matrix:
include:
- env: TRAVIS_SCALA_VERSION=2.11.7 PUBLISH=1
- env: TRAVIS_SCALA_VERSION=2.11.8 PUBLISH=1
os: linux
jdk: oraclejdk8
- env: TRAVIS_SCALA_VERSION=2.10.6 PUBLISH=1

View File

@ -15,10 +15,10 @@ install:
- cmd: SET SBT_OPTS=-XX:MaxPermSize=2g -Xmx4g
- cmd: SET COURSIER_NO_TERM=1
build_script:
- sbt ++2.11.7 clean compile coreJVM/publishLocal
- sbt ++2.11.8 clean compile coreJVM/publishLocal
- sbt ++2.10.6 clean compile
test_script:
- sbt ++2.11.7 testsJVM/test # Would node be around for testsJS/test?
- sbt ++2.11.8 testsJVM/test # Would node be around for testsJS/test?
- sbt ++2.10.6 testsJVM/test
cache:
- C:\sbt\

View File

@ -104,8 +104,8 @@ lazy val baseCommonSettings = Seq(
) ++ releaseSettings
lazy val commonSettings = baseCommonSettings ++ Seq(
scalaVersion := "2.11.7",
crossScalaVersions := Seq("2.11.7", "2.10.6"),
scalaVersion := "2.11.8",
crossScalaVersions := Seq("2.11.8", "2.10.6"),
libraryDependencies ++= {
if (scalaVersion.value startsWith "2.10.")
Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.0.1" cross CrossVersion.full))

View File

@ -1,5 +1,5 @@
addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.6.8")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.5")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.7")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.1.0")
addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.0")

View File

@ -1,5 +1,5 @@
com.github.alexarchambault:coursier_2.11:1.0.0-SNAPSHOT:compile
org.scala-lang:scala-library:2.11.7:default
org.scala-lang:scala-library:2.11.8:default
org.scala-lang.modules:scala-parser-combinators_2.11:1.0.4:default
org.scala-lang.modules:scala-xml_2.11:1.0.4:default
org.scalaz:scalaz-core_2.11:7.1.2:default