@@ -48,8 +48,8 @@ abstract class CallSiteInstrumentationPlugin : Plugin<Project>{
4848 compileClasspath + = mainSourceSet.output // mainly needed for the plugin tests
4949 annotationProcessorPath + = mainSourceSet.annotationProcessorPath
5050 java.srcDir(targetFolder)
51-
5251 }
52+
5353 project.configurations.named(csiSourceSet.compileClasspathConfigurationName) {
5454 extendsFrom(project.configurations.named(mainSourceSet.compileClasspathConfigurationName).get())
5555 }
@@ -119,10 +119,10 @@ abstract class CallSiteInstrumentationPlugin : Plugin<Project>{
119119 }
120120
121121 private fun registerGenerateCallSiteTask (project : Project ,
122- extension : CallSiteInstrumentationExtension ,
122+ csiExtension : CallSiteInstrumentationExtension ,
123123 compileTaskName : String ) {
124124 val taskName = compileTaskName.replace(" compile" , " generateCallSite" )
125- val rootFolder = extension .rootFolder.getOrElse(project.rootDir)
125+ val rootFolder = csiExtension .rootFolder.getOrElse(project.rootDir)
126126 val pluginJarFile = Paths .get(
127127 rootFolder.toString(),
128128 " buildSrc" ,
@@ -137,31 +137,31 @@ abstract class CallSiteInstrumentationPlugin : Plugin<Project>{
137137 group = " call site instrumentation"
138138 description = " Generates call sites from $compileTaskName "
139139 // Task input & output
140- val output = extension .targetFolder
140+ val output = csiExtension .targetFolder
141141 val inputProvider = compileTask.map { it.destinationDirectory.get() }
142142 inputs.dir(inputProvider)
143143 outputs.dir(output)
144144
145145 // JavaExec configuration
146- if (extension .javaVersion.isPresent) {
147- configureLanguage(this , extension .javaVersion.get())
146+ if (csiExtension .javaVersion.isPresent) {
147+ configureLanguage(this , csiExtension .javaVersion.get())
148148 }
149- jvmArgumentProviders.add({ extension .jvmArgs.get() })
149+ jvmArgumentProviders.add({ csiExtension .jvmArgs.get() })
150150 classpath(pluginJarFile)
151151 mainClass.set(CALL_SITE_INSTRUMENTER_MAIN_CLASS )
152152
153153 // Write the call site instrumenter arguments into a temporary file
154154 doFirst {
155- val programClassPath = extension .configurations.get().flatMap {
155+ val programClassPath = csiExtension .configurations.get().flatMap {
156156 it.files
157157 }.map { it.toString() }
158158
159159 val arguments = listOf (
160- extension .srcFolder.get().asFile.toString(),
160+ csiExtension .srcFolder.get().asFile.toString(),
161161 inputProvider.get().asFile.toString(),
162162 output.get().asFile.toString(),
163- extension .suffix.get(),
164- extension .reporters.get().joinToString(" ," )
163+ csiExtension .suffix.get(),
164+ csiExtension .reporters.get().joinToString(" ," )
165165 ) + programClassPath
166166
167167 val argumentFile = newTempFile(temporaryDir, " call-site-arguments" )
0 commit comments