From fcd2e937e4939d59c77795ad30919f885e561ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Tue, 2 Jun 2015 15:24:46 +0200 Subject: [PATCH] Update Scala versions to 2.10.5 and 2.11.6. --- .travis.yml | 6 +++--- build.sbt | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index dad894619..5b708ce26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: scala script: - sbt ++$TRAVIS_SCALA_VERSION package - - sbt ++2.11.4 readme/run + - sbt ++2.11.6 readme/run scala: - - 2.10.4 - - 2.11.5 + - 2.10.5 + - 2.11.6 jdk: - oraclejdk7 diff --git a/build.sbt b/build.sbt index d921b881e..f5bda9820 100644 --- a/build.sbt +++ b/build.sbt @@ -11,9 +11,9 @@ version := "0.8.1-SNAPSHOT" organization := "org.scala-js" -scalaVersion := "2.11.5" +scalaVersion := "2.11.6" -crossScalaVersions := Seq("2.10.4", "2.11.5") +crossScalaVersions := Seq("2.10.5", "2.11.6") scalacOptions ++= Seq("-deprecation", "-feature") @@ -65,10 +65,11 @@ lazy val readme = ScalatexReadme( targetFolder = "target/site", autoResources = Seq("example-opt.js") ).settings( + scalaVersion := "2.11.6", (resources in Compile) += (fullOptJS in (example, Compile)).value.data ) lazy val example = project .dependsOn(root) .enablePlugins(ScalaJSPlugin) - .settings(scalaVersion := "2.11.2") + .settings(scalaVersion := "2.11.6")