@@ -21,19 +21,14 @@ import org.jetbrains.intellij.platform.gradle.artifacts.transform.CollectorTrans
21
21
import org.jetbrains.intellij.platform.gradle.artifacts.transform.ExtractorTransformer
22
22
import org.jetbrains.intellij.platform.gradle.artifacts.transform.LocalIvyArtifactPathComponentMetadataRule
23
23
import org.jetbrains.intellij.platform.gradle.artifacts.transform.LocalPluginsNormalizationTransformers
24
- import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformDependenciesExtension
25
- import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformDependenciesHelper
26
- import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformExtension
24
+ import org.jetbrains.intellij.platform.gradle.extensions.*
27
25
import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformExtension.*
28
26
import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformExtension.PluginConfiguration.*
29
- import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformRepositoriesExtension
30
- import org.jetbrains.intellij.platform.gradle.extensions.localPlatformArtifactsPath
31
27
import org.jetbrains.intellij.platform.gradle.get
32
28
import org.jetbrains.intellij.platform.gradle.plugins.checkGradleVersion
33
29
import org.jetbrains.intellij.platform.gradle.tasks.*
34
30
import org.jetbrains.intellij.platform.gradle.tasks.aware.*
35
31
import org.jetbrains.intellij.platform.gradle.utils.*
36
- import org.jetbrains.intellij.platform.gradle.utils.create
37
32
import kotlin.io.path.absolute
38
33
import kotlin.io.path.invariantSeparatorsPathString
39
34
@@ -136,7 +131,7 @@ abstract class IntelliJPlatformBasePlugin : Plugin<Project> {
136
131
137
132
log.info(" $ruleName has been registered." )
138
133
}
139
- } else {
134
+ } else {
140
135
log.info(" $ruleName can not be registered because '${rulesMode} ' mode is used in settings." )
141
136
}
142
137
}
@@ -345,24 +340,28 @@ abstract class IntelliJPlatformBasePlugin : Plugin<Project> {
345
340
attribute(Attributes .extracted)
346
341
}
347
342
348
- ExtractorTransformer .register(
349
- dependencies = this ,
350
- compileClasspathConfiguration = project.configurations[Configurations .External .COMPILE_CLASSPATH ],
351
- testCompileClasspathConfiguration = project.configurations[Configurations .External .TEST_COMPILE_CLASSPATH ],
352
- intellijPlatformClasspath = project.configurations[Configurations .INTELLIJ_PLATFORM_CLASSPATH ],
353
- intellijPlatformTestClasspath = project.configurations[Configurations .INTELLIJ_PLATFORM_TEST_CLASSPATH ],
354
- )
355
- CollectorTransformer .register(
356
- dependencies = this ,
357
- compileClasspathConfiguration = project.configurations[Configurations .External .COMPILE_CLASSPATH ],
358
- testCompileClasspathConfiguration = project.configurations[Configurations .External .TEST_COMPILE_CLASSPATH ],
359
- intellijPlatformClasspath = project.configurations[Configurations .INTELLIJ_PLATFORM_CLASSPATH ],
360
- intellijPlatformTestClasspath = project.configurations[Configurations .INTELLIJ_PLATFORM_TEST_CLASSPATH ],
361
- intellijPlatformConfiguration = project.configurations[Configurations .INTELLIJ_PLATFORM_DEPENDENCY ],
362
- )
363
- LocalPluginsNormalizationTransformers .register(
364
- dependencies = this
365
- )
343
+ Attributes .ArtifactType .Archives .forEach {
344
+ artifactTypes.maybeCreate(it.toString())
345
+ .attributes
346
+ .attribute(Attributes .extracted, false )
347
+ .attribute(Attributes .collected, false )
348
+ }
349
+
350
+ listOf (
351
+ project.configurations[Configurations .External .COMPILE_CLASSPATH ],
352
+ project.configurations[Configurations .External .RUNTIME_CLASSPATH ],
353
+ project.configurations[Configurations .External .TEST_COMPILE_CLASSPATH ],
354
+ project.configurations[Configurations .INTELLIJ_PLATFORM_CLASSPATH ],
355
+ project.configurations[Configurations .INTELLIJ_PLATFORM_TEST_CLASSPATH ],
356
+ ).forEach {
357
+ it.attributes
358
+ .attribute(Attributes .extracted, true )
359
+ .attribute(Attributes .collected, true )
360
+ }
361
+
362
+ ExtractorTransformer .register(this )
363
+ CollectorTransformer .register(this , project.configurations[Configurations .INTELLIJ_PLATFORM_DEPENDENCY ])
364
+ LocalPluginsNormalizationTransformers .register(this )
366
365
367
366
project.pluginManager.withPlugin(Plugins .External .JAVA_TEST_FIXTURES ) {
368
367
project.configurations[Configurations .External .TEST_FIXTURES_COMPILE_CLASSPATH ]
0 commit comments