File tree Expand file tree Collapse file tree 4 files changed +15
-8
lines changed Expand file tree Collapse file tree 4 files changed +15
-8
lines changed Original file line number Diff line number Diff line change @@ -3,13 +3,16 @@ script:
3
3
- sbt ++$TRAVIS_SCALA_VERSION sourcecodeJVM/test:run sourcecodeJS/test:run
4
4
scala :
5
5
- 2.10.6
6
- - 2.11.8
7
- - 2.12.0
6
+ - 2.11.11
7
+ - 2.12.2
8
8
jdk :
9
9
- openjdk7
10
10
- oraclejdk8
11
+ env :
12
+ - SCALAJS_VERSION=0.6.18
13
+ - SCALAJS_VERSION=1.0.0-M1
11
14
matrix :
12
15
exclude :
13
- - scala : 2.12.0
16
+ - scala : 2.12.2
14
17
jdk : openjdk7
15
18
sudo : false
Original file line number Diff line number Diff line change 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" )
3
2
4
3
def macroDependencies (version : String ) =
5
4
Seq (
@@ -14,7 +13,7 @@ def macroDependencies(version: String) =
14
13
15
14
lazy val sourcecode = crossProject.settings(
16
15
version := " 0.1.3" ,
17
- scalaVersion := " 2.11.8 " ,
16
+ scalaVersion := " 2.11.11 " ,
18
17
name := " sourcecode" ,
19
18
organization := " com.lihaoyi" ,
20
19
libraryDependencies ++= macroDependencies(scalaVersion.value),
@@ -47,6 +46,8 @@ lazy val sourcecode = crossProject.settings(
47
46
<url >https:// github.com/ lihaoyi</url >
48
47
</developer >
49
48
</developers >
49
+ ).jsSettings(
50
+ scalaJSUseMainModuleInitializer in Test := true
50
51
)
51
52
52
53
lazy val js = sourcecode.js
Original file line number Diff line number Diff line change 1
- sbt.version =0.13.13
1
+ sbt.version =0.13.15
Original file line number Diff line number Diff line change 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)
You can’t perform that action at this time.
0 commit comments