Skip to content

Commit 0ec08fa

Browse files
committed
adding ScalaJs 1.0.0-M1 support
1 parent 43e7d43 commit 0ec08fa

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

.travis.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ script:
33
- sbt ++$TRAVIS_SCALA_VERSION sourcecodeJVM/test:run sourcecodeJS/test:run
44
scala:
55
- 2.10.6
6-
- 2.11.8
7-
- 2.12.0
6+
- 2.11.11
7+
- 2.12.2
88
jdk:
99
- openjdk7
1010
- oraclejdk8
11+
env:
12+
- SCALAJS_VERSION=0.6.18
13+
- SCALAJS_VERSION=1.0.0-M1
1114
matrix:
1215
exclude:
13-
- scala: 2.12.0
16+
- scala: 2.12.2
1417
jdk: openjdk7
1518
sudo: false

build.sbt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0")
1+
crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.2")
32

43
def macroDependencies(version: String) =
54
Seq(
@@ -14,7 +13,7 @@ def macroDependencies(version: String) =
1413

1514
lazy val sourcecode = crossProject.settings(
1615
version := "0.1.3",
17-
scalaVersion := "2.11.8",
16+
scalaVersion := "2.11.11",
1817
name := "sourcecode" ,
1918
organization := "com.lihaoyi",
2019
libraryDependencies ++= macroDependencies(scalaVersion.value),
@@ -47,6 +46,8 @@ lazy val sourcecode = crossProject.settings(
4746
<url>https://github.com/lihaoyi</url>
4847
</developer>
4948
</developers>
49+
).jsSettings(
50+
scalaJSUseMainModuleInitializer in Test := true
5051
)
5152

5253
lazy val js = sourcecode.js

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.13
1+
sbt.version=0.13.15

project/build.sbt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
1+
val scalaJSVersion =
2+
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.18")
3+
4+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)

0 commit comments

Comments
 (0)