From e201a786a67126cd5410421e35ffc6acb6a4eaba Mon Sep 17 00:00:00 2001 From: Carlos Quiroz Date: Tue, 22 Nov 2016 10:52:22 -0300 Subject: [PATCH] Upgrade to sbt 0.13.13, Scala 2.12.0 and Scala.js 0.6.13. --- .travis.yml | 5 ++--- build.sbt | 2 ++ project/build.properties | 2 +- project/build.sbt | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 109352a..d2436bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,11 @@ script: - sbt ++$TRAVIS_SCALA_VERSION root/scalastyle testSuiteJVM/scalastyle testSuiteJVM/test:scalastyle testSuite/scalastyle testSuite/test:scalastyle - sbt ++$TRAVIS_SCALA_VERSION testSuiteJVM/test - sbt ++$TRAVIS_SCALA_VERSION testSuite/test - - sbt ++$TRAVIS_SCALA_VERSION 'set scalaJSUseRhino in Global := false' testSuite/test - - sbt ++$TRAVIS_SCALA_VERSION 'set scalaJSUseRhino in Global := false' 'set scalaJSStage in Global := FullOptStage' testSuite/test + - sbt ++$TRAVIS_SCALA_VERSION 'set scalaJSStage in Global := FullOptStage' testSuite/test - sbt ++$TRAVIS_SCALA_VERSION publishLocal scala: - 2.10.6 - 2.11.8 - - 2.12.0-M4 + - 2.12.0 jdk: - oraclejdk8 diff --git a/build.sbt b/build.sbt index ab87c2f..697d16a 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,8 @@ import sbt.Keys._ import org.scalajs.sbtplugin.cross.CrossProject +crossScalaVersions := Seq("2.10.4", "2.11.8", "2.12.0") + val commonSettings: Seq[Setting[_]] = Seq( version := "0.1.1-SNAPSHOT", organization := "org.scala-js", diff --git a/project/build.properties b/project/build.properties index 817bc38..27e88aa 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.9 +sbt.version=0.13.13 diff --git a/project/build.sbt b/project/build.sbt index 4a0095d..befeda5 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.9") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13") addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0")