Skip to content

Commit 027ab27

Browse files
authored
Extract JavaAgent class to make it open. (#20)
The main motivation for this change is to make it possible to extend the requires method to specify plugins ordering.
1 parent 0b49b48 commit 027ab27

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

src/main/scala/com/lightbend/sbt/javaagent/JavaAgent.scala

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,14 @@ import sbt.Keys._
1212
* Supports agents as compile-time dependencies, in forked tests, in forked run,
1313
* and in `sbt-native-packager` dists through the `JavaAgentPackaging` plugin.
1414
*/
15-
object JavaAgent extends AutoPlugin {
15+
object JavaAgent extends JavaAgent {
16+
val autoImport = JavaAgentKeys
1617

1718
object JavaAgentKeys {
1819
val javaAgents = settingKey[Seq[AgentModule]]("Java agent modules enabled for this project.")
1920
val resolvedJavaAgents = taskKey[Seq[ResolvedAgent]]("Java agent modules with resolved artifacts.")
2021
}
2122

22-
import JavaAgentKeys._
23-
24-
val autoImport = JavaAgentKeys
25-
2623
val AgentConfig = config("javaagent").hide
2724

2825
case class AgentScope(compile: Boolean = false, test: Boolean = false, run: Boolean = false, dist: Boolean = true)
@@ -53,8 +50,13 @@ object JavaAgent extends AutoPlugin {
5350
val configuredScope = AgentScope(compile = inCompile, test = inTest, run = inRun, dist = inDist)
5451
AgentModule(agentName, reconfiguredModule, configuredScope, agentArguments)
5552
}
53+
}
54+
55+
class JavaAgent extends AutoPlugin {
56+
import JavaAgent._
57+
import JavaAgent.JavaAgentKeys._
5658

57-
override def requires = plugins.JvmPlugin
59+
override def requires: Plugins = plugins.JvmPlugin
5860

5961
override def projectSettings = Seq(
6062
javaAgents := Seq.empty,

0 commit comments

Comments
 (0)