Skip to content

Commit

Permalink
Bump scala / scala-js / scala-native versions
Browse files Browse the repository at this point in the history
  • Loading branch information
alexarchambault committed Sep 24, 2018
1 parent dc44e96 commit a21c11a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 18 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ script:
jdk:
- oraclejdk8
scala:
- 2.10.6
- 2.11.11
- 2.12.2
- 2.13.0-M1
- 2.10.7
- 2.11.12
- 2.12.6
- 2.13.0-M5
env:
- SCALAJS_VERSION=0.6.23
- SCALAJS_VERSION=0.6.25
matrix:
include:
- scala: 2.10.6
- scala: 2.10.7
jdk: openjdk7
before_install:
- curl https://raw.githubusercontent.com/scala-native/scala-native/master/scripts/travis_setup.sh | bash -x
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import sbtcrossproject.{crossProject, CrossType}
import OsgiKeys._

val scala210 = "2.10.6"
val scala211 = "2.11.11"
val scala212 = "2.12.2"
val scala213 = "2.13.0-M4"
val scala210 = "2.10.7"
val scala211 = "2.11.12"
val scala212 = "2.12.6"
val scala213 = "2.13.0-M5"
val baseSettings = Seq(
organization := "com.lihaoyi",
name := "sourcecode",
Expand Down
12 changes: 4 additions & 8 deletions project/build.sbt
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@

val scalaJSVersion =
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.23")
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.25")

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

addSbtPlugin("com.eed3si9n" % "sbt-doge" % "0.1.5")
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.8.0")
addSbtPlugin({
if (scalaJSVersion.startsWith("0.6."))
"org.scala-native" % "sbt-scalajs-crossproject" % "0.2.0"
else
"org.scala-native" % "sbt-crossproject" % "0.2.0"
})
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.1")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.8")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.6.0")

0 comments on commit a21c11a

Please sign in to comment.