diff --git a/build.sbt b/build.sbt index 51ce3bbf..a120ba16 100755 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ lazy val root = (project in file(".")).enablePlugins(BuildInfoPlugin).settings( name := "jacoco4sbt", organization := "de.johoop", - version := "2.2.0-SNAPSHOT", + version := "2.2.0", scalaVersion := "2.10.6", sbtPlugin := true, diff --git a/readme.md b/readme.md index ff151f14..68019526 100644 --- a/readme.md +++ b/readme.md @@ -4,7 +4,7 @@ This is an [sbt](http://scala-sbt.org/) and [Typesafe Activator](https://typesaf Install the plugin by adding the following to `project/plugins.sbt`: - addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.1.6") + addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.2.0") and then in `build.sbt`: diff --git a/src/main/scala/de/johoop/jacoco4sbt/JacocoPlugin.scala b/src/main/scala/de/johoop/jacoco4sbt/JacocoPlugin.scala index 0aa2054c..46c27530 100755 --- a/src/main/scala/de/johoop/jacoco4sbt/JacocoPlugin.scala +++ b/src/main/scala/de/johoop/jacoco4sbt/JacocoPlugin.scala @@ -1,7 +1,7 @@ /* * This file is part of jacoco4sbt. * - * Copyright (c) 2011-2013 Joachim Hofer & contributors + * Copyright (c) Joachim Hofer & contributors * All rights reserved. * * This program and the accompanying materials @@ -114,7 +114,7 @@ object JacocoPlugin extends Plugin { definedTests <<= definedTests in srcConfig, definedTestNames <<= definedTestNames in srcConfig, cover <<= report dependsOn check, - aggregateCover <<= aggregateReport dependsOn (submoduleCoverTasks), + aggregateCover <<= aggregateReport dependsOn submoduleCoverTasks, check <<= ((executionDataFile, fork, streams) map saveDataAction) dependsOn test)) } } diff --git a/src/main/scala/de/johoop/jacoco4sbt/Keys.scala b/src/main/scala/de/johoop/jacoco4sbt/Keys.scala index 173bbd24..9a3aeb7a 100644 --- a/src/main/scala/de/johoop/jacoco4sbt/Keys.scala +++ b/src/main/scala/de/johoop/jacoco4sbt/Keys.scala @@ -1,7 +1,7 @@ /* * This file is part of jacoco4sbt. * - * Copyright (c) 2011-2013 Joachim Hofer & contributors + * Copyright (c) Joachim Hofer & contributors * All rights reserved. * * This program and the accompanying materials @@ -12,11 +12,9 @@ package de.johoop.jacoco4sbt import sbt._ -import Keys._ -import org.jacoco.core.runtime.IRuntime trait Keys { - lazy val Config = config("jacoco") extend(Test) hide + lazy val Config = config("jacoco") extend Test hide lazy val outputDirectory = SettingKey[File]("output-directory", "Where JaCoCo should store its execution data and reports.") lazy val aggregateReportDirectory = SettingKey[File]("aggregate-report-directory", "Where JaCoCo should store its aggregate reports.") @@ -57,7 +55,7 @@ trait Keys { } trait IntegrationTestKeys extends Keys { - override lazy val Config = config("it-jacoco") extend(IntegrationTest) hide + override lazy val Config = config("it-jacoco") extend IntegrationTest hide lazy val merge = TaskKey[Unit]("merge", "Merges all '*.exec' files into a single data file.") lazy val mergeReports = SettingKey[Boolean]("merge-reports", "Indication whether to merge the unittest and integration test reports. Defaults to true.") diff --git a/src/test/resources/jacocoIntegrationTest/project/plugins.sbt b/src/test/resources/jacocoIntegrationTest/project/plugins.sbt index 3bd4a4a4..0be27ea8 100644 --- a/src/test/resources/jacocoIntegrationTest/project/plugins.sbt +++ b/src/test/resources/jacocoIntegrationTest/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.2.0-SNAPSHOT") +addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.2.0") diff --git a/src/test/resources/jacocoTest/project/plugins.sbt b/src/test/resources/jacocoTest/project/plugins.sbt index 3bd4a4a4..0be27ea8 100644 --- a/src/test/resources/jacocoTest/project/plugins.sbt +++ b/src/test/resources/jacocoTest/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.2.0-SNAPSHOT") +addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.2.0") diff --git a/src/test/resources/jacocoTestForked/project/plugins.sbt b/src/test/resources/jacocoTestForked/project/plugins.sbt index 3bd4a4a4..0be27ea8 100644 --- a/src/test/resources/jacocoTestForked/project/plugins.sbt +++ b/src/test/resources/jacocoTestForked/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.2.0-SNAPSHOT") +addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.2.0") diff --git a/src/test/resources/play-multi-project-jacoco/project/plugins.sbt b/src/test/resources/play-multi-project-jacoco/project/plugins.sbt index 250ade89..33bc825d 100644 --- a/src/test/resources/play-multi-project-jacoco/project/plugins.sbt +++ b/src/test/resources/play-multi-project-jacoco/project/plugins.sbt @@ -7,4 +7,4 @@ resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/release // Use the Play sbt plugin for Play projects addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.2.1") -addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.2.0-SNAPSHOT") +addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.2.0")