Skip to content

Commit 8bcd3e4

Browse files
committed
Use the standard crossProject builder.
Instead of the `CrossProject.apply` method. This is mostly so that we do not need to explicitly `import` anything, in order to be source compatible with Scala.js 1.0.0-M1.
1 parent da923cd commit 8bcd3e4

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
sudo: false
22
language: scala
33
script:
4-
- sbt ++$TRAVIS_SCALA_VERSION root/scalastyle testSuiteJVM/scalastyle testSuiteJVM/test:scalastyle testSuite/scalastyle testSuite/test:scalastyle
4+
- sbt ++$TRAVIS_SCALA_VERSION root/scalastyle testSuiteJVM/scalastyle testSuiteJVM/test:scalastyle testSuiteJS/scalastyle testSuiteJS/test:scalastyle
55
- sbt ++$TRAVIS_SCALA_VERSION testSuiteJVM/test
6-
- sbt ++$TRAVIS_SCALA_VERSION testSuite/test
7-
- sbt ++$TRAVIS_SCALA_VERSION 'set scalaJSStage in Global := FullOptStage' testSuite/test
6+
- sbt ++$TRAVIS_SCALA_VERSION testSuiteJS/test
7+
- sbt ++$TRAVIS_SCALA_VERSION 'set scalaJSStage in Global := FullOptStage' testSuiteJS/test
88
- sbt ++$TRAVIS_SCALA_VERSION publishLocal
99
scala:
1010
- 2.10.6

build.sbt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import sbt.Keys._
2-
import org.scalajs.sbtplugin.cross.CrossProject
3-
41
crossScalaVersions in ThisBuild := Seq("2.11.11", "2.10.6", "2.12.2", "2.13.0-M1")
52
scalaVersion in ThisBuild := (crossScalaVersions in ThisBuild).value.head
63

@@ -59,12 +56,7 @@ lazy val root: Project = project.in(file(".")).
5956
pomIncludeRepository := { _ => false }
6057
)
6158

62-
lazy val testSuite = CrossProject(
63-
jvmId = "testSuiteJVM",
64-
jsId = "testSuite",
65-
base = file("testSuite"),
66-
crossType = CrossType.Full
67-
).
59+
lazy val testSuite = crossProject.
6860
jsConfigure(_ .enablePlugins(ScalaJSJUnitPlugin)).
6961
settings(commonSettings: _*).
7062
settings(

0 commit comments

Comments
 (0)