From 7e9b1dbf79a97ced6fc535ba715ab10213eda6ae Mon Sep 17 00:00:00 2001 From: Chris Aniszczyk Date: Tue, 8 Jul 2014 10:12:40 -0500 Subject: [PATCH] Add code coverage support with coveralls See: https://coveralls.io/r/twitter/finatra Signed-off-by: Chris Aniszczyk --- .travis.yml | 11 +++++++---- README.markdown | 2 +- build.sbt | 7 +++++++ pom.xml | 41 ++++++++++++++++++++++++++++++++++++++++- project/plugins.sbt | 3 +++ 5 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 project/plugins.sbt diff --git a/.travis.yml b/.travis.yml index b298308917..e4a28bd00c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,7 @@ - language: scala - scala: - - 2.9.2 - - 2.10.0 +language: scala +script: + - sbt test + - sbt coveralls +scala: + - 2.9.2 + - 2.10.0 diff --git a/README.markdown b/README.markdown index eb00316d57..7493535bc6 100644 --- a/README.markdown +++ b/README.markdown @@ -1,4 +1,4 @@ -# Finatra [![Build Status](https://secure.travis-ci.org/twitter/finatra.png?branch=master)](http://travis-ci.org/twitter/finatra) +# Finatra [![Build Status](https://secure.travis-ci.org/twitter/finatra.png?branch=master)](http://travis-ci.org/twitter/finatra) [![Coverage Status](https://coveralls.io/repos/twitter/finatra/badge.png?branch=master)](https://coveralls.io/r/twitter/finatra?branch=master) [Finatra](http://finatra.info) is a sinatra-inspired web framework for scala, running on top of [Finagle](http://twitter.github.com/finagle/) diff --git a/build.sbt b/build.sbt index 23cc65261c..72bd47fda7 100644 --- a/build.sbt +++ b/build.sbt @@ -20,6 +20,11 @@ libraryDependencies ++= Seq( "com.fasterxml.jackson.core" % "jackson-databind" % "2.2.2" ) +// for code coverage +instrumentSettings + +coverallsSettings + scalacOptions in ThisBuild ++= Seq("-unchecked", "-deprecation") //Release @@ -30,6 +35,8 @@ resolvers += resolvers += "Local Maven Repository" at "file:///"+Path.userHome+"/.m2/repository" +resolvers += Classpaths.sbtPluginReleases + publishMavenStyle := true publishTo := { diff --git a/pom.xml b/pom.xml index 0518e33c29..cca326ed6c 100644 --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,7 @@ org.scalatest scalatest-maven-plugin - 1.0-M2 + 1.0 test @@ -196,6 +196,45 @@ maven-release-plugin 2.3.2 + + org.eluder.coveralls + coveralls-maven-plugin + 2.2.0 + + src/main/scala + travis-ci + + + + coveralls-jacoco + package + + jacoco + + + + + + org.jacoco + jacoco-maven-plugin + 0.7.1.201405082137 + + + jacoco-initialize + initialize + + prepare-agent + + + + jacoco-report + prepare-package + + report + + + + diff --git a/project/plugins.sbt b/project/plugins.sbt new file mode 100644 index 0000000000..6ecd8bf09b --- /dev/null +++ b/project/plugins.sbt @@ -0,0 +1,3 @@ +addSbtPlugin("com.sksamuel.scoverage" % "sbt-scoverage" % "0.95.1") + +addSbtPlugin("com.sksamuel.scoverage" %% "sbt-coveralls" % "0.0.5")