Skip to content

Commit cd67a62

Browse files
author
Joachim Hofer
committed
Update to 2.2.0.
1 parent 0cb6b4f commit cd67a62

File tree

8 files changed

+11
-13
lines changed

8 files changed

+11
-13
lines changed

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).enablePlugins(BuildInfoPlugin).settings(
22

33
name := "jacoco4sbt",
44
organization := "de.johoop",
5-
version := "2.2.0-SNAPSHOT",
5+
version := "2.2.0",
66
scalaVersion := "2.10.6",
77

88
sbtPlugin := true,

readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This is an [sbt](http://scala-sbt.org/) and [Typesafe Activator](https://typesaf
44

55
Install the plugin by adding the following to `project/plugins.sbt`:
66

7-
addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.1.6")
7+
addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.2.0")
88

99
and then in `build.sbt`:
1010

src/main/scala/de/johoop/jacoco4sbt/JacocoPlugin.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is part of jacoco4sbt.
33
*
4-
* Copyright (c) 2011-2013 Joachim Hofer & contributors
4+
* Copyright (c) Joachim Hofer & contributors
55
* All rights reserved.
66
*
77
* This program and the accompanying materials
@@ -114,7 +114,7 @@ object JacocoPlugin extends Plugin {
114114
definedTests <<= definedTests in srcConfig,
115115
definedTestNames <<= definedTestNames in srcConfig,
116116
cover <<= report dependsOn check,
117-
aggregateCover <<= aggregateReport dependsOn (submoduleCoverTasks),
117+
aggregateCover <<= aggregateReport dependsOn submoduleCoverTasks,
118118
check <<= ((executionDataFile, fork, streams) map saveDataAction) dependsOn test))
119119
}
120120
}

src/main/scala/de/johoop/jacoco4sbt/Keys.scala

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is part of jacoco4sbt.
33
*
4-
* Copyright (c) 2011-2013 Joachim Hofer & contributors
4+
* Copyright (c) Joachim Hofer & contributors
55
* All rights reserved.
66
*
77
* This program and the accompanying materials
@@ -12,11 +12,9 @@
1212
package de.johoop.jacoco4sbt
1313

1414
import sbt._
15-
import Keys._
16-
import org.jacoco.core.runtime.IRuntime
1715

1816
trait Keys {
19-
lazy val Config = config("jacoco") extend(Test) hide
17+
lazy val Config = config("jacoco") extend Test hide
2018

2119
lazy val outputDirectory = SettingKey[File]("output-directory", "Where JaCoCo should store its execution data and reports.")
2220
lazy val aggregateReportDirectory = SettingKey[File]("aggregate-report-directory", "Where JaCoCo should store its aggregate reports.")
@@ -57,7 +55,7 @@ trait Keys {
5755
}
5856

5957
trait IntegrationTestKeys extends Keys {
60-
override lazy val Config = config("it-jacoco") extend(IntegrationTest) hide
58+
override lazy val Config = config("it-jacoco") extend IntegrationTest hide
6159

6260
lazy val merge = TaskKey[Unit]("merge", "Merges all '*.exec' files into a single data file.")
6361
lazy val mergeReports = SettingKey[Boolean]("merge-reports", "Indication whether to merge the unittest and integration test reports. Defaults to true.")
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.2.0-SNAPSHOT")
1+
addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.2.0")
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.2.0-SNAPSHOT")
1+
addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.2.0")
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.2.0-SNAPSHOT")
1+
addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.2.0")

src/test/resources/play-multi-project-jacoco/project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/release
77
// Use the Play sbt plugin for Play projects
88
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.2.1")
99

10-
addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.2.0-SNAPSHOT")
10+
addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.2.0")

0 commit comments

Comments
 (0)