Skip to content

Update versions of used libraries/plugins #68

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

Merged
merged 2 commits into from
Aug 5, 2016
Merged

Update versions of used libraries/plugins #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2af8372
Update sbt, scoverage, coveralls, circe, akka, scalatest versions to …
jmhofer Aug 5, 2016
0410c2b
Add `coverageReport` target to the Travis `after_success` step as des…
jmhofer Aug 5, 2016
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ notifications:
on_start: never
script: "sbt clean coverage test"
after_success:
- "sbt coveralls"
- "sbt coverageReport coveralls"
- bash <(curl -s https://codecov.io/bash)
17 changes: 9 additions & 8 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import scoverage.ScoverageSbtPlugin

organization := "org.zalando"

name := "scala-jsonapi"
Expand All @@ -14,30 +12,33 @@ resolvers ++= Seq(
)

libraryDependencies ++= {
val circeVersion = "0.5.0-M1"
val akkaVersion = "2.4.7"
val circeVersion = "0.5.0-M2"
val akkaVersion = "2.4.8"

Seq(
"io.spray" %% "spray-json" % "1.3.2" % "provided",
"io.spray" %% "spray-httpx" % "1.3.3" % "provided",
"com.typesafe.akka" %% "akka-actor" % akkaVersion % "provided",
"com.typesafe.akka" %% "akka-http-core" % akkaVersion % "provided",
"com.typesafe.akka" %% "akka-http-experimental" % akkaVersion % "provided",
"com.typesafe.play" %% "play-json" % "2.3.8" % "provided",
"com.typesafe.play" %% "play-json" % "2.3.10" % "provided",
"io.circe" %% "circe-core" % circeVersion % "provided",
"io.circe" %% "circe-generic" % circeVersion % "provided",
"io.circe" %% "circe-parser" % circeVersion % "provided",
"org.scalatest" %% "scalatest" % "2.2.4" % "test",
"org.scalatest" %% "scalatest" % "3.0.0" % "test",
"com.typesafe.akka" %% "akka-http-testkit" % akkaVersion % "test"

)
}

lazy val root = (project in file("."))
.enablePlugins(ScoverageSbtPlugin)

scalafmtConfig in ThisBuild := Some(file(".scalafmt"))

ScoverageSbtPlugin.ScoverageKeys.coverageMinimum := 80
coverageMinimum := 80

ScoverageSbtPlugin.ScoverageKeys.coverageFailOnMinimum := true
coverageFailOnMinimum := true

publishMavenStyle := true

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.11
sbt.version=0.13.12
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
resolvers += Classpaths.sbtPluginReleases

addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.0.4")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.5")

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

addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")

Expand Down