Skip to content

Upgrade to sbt 0.13.13, Scala 2.12.0 and Scala.js 0.6.13. #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 22, 2016
Merged

Upgrade to sbt 0.13.13, Scala 2.12.0 and Scala.js 0.6.13. #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.9
sbt.version=0.13.13
2 changes: 1 addition & 1 deletion project/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")