@@ -18,7 +18,6 @@ import org.gradle.api.tasks.TaskProvider
1818import org.gradle.api.tasks.compile.AbstractCompile
1919import org.gradle.api.tasks.testing.Test
2020import org.gradle.jvm.tasks.Jar
21- import org.gradle.jvm.toolchain.JavaLanguageVersion
2221import org.gradle.jvm.toolchain.JavaToolchainService
2322import org.gradle.kotlin.dsl.apply
2423import org.gradle.kotlin.dsl.create
@@ -36,13 +35,13 @@ private const val CALL_SITE_INSTRUMENTER_MAIN_CLASS = "datadog.trace.plugin.csi.
3635private const val CSI = " csi"
3736private const val CSI_SOURCE_SET = CSI
3837
39- abstract class CallSiteInstrumentationPlugin : Plugin <Project >{
38+ abstract class CallSiteInstrumentationPlugin : Plugin <Project > {
4039 @get:Inject
4140 abstract val javaToolchains: JavaToolchainService
4241
4342 override fun apply (project : Project ) {
4443 project.pluginManager.apply (JavaPlugin ::class )
45-
44+
4645 // Create plugin extension
4746 val extension = project.extensions.create<CallSiteInstrumentationExtension >(CSI )
4847 configureSourceSets(project, extension)
@@ -101,32 +100,27 @@ abstract class CallSiteInstrumentationPlugin : Plugin<Project>{
101100 return file
102101 }
103102
104- private fun createTasks (project : Project , extension : CallSiteInstrumentationExtension ) {
105- registerGenerateCallSiteTask(project, extension , project.tasks.named<AbstractCompile >(" compileJava" ))
103+ private fun createTasks (project : Project , csiExtension : CallSiteInstrumentationExtension ) {
104+ registerGenerateCallSiteTask(project, csiExtension , project.tasks.named<AbstractCompile >(" compileJava" ))
106105
107- val targetFolder = extension.targetFolder.get().asFile
108- project.tasks.withType<AbstractCompile >().matching {
109- task -> task.name.startsWith(" compileTest" )
106+ project.tasks.withType<AbstractCompile >().matching { task ->
107+ task.name.startsWith(" compileTest" )
110108 }.configureEach {
111- inputs.dir(extension .targetFolder)
112- classpath + = project.files(targetFolder)
109+ inputs.dir(csiExtension .targetFolder)
110+ classpath + = project.files(csiExtension. targetFolder)
113111 }
114112
115113 project.tasks.withType<Test >().configureEach {
116- inputs.dir(extension .targetFolder)
117- classpath + = project.files(targetFolder)
114+ inputs.dir(csiExtension .targetFolder)
115+ classpath + = project.files(csiExtension. targetFolder)
118116 }
119117 }
120118
121- private fun configureLanguage (task : JavaExec , version : JavaLanguageVersion ) {
122- task.javaLauncher.set(javaToolchains.launcherFor {
123- languageVersion.set(version)
124- })
125- }
126-
127- private fun registerGenerateCallSiteTask (project : Project ,
128- csiExtension : CallSiteInstrumentationExtension ,
129- mainCompileTask : TaskProvider <AbstractCompile >) {
119+ private fun registerGenerateCallSiteTask (
120+ project : Project ,
121+ csiExtension : CallSiteInstrumentationExtension ,
122+ mainCompileTask : TaskProvider <AbstractCompile >
123+ ) {
130124 val genTaskName = mainCompileTask.name.replace(" compile" , " generateCallSite" )
131125 val pluginJarFile = Paths .get(
132126 csiExtension.rootFolder.getOrElse(project.rootDir).toString(),
0 commit comments