Skip to content

Commit e9839df

Browse files
committed
Revert one review fix as it introduces an error.
1 parent cf0151f commit e9839df

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

project/FilteredJacocoAgentPlugin.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// JacocoBaseKeysPlugin.scala | last modified in v1.0.0
1+
// JacocoBaseKeysPlugin.scala | last modified in v1.0.0 + local changes
22

33
import JacocoBaseKeysPlugin.autoImport.*
44
import sbt.*
@@ -70,7 +70,7 @@ object FilteredJacocoAgentPlugin extends AutoPlugin {
7070
}
7171
}
7272

73-
lazy val jmf = config("jmf").extend(Compile)
73+
lazy val Jmf = config("jmf").extend(Compile)
7474

7575
// ---- commands
7676
private lazy val jacocoCleanAllCmd = Command.command("jacocoCleanAll") { state =>
@@ -139,7 +139,7 @@ object FilteredJacocoAgentPlugin extends AutoPlugin {
139139
// pull the agent with the runtime classifier (this is the actual -javaagent jar)
140140
("org.jacoco" % "org.jacoco.agent" % jacocoVersion.value % Test).classifier("runtime"),
141141
("org.jacoco" % "org.jacoco.cli" % jacocoVersion.value % Test).classifier("nodeps"),
142-
"io.github.moranaapps" %% "jacoco-method-filter-core" % jmfCoreVersion.value % jmf.name,
142+
"io.github.moranaapps" %% "jacoco-method-filter-core" % jmfCoreVersion.value % Jmf.name,
143143
),
144144
jacocoSetUserDirToBuildRoot := true,
145145

@@ -157,7 +157,7 @@ object FilteredJacocoAgentPlugin extends AutoPlugin {
157157
},
158158

159159
// --- JMF tool wiring
160-
ivyConfigurations += jmf,
160+
ivyConfigurations += Jmf,
161161

162162
jmfOutDir := target.value / "jmf",
163163
jmfRulesFile:= (ThisBuild / baseDirectory).value / "jmf-rules.txt",
@@ -172,7 +172,7 @@ object FilteredJacocoAgentPlugin extends AutoPlugin {
172172
val _ = (Compile / compile).value
173173

174174
val rules = jmfRulesFile.value
175-
val upd = (jmf / update).value // hoisted
175+
val upd = (Jmf / update).value // hoisted
176176
val log = streams.value.log
177177
val outRoot = jmfOutDir.value
178178
val mainCls = jmfCliMain.value
@@ -186,7 +186,7 @@ object FilteredJacocoAgentPlugin extends AutoPlugin {
186186
val compileCp: Seq[File] = Attributed.data((Compile / fullClasspath).value)
187187

188188
// Jmf-resolved jars (your jacoco-method-filter-core, etc.)
189-
val jmfJars: Seq[File] = (jmf / update).value.matching(artifactFilter(`type` = "jar")).distinct
189+
val jmfJars: Seq[File] = (Jmf / update).value.matching(artifactFilter(`type` = "jar")).distinct
190190

191191
// Final runtime CP
192192
val cp: Seq[File] = (compileCp ++ jmfJars :+ (Compile / classDirectory).value).distinct

0 commit comments

Comments
 (0)