Skip to content

Commit

Permalink
Scala 2.12 (#56)
Browse files Browse the repository at this point in the history
  • Loading branch information
Starzu authored and hmil committed Dec 22, 2016
1 parent 6684475 commit e10068f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ language: scala
scala:
- 2.10.6
- 2.11.7
- 2.12.1

jdk:
- oraclejdk8

install:
- nvm list
Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name := "RösHTTP root project"

crossScalaVersions := Seq("2.10.6", "2.11.7")
crossScalaVersions := Seq("2.10.6", "2.11.8")

lazy val root = project.in(file(".")).
aggregate(scalaHttpJS, scalaHttpJVM)
Expand All @@ -10,7 +10,7 @@ lazy val scalaHttp = crossProject.in(file("."))
.settings(
name := "roshttp",
version := "2.0.0-RC1",
scalaVersion := "2.11.8",
scalaVersion := "2.12.1",
organization := "fr.hmil",
licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT")),
homepage := Some(url("http://github.com/hmil/RosHTTP")),
Expand Down Expand Up @@ -38,8 +38,8 @@ lazy val scalaHttp = crossProject.in(file("."))
),
pomIncludeRepository := { _ => false },

libraryDependencies += "com.lihaoyi" %%% "utest" % "0.4.3",
libraryDependencies += "io.monix" %%% "monix" % "2.0.0",
libraryDependencies += "com.lihaoyi" %%% "utest" % "0.4.4",
libraryDependencies += "io.monix" %%% "monix" % "2.1.1",

testFrameworks += new TestFramework("utest.runner.Framework")
)
Expand All @@ -48,7 +48,7 @@ lazy val scalaHttp = crossProject.in(file("."))
)
.jsSettings(
// js-specific settings
libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "0.9.0",
libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "0.9.1",

jsEnv := NodeJSEnv().value
)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
sbt.version = 0.13.9
sbt.version = 0.13.13

set logLevel in Global := Level.Debug
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.12")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")

addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0")

Expand Down

0 comments on commit e10068f

Please sign in to comment.