Skip to content

Conversation

cquiroz
Copy link
Contributor

@cquiroz cquiroz commented Nov 22, 2016

This PR updates the build to do cross build across Scala 2.10, 2.11 and 2.12 as well as upgrading scala.js to version 0.6.13

Copy link
Member

@sjrd sjrd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The commit message should be present tense. Something like:

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

Make sure to amend your commit and force-push. Do not push additional commits.

- sbt ++$TRAVIS_SCALA_VERSION +testSuiteJVM/test
- sbt ++$TRAVIS_SCALA_VERSION +testSuite/test
- sbt ++$TRAVIS_SCALA_VERSION 'set scalaJSStage in Global := FullOptStage' +testSuite/test
- sbt ++$TRAVIS_SCALA_VERSION +publishLocal
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do not use + in Travis scripts. The cross-testing is achieved by Travis' matrix.

@@ -5,6 +5,7 @@ val commonSettings: Seq[Setting[_]] = Seq(
version := "0.1.1-SNAPSHOT",
organization := "org.scala-js",
scalaVersion := "2.11.8",
crossScalaVersions := Seq("2.10.4", "2.11.8", "2.12.0"),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

crossScalaVersions should be in ThisBuild at the top-level of the .sbt file, like this:

import sbt.Keys._
import org.scalajs.sbtplugin.cross.CrossProject

crossScalaVersions in ThisBuild := Seq("2.10.4", "2.11.8", "2.12.0")

val commonSettings: Seq[Setting[_]] = Seq(
...

@cquiroz
Copy link
Contributor Author

cquiroz commented Nov 22, 2016

Updated as requested

@sjrd sjrd changed the title Versions upgrade Upgrade to sbt 0.13.13, Scala 2.12.0 and Scala.js 0.6.13. Nov 22, 2016
Copy link
Member

@sjrd sjrd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

@sjrd sjrd merged commit 01ec1bd into scala-js:master Nov 22, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants