Removed redundant SetupInstrumentCodeTask task

Author: hsz

CHANGELOG.md

@@ -11,6 +11,9 @@
 - Fixed calculationg of JVM arguments for running tests [#1360](../../issues/1360)
 - Introduce CommandLineArgumentProviders for better management of JVM arguments and avoiding passing absolute paths to support Gradle Build Cache [#1376](../../issues/1376)
 
+### Removed
+- Removed redundant `SetupInstrumentCodeTask` task
+
 ## [1.14.1] - 2023-06-07
 
 ### Fixed

src/main/kotlin/org/jetbrains/intellij/IntelliJPlugin.kt

@@ -95,7 +95,6 @@ import org.jetbrains.intellij.IntelliJPluginConstants.RUN_IDE_TASK_NAME
 import org.jetbrains.intellij.IntelliJPluginConstants.RUN_PLUGIN_VERIFIER_TASK_NAME
 import org.jetbrains.intellij.IntelliJPluginConstants.SEARCHABLE_OPTIONS_DIR_NAME
 import org.jetbrains.intellij.IntelliJPluginConstants.SETUP_DEPENDENCIES_TASK_NAME
-import org.jetbrains.intellij.IntelliJPluginConstants.SETUP_INSTRUMENT_CODE_TASK_NAME
 import org.jetbrains.intellij.IntelliJPluginConstants.SIGN_PLUGIN_TASK_NAME
 import org.jetbrains.intellij.IntelliJPluginConstants.TASKS
 import org.jetbrains.intellij.IntelliJPluginConstants.VERIFY_PLUGIN_CONFIGURATION_TASK_NAME
@@ -962,13 +961,6 @@ abstract class IntelliJPlugin : Plugin<Project> {
         val jarTaskProvider = project.tasks.named<Jar>(JAR_TASK_NAME)
         val instrumentCodeProvider = project.provider { extension.instrumentCode.get() }
 
-        val setupInstrumentCodeTaskProvider = project.tasks.register<SetupInstrumentCodeTask>(SETUP_INSTRUMENT_CODE_TASK_NAME) {
-            instrumentationEnabled.convention(extension.instrumentCode)
-            instrumentedDir.convention(project.layout.buildDirectory.dir("instrumented"))
-
-            onlyIf { instrumentCodeProvider.get() }
-        }
-
         val sourceSets = project.extensions.findByName("sourceSets") as SourceSetContainer
         sourceSets.forEach { sourceSet ->
             val name = sourceSet.getTaskName("instrument", "code")
@@ -1120,13 +1112,10 @@ abstract class IntelliJPlugin : Plugin<Project> {
                     }
                 })
 
-                outputDir.convention(setupInstrumentCodeTaskProvider.flatMap { setupInstrumentCodeTask ->
-                    setupInstrumentCodeTask.instrumentedDir.map { it.dir(name) }
-                })
+                outputDir.convention(project.layout.buildDirectory.map { it.dir("instrumented").dir(name) })
                 instrumentationLogs.convention(project.gradle.startParameter.logLevel == LogLevel.INFO)
 
                 dependsOn(sourceSet.classesTaskName)
-                dependsOn(SETUP_INSTRUMENT_CODE_TASK_NAME)
                 finalizedBy(CLASSPATH_INDEX_CLEANUP_TASK_NAME)
                 onlyIf { instrumentCodeProvider.get() }
             }

src/main/kotlin/org/jetbrains/intellij/IntelliJPluginConstants.kt

@@ -35,7 +35,6 @@ object IntelliJPluginConstants {
     const val RUN_IDE_PERFORMANCE_TEST_TASK_NAME = "runIdePerformanceTest"
     const val RUN_PLUGIN_VERIFIER_TASK_NAME = "runPluginVerifier"
     const val SETUP_DEPENDENCIES_TASK_NAME = "setupDependencies"
-    const val SETUP_INSTRUMENT_CODE_TASK_NAME = "setupInstrumentCode"
     const val SIGN_PLUGIN_TASK_NAME = "signPlugin"
     const val VERIFY_PLUGIN_TASK_NAME = "verifyPlugin"
     const val VERIFY_PLUGIN_CONFIGURATION_TASK_NAME = "verifyPluginConfiguration"
@@ -67,7 +66,6 @@ object IntelliJPluginConstants {
         RUN_IDE_PERFORMANCE_TEST_TASK_NAME,
         RUN_PLUGIN_VERIFIER_TASK_NAME,
         SETUP_DEPENDENCIES_TASK_NAME,
-        SETUP_INSTRUMENT_CODE_TASK_NAME,
         SIGN_PLUGIN_TASK_NAME,
         VERIFY_PLUGIN_TASK_NAME,
         VERIFY_PLUGIN_CONFIGURATION_TASK_NAME,