Rename remaining setting keys

Author: stringbean

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

@@ -34,7 +34,7 @@ private[jacoco4sbt] abstract class BaseJacocoPlugin
     (
       (classesToCover in pluginConfig).?.value,
       (sourceDirectory in Compile).?.value,
-      (executionDataFile in pluginConfig).?.value)
+      (jacocoDataFile in pluginConfig).?.value)
   }
 
   lazy val submoduleSettings =
@@ -52,35 +52,35 @@ private[jacoco4sbt] abstract class BaseJacocoPlugin
       Defaults.testSettings ++
         JacocoDefaults.settings ++
         Seq(
-          classesToCover := filterClassesToCover((classDirectory in Compile).value, includes.value, excludes.value),
+          classesToCover := filterClassesToCover((classDirectory in Compile).value, jacocoIncludes.value, jacocoExcludes.value),
           aggregateClassesToCover := submoduleSettings.value.flatMap(_._1).flatten.distinct,
           aggregateCoveredSources := submoduleSettings.value.flatMap(_._2).distinct,
           aggregateExecutionDataFiles := submoduleSettings.value.flatMap(_._3).distinct,
           fullClasspath := instrumentAction(
             (products in Compile).value,
             (fullClasspath in srcConfig).value,
-            instrumentedClassDirectory.value,
+            jacocoInstrumentedDirectory.value,
             update.value,
             fork.value,
             streams.value),
           javaOptions ++= {
-            val dir = outputDirectory.value
+            val dir = jacocoOutputDirectory.value
             if (fork.value) {
               Seq(s"-Djacoco-agent.destfile=${(dir / "jacoco.exec").absolutePath}")
             } else {
               Nil
             }
           },
-          outputDirectory in pluginConfig := crossTarget.value / pluginConfig.name,
+          jacocoOutputDirectory in pluginConfig := crossTarget.value / pluginConfig.name,
           definedTests := (definedTests in srcConfig).value,
           definedTestNames := (definedTestNames in srcConfig).value,
           jacoco := (jacocoReport dependsOn jacocoCheck).value,
           jacocoAggregate := (jacocoAggregateReport dependsOn submoduleCoverTasks).value,
           jacocoCheck := Def
-            .task(saveDataAction(executionDataFile.value, fork.value, streams.value))
+            .task(saveDataAction(jacocoDataFile.value, fork.value, streams.value))
             .dependsOn(test)
             .value,
-          (executionDataFile in pluginConfig) := (outputDirectory in pluginConfig).value / "jacoco.exec"
+          (jacocoDataFile in pluginConfig) := (jacocoOutputDirectory in pluginConfig).value / "jacoco.exec"
         ))
 
   private def filterClassesToCover(classes: File, incl: Seq[String], excl: Seq[String]) = {

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

@@ -12,7 +12,7 @@
 
 package de.johoop.jacoco4sbt
 
-import de.johoop.jacoco4sbt.report.{JacocoReportSettings, JacocoSourceSettings, JacocoThresholds}
+import de.johoop.jacoco4sbt.report.{JacocoReportSettings, JacocoSourceSettings}
 import sbt._
 
 private[jacoco4sbt] trait CommonKeys {
@@ -27,23 +27,11 @@ private[jacoco4sbt] trait CommonKeys {
 
   val jacocoAggregateReport: TaskKey[Unit] = taskKey[Unit]("Generates an aggregated JaCoCo report.")
 
-  private[jacoco4sbt] val coveredSources: TaskKey[Seq[File]] = taskKey[Seq[File]]("Covered Sources.")
-
-  private[jacoco4sbt] val aggregateCoveredSources: TaskKey[Seq[File]] =
-    taskKey[Seq[File]]("Covered Sources across all aggregated projects.")
-  private[jacoco4sbt] val classesToCover: TaskKey[Seq[File]] =
-    taskKey[Seq[File]]("compiled classes (filtered by includes and excludes) that will be covered")
-  private[jacoco4sbt] val aggregateClassesToCover: TaskKey[Seq[File]] = taskKey[Seq[File]](
-    "compiled classes (filtered by includes and excludes) that will be covered across all aggregated project")
-
-  private[jacoco4sbt] val aggregateExecutionDataFiles: TaskKey[Seq[File]] =
-    taskKey[Seq[File]]("All execution data output files for aggregated modules.")
-
-  val outputDirectory: SettingKey[File] =
+  val jacocoOutputDirectory: SettingKey[File] =
     settingKey[File]("Where JaCoCo should store its execution data and reports.")
-  val aggregateReportDirectory: SettingKey[File] =
+  val jacocoAggregateReportDirectory: SettingKey[File] =
     settingKey[File]("Where JaCoCo should store its aggregate reports.")
-  val executionDataFile: SettingKey[File] = settingKey[File]("Execution data output file.")
+  val jacocoDataFile: SettingKey[File] = settingKey[File]("Execution data output file.")
 
   val jacocoSourceSettings: SettingKey[JacocoSourceSettings] =
     settingKey[JacocoSourceSettings]("Input source code settings (encoding etc) for reporting.")
@@ -53,18 +41,29 @@ private[jacoco4sbt] trait CommonKeys {
   val jacocoAggregateReportSettings: SettingKey[JacocoReportSettings] =
     settingKey[JacocoReportSettings]("Settings for aggregate JaCoCo report (format, title etc)")
 
-  val includes: SettingKey[Seq[String]] = settingKey[Seq[String]](
+  val jacocoIncludes: SettingKey[Seq[String]] = settingKey[Seq[String]](
     "glob patterns specifying which classes to cover; excludes override includes; default: all classes included")
-
-  val excludes: SettingKey[Seq[String]] = settingKey[Seq[String]](
+  val jacocoExcludes: SettingKey[Seq[String]] = settingKey[Seq[String]](
     "glob patterns specifying which classes not to cover; excludes override includes; default: no classes excluded")
 
-  val instrumentedClassDirectory: SettingKey[File] =
+  val jacocoInstrumentedDirectory: SettingKey[File] =
     settingKey[File]("Directory containing the instrumented classes.")
 
   // type aliases for auto import
   val JacocoThresholds: report.JacocoThresholds.type = report.JacocoThresholds
   val JacocoSourceSettings: report.JacocoSourceSettings.type = report.JacocoSourceSettings
   val JacocoReportSettings: report.JacocoReportSettings.type = report.JacocoReportSettings
   val JacocoReportFormats: report.JacocoReportFormats.type = report.JacocoReportFormats
+
+  private[jacoco4sbt] val coveredSources: TaskKey[Seq[File]] = taskKey[Seq[File]]("Covered Sources.")
+
+  private[jacoco4sbt] val aggregateCoveredSources: TaskKey[Seq[File]] =
+    taskKey[Seq[File]]("Covered Sources across all aggregated projects.")
+  private[jacoco4sbt] val classesToCover: TaskKey[Seq[File]] =
+    taskKey[Seq[File]]("compiled classes (filtered by includes and excludes) that will be covered")
+  private[jacoco4sbt] val aggregateClassesToCover: TaskKey[Seq[File]] = taskKey[Seq[File]](
+    "compiled classes (filtered by includes and excludes) that will be covered across all aggregated project")
+
+  private[jacoco4sbt] val aggregateExecutionDataFiles: TaskKey[Seq[File]] =
+    taskKey[Seq[File]]("All execution data output files for aggregated modules.")
 }

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

@@ -18,33 +18,33 @@ import sbt._
 
 private[jacoco4sbt] object JacocoDefaults extends Reporting with CommonKeys {
   val settings = Seq(
-    outputDirectory := crossTarget.value / "jacoco",
-    aggregateReportDirectory := outputDirectory.value / "aggregate",
+    jacocoOutputDirectory := crossTarget.value / "jacoco",
+    jacocoAggregateReportDirectory := jacocoOutputDirectory.value / "aggregate",
     jacocoSourceSettings := JacocoSourceSettings(),
     jacocoReportSettings := JacocoReportSettings(),
     jacocoAggregateReportSettings := JacocoReportSettings(title = "Jacoco Aggregate Coverage Report"),
-    includes := Seq("*"),
-    excludes := Seq(),
+    jacocoIncludes := Seq("*"),
+    jacocoExcludes := Seq(),
     coveredSources := (sourceDirectories in Compile).value,
-    instrumentedClassDirectory := outputDirectory.value / (classDirectory in Compile).value.getName,
+    jacocoInstrumentedDirectory := jacocoOutputDirectory.value / (classDirectory in Compile).value.getName,
     jacocoReport := reportAction(
-      outputDirectory.value,
-      executionDataFile.value,
+      jacocoOutputDirectory.value,
+      jacocoDataFile.value,
       jacocoReportSettings.value,
       coveredSources.value,
       classesToCover.value,
       jacocoSourceSettings.value,
       streams.value
     ),
     jacocoAggregateReport := aggregateReportAction(
-      aggregateReportDirectory.value,
+      jacocoAggregateReportDirectory.value,
       aggregateExecutionDataFiles.value,
       jacocoAggregateReportSettings.value,
       aggregateCoveredSources.value,
       aggregateClassesToCover.value,
       jacocoSourceSettings.value,
       streams.value
     ),
-    clean := outputDirectory map (dir => if (dir.exists) IO delete dir.listFiles)
+    clean := jacocoOutputDirectory map (dir => if (dir.exists) IO delete dir.listFiles)
   )
 }

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

@@ -37,17 +37,17 @@ object JacocoItPlugin extends BaseJacocoPlugin with Merging {
 
   lazy val conditionalMerge: Def.Initialize[Task[Unit]] = Def.task {
     conditionalMergeAction(
-      (executionDataFile in Jacoco).value,
-      (executionDataFile in ItJacoco).value,
+      (jacocoDataFile in Jacoco).value,
+      (jacocoDataFile in ItJacoco).value,
       (mergedExecutionDataFile in ItJacoco).value,
       streams.value,
       mergeReports.value)
   }
 
   lazy val forceMerge: Def.Initialize[Task[Unit]] = Def.task {
     mergeAction(
-      (executionDataFile in Jacoco).value,
-      (executionDataFile in ItJacoco).value,
+      (jacocoDataFile in Jacoco).value,
+      (jacocoDataFile in ItJacoco).value,
       (mergedExecutionDataFile in ItJacoco).value,
       streams.value)
   }
@@ -58,9 +58,9 @@ object JacocoItPlugin extends BaseJacocoPlugin with Merging {
         jacocoReport in ItJacoco := ((jacocoReport in ItJacoco) dependsOn conditionalMerge).value,
         jacocoMerge := forceMerge.value,
         mergeReports := true,
-        (mergedExecutionDataFile in ItJacoco) := (outputDirectory in ItJacoco).value / "jacoco-merged.exec",
+        (mergedExecutionDataFile in ItJacoco) := (jacocoOutputDirectory in ItJacoco).value / "jacoco-merged.exec",
         (jacocoReport in ItJacoco) := reportAction(
-          (outputDirectory in ItJacoco).value,
+          (jacocoOutputDirectory in ItJacoco).value,
           (mergedExecutionDataFile in ItJacoco).value,
           (jacocoReportSettings in ItJacoco).value,
           (coveredSources in ItJacoco).value,