File tree 3 files changed +14
-18
lines changed
3 files changed +14
-18
lines changed Original file line number Diff line number Diff line change @@ -7,15 +7,15 @@ script:
7
7
jdk :
8
8
- oraclejdk8
9
9
scala :
10
- - 2.10.6
11
- - 2.11.11
12
- - 2.12.2
13
- - 2.13.0-M1
10
+ - 2.10.7
11
+ - 2.11.12
12
+ - 2.12.6
13
+ - 2.13.0-M5
14
14
env :
15
- - SCALAJS_VERSION=0.6.23
15
+ - SCALAJS_VERSION=0.6.25
16
16
matrix :
17
17
include :
18
- - scala : 2.10.6
18
+ - scala : 2.10.7
19
19
jdk : openjdk7
20
20
before_install :
21
21
- curl https://raw.githubusercontent.com/scala-native/scala-native/master/scripts/travis_setup.sh | bash -x
Original file line number Diff line number Diff line change 1
1
import sbtcrossproject .{crossProject , CrossType }
2
2
import OsgiKeys ._
3
3
4
- val scala210 = " 2.10.6 "
5
- val scala211 = " 2.11.11 "
6
- val scala212 = " 2.12.2 "
7
- val scala213 = " 2.13.0-M4 "
4
+ val scala210 = " 2.10.7 "
5
+ val scala211 = " 2.11.12 "
6
+ val scala212 = " 2.12.6 "
7
+ val scala213 = " 2.13.0-M5 "
8
8
val baseSettings = Seq (
9
9
organization := " com.lihaoyi" ,
10
10
name := " sourcecode" ,
Original file line number Diff line number Diff line change 1
1
2
2
val scalaJSVersion =
3
- Option (System .getenv(" SCALAJS_VERSION" )).getOrElse(" 0.6.23 " )
3
+ Option (System .getenv(" SCALAJS_VERSION" )).getOrElse(" 0.6.25 " )
4
4
5
5
addSbtPlugin(" org.scala-js" % " sbt-scalajs" % scalaJSVersion)
6
6
7
7
addSbtPlugin(" com.eed3si9n" % " sbt-doge" % " 0.1.5" )
8
8
addSbtPlugin(" com.typesafe.sbt" % " sbt-osgi" % " 0.8.0" )
9
- addSbtPlugin({
10
- if (scalaJSVersion.startsWith(" 0.6." ))
11
- " org.scala-native" % " sbt-scalajs-crossproject" % " 0.2.0"
12
- else
13
- " org.scala-native" % " sbt-crossproject" % " 0.2.0"
14
- })
15
- addSbtPlugin(" org.scala-native" % " sbt-scala-native" % " 0.3.1" )
9
+ addSbtPlugin(" org.portable-scala" % " sbt-scalajs-crossproject" % " 0.6.0" )
10
+ addSbtPlugin(" org.scala-native" % " sbt-scala-native" % " 0.3.8" )
11
+ addSbtPlugin(" org.portable-scala" % " sbt-scala-native-crossproject" % " 0.6.0" )
You can’t perform that action at this time.
0 commit comments