@@ -56,11 +56,12 @@ object ScoverageSbtPlugin extends AutoPlugin {
5656 addCommandAlias(" coverageOn" , " ;set ThisBuild / coverageEnabled := true" ) ++
5757 addCommandAlias(" coverageOff" , " ;set ThisBuild / coverageEnabled := false" )
5858
59- override def projectSettings : Seq [Setting [_]] = Seq (
59+ override def projectSettings : Seq [Setting [_]] = super .projectSettings ++ Seq (
6060 ivyConfigurations += ScoveragePluginConfig ,
6161 coverageReport := coverageReport0.value,
6262 coverageAggregate := coverageAggregate0.value,
63- coverageAggregate / aggregate := false
63+ coverageAggregate / aggregate := false ,
64+ coverageDataDir := crossTarget.value
6465 ) ++ coverageSettings ++ scalacSettings
6566
6667 private lazy val coverageSettings = Seq (
@@ -99,7 +100,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
99100 Seq (
100101 Some (s " -Xplugin: ${pluginPath.getAbsolutePath}" ),
101102 Some (
102- s " -P:scoverage:dataDir: ${crossTarget .value.getAbsolutePath}/scoverage-data "
103+ s " -P:scoverage:dataDir: ${coverageDataDir .value.getAbsolutePath}/scoverage-data "
103104 ),
104105 Option (coverageExcludedPackages.value.trim)
105106 .filter(_.nonEmpty)
@@ -136,7 +137,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
136137 }
137138
138139 private lazy val coverageReport0 = Def .task {
139- val target = crossTarget .value
140+ val target = coverageDataDir .value
140141 implicit val log = streams.value.log
141142
142143 log.info(s " Waiting for measurement data to sync... " )
@@ -169,13 +170,13 @@ object ScoverageSbtPlugin extends AutoPlugin {
169170 implicit val log = streams.value.log
170171 log.info(s " Aggregating coverage from subprojects... " )
171172
172- val dataDirs = crossTarget
173+ val dataDirs = coverageDataDir
173174 .all(aggregateFilter)
174175 .value map (_ / Constants .DataDir ) filter (_.isDirectory)
175176 CoverageAggregator .aggregate(dataDirs) match {
176177 case Some (cov) =>
177178 writeReports(
178- crossTarget .value,
179+ coverageDataDir .value,
179180 sourceDirectories.all(aggregateFilter).value.flatten,
180181 cov,
181182 coverageOutputCobertura.value,
0 commit comments