Skip to content

Upgrade to vanilla Scala.js 0.6.6. #3

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.

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 2 commits into from
Jan 23, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 0 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
sudo: false
language: scala
install:
- git clone https://github.com/scala-js/scala-js.git
- cd scala-js
- sbt ++$TRAVIS_SCALA_VERSION compiler/publishLocal library/publishLocal javalibEx/publishLocal testInterface/publishLocal stubs/publishLocal jasmineTestFramework/publishLocal jUnitRuntime/publishLocal jUnitPlugin/publishLocal
- sbt ++2.10.6 ir/publishLocal tools/publishLocal jsEnvs/publishLocal testAdapter/publishLocal sbtPlugin/publishLocal
- cd ..
script:
- sbt ++$TRAVIS_SCALA_VERSION root/scalastyle testSuiteJVM/scalastyle testSuiteJVM/test:scalastyle testSuite/scalastyle testSuite/test:scalastyle
- sbt ++$TRAVIS_SCALA_VERSION testSuiteJVM/test
Expand Down
35 changes: 18 additions & 17 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
import sbt.Keys._
import org.scalajs.sbtplugin.cross.CrossProject

val commonSettings: Seq[Setting[_]] = Seq(
version := "0.0.1-SNAPSHOT",
organization := "org.scala-js",
scalaVersion := "2.11.7",
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
homepage := Some(url("http://scala-js.org/")),
licenses += ("MIT", url("http://opensource.org/licenses/mit-license.php"))
)

lazy val root: Project = project.in(file(".")).
enablePlugins(ScalaJSPlugin)
enablePlugins(ScalaJSPlugin).
settings(commonSettings).
settings(
name := "scalajs-java-time"
)

lazy val testSuite = CrossProject(
jvmId = "testSuiteJVM",
Expand All @@ -11,32 +24,20 @@ lazy val testSuite = CrossProject(
crossType = CrossType.Full
).
jsConfigure(_ .enablePlugins(ScalaJSJUnitPlugin)).
settings(commonSettings: _*).
settings(
testOptions +=
Tests.Argument(TestFramework("com.novocode.junit.JUnitFramework"), "-v", "-a")
).
jsSettings(
name := "java.time testSuite on JS"
).
jsConfigure(_.dependsOn(root)).
jvmSettings(
name := "java.time testSuite on JVM",
libraryDependencies +=
"com.novocode" % "junit-interface" % "0.9" % "test"
)

lazy val testSuiteJS = testSuite.js.dependsOn(root)
lazy val testSuiteJVM = testSuite.jvm.dependsOn(root)

name := "scalajs-java-time"

version := "0.0.1-SNAPSHOT"

organization := "org.scala-js"

scalaVersion := "2.11.7"

scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings")

homepage := Some(url("http://scala-js.org/"))

licenses += ("MIT", url("http://opensource.org/licenses/mit-license.php"))
lazy val testSuiteJS = testSuite.js
lazy val testSuiteJVM = testSuite.jvm
2 changes: 1 addition & 1 deletion project/build.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.6-SNAPSHOT")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.6")

addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0")