Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Moved to Scala 2.12.1 #8

Merged
merged 1 commit into from
Jan 14, 2017
Merged

Moved to Scala 2.12.1 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
language: scala
scala:
- 2.11.7
- 2.12.1
jdk:
- oraclejdk8
sudo: false
script: sbt clean core/coverage test core/coverageReport
script: sbt clean coverage test core/coverageReport
after_success: sbt core/coveralls $(if [[ "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_TAG}" == "false" ]]; then echo "core/publish"; fi)
env:
global:
Expand Down
16 changes: 8 additions & 8 deletions project/ScalaMQTTClientBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ object ScalaMQTTClientBuild extends Build {
resolvers += "Scalaz Bintray Repo" at "http://dl.bintray.com/scalaz/releases",

libraryDependencies ++= Seq(
"org.specs2" %% "specs2-core" % "3.8.3" % "test",
"com.typesafe.akka" %% "akka-actor" % "2.4.7",
"com.typesafe.akka" %% "akka-testkit" % "2.4.7",
"com.typesafe.akka" %% "akka-stream" % "2.4.7",
"com.typesafe.akka" %% "akka-stream-testkit" % "2.4.7",
"org.scodec" %% "scodec-core" % "1.10.0",
"org.scalaz" %% "scalaz-core" % "7.2.3")
"org.specs2" %% "specs2-core" % "3.8.6" % "test",
"com.typesafe.akka" %% "akka-actor" % "2.4.14",
"com.typesafe.akka" %% "akka-testkit" % "2.4.14",
"com.typesafe.akka" %% "akka-stream" % "2.4.14",
"com.typesafe.akka" %% "akka-stream-testkit" % "2.4.14",
"org.scodec" %% "scodec-core" % "1.10.3",
"org.scalaz" %% "scalaz-core" % "7.2.8")
)
)

Expand All @@ -48,7 +48,7 @@ object ScalaMQTTClientBuild extends Build {
def commonSettings =
Seq(
organization := "net.sigusr",
scalaVersion := "2.11.8",
scalaVersion := "2.12.1",

scalacOptions in Test ++= Seq("-Yrangepos"),

Expand Down
8 changes: 4 additions & 4 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.0.1")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")

addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.0.0.BETA1")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0")

addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")

addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")