Skip to content

Commit a21c11a

Browse files
Bump scala / scala-js / scala-native versions
1 parent dc44e96 commit a21c11a

File tree

3 files changed

+14
-18
lines changed

3 files changed

+14
-18
lines changed

.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ script:
77
jdk:
88
- oraclejdk8
99
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
1414
env:
15-
- SCALAJS_VERSION=0.6.23
15+
- SCALAJS_VERSION=0.6.25
1616
matrix:
1717
include:
18-
- scala: 2.10.6
18+
- scala: 2.10.7
1919
jdk: openjdk7
2020
before_install:
2121
- curl https://raw.githubusercontent.com/scala-native/scala-native/master/scripts/travis_setup.sh | bash -x

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import sbtcrossproject.{crossProject, CrossType}
22
import OsgiKeys._
33

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"
88
val baseSettings = Seq(
99
organization := "com.lihaoyi",
1010
name := "sourcecode",

project/build.sbt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11

22
val scalaJSVersion =
3-
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.23")
3+
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.25")
44

55
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
66

77
addSbtPlugin("com.eed3si9n" % "sbt-doge" % "0.1.5")
88
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")

0 commit comments

Comments
 (0)