Skip to content

Commit

Permalink
Bump Scala to 2.12, ScalaTest to 3.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mkiedys committed Nov 18, 2016
1 parent a1300b3 commit 9d5fb44
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ services:
- rabbitmq
scala:
- 2.11.8
- 2.12.0
jdk:
- oraclejdk8
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Source.fromPublisher(queue).map(_.message).runWith(Sink.fromSubscriber(exchange)

API Docs
----
Run `sbt doc` and open target/scala-2.11/index.html.
Run `sbt doc` and open target/scala-2.12/index.html.

Settings
----
Expand Down
6 changes: 4 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ licenses := Seq("Apache License 2.0" -> url("http://opensource.org/licenses/Apac

homepage := Some(url("https://github.com/ScalaConsultants/reactive-rabbit"))

scalaVersion := "2.11.8"
scalaVersion := "2.12.0"

crossScalaVersions := Seq("2.11.8", "2.12.0")

scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature", "-Xfatal-warnings", "-target:jvm-1.8")

Expand All @@ -25,7 +27,7 @@ libraryDependencies ++= Seq(
"com.typesafe" % "config" % "1.3.0", // Configuration
"com.google.guava" % "guava" % "19.0", // for MediaType
"com.google.code.findbugs" % "jsr305" % "3.0.1",
"org.scalatest" %% "scalatest" % "2.2.6" % "test", // for TCK
"org.scalatest" %% "scalatest" % "3.0.1" % "test", // for TCK
"org.reactivestreams" % "reactive-streams-tck" % "1.0.0" % "test",
"com.typesafe.akka" %% "akka-stream" % "2.4.12" % "test"
)
Expand Down

0 comments on commit 9d5fb44

Please sign in to comment.