Skip to content

Commit 7870c4c

Browse files
committed
Cleanup and simplify transformers
1 parent 40d95f6 commit 7870c4c

File tree

3 files changed

+26
-59
lines changed

3 files changed

+26
-59
lines changed

src/main/kotlin/org/jetbrains/intellij/platform/gradle/artifacts/transform/CollectorTransformer.kt

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -121,23 +121,7 @@ abstract class CollectorTransformer : TransformAction<CollectorTransformer.Param
121121
.flatMap { it.listDirectoryEntries("*.jar") }
122122
}
123123

124-
internal fun register(
125-
dependencies: DependencyHandler,
126-
compileClasspathConfiguration: Configuration,
127-
testCompileClasspathConfiguration: Configuration,
128-
intellijPlatformClasspath: Configuration,
129-
intellijPlatformTestClasspath: Configuration,
130-
intellijPlatformConfiguration: Configuration,
131-
) {
132-
Attributes.ArtifactType.values().forEach {
133-
dependencies.artifactTypes.maybeCreate(it.toString())
134-
.attributes.attribute(Attributes.collected, false)
135-
}
136-
137-
listOf(compileClasspathConfiguration, testCompileClasspathConfiguration, intellijPlatformClasspath, intellijPlatformTestClasspath).forEach {
138-
it.attributes.attribute(Attributes.collected, true)
139-
}
140-
124+
internal fun register(dependencies: DependencyHandler, intellijPlatformConfiguration: Configuration) {
141125
dependencies.registerTransform(CollectorTransformer::class) {
142126
from
143127
.attribute(Attributes.extracted, true)

src/main/kotlin/org/jetbrains/intellij/platform/gradle/artifacts/transform/ExtractorTransformer.kt

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
package org.jetbrains.intellij.platform.gradle.artifacts.transform
44

5-
import org.gradle.api.artifacts.Configuration
65
import org.gradle.api.artifacts.dsl.DependencyHandler
76
import org.gradle.api.artifacts.transform.InputArtifact
87
import org.gradle.api.artifacts.transform.TransformAction
@@ -160,22 +159,7 @@ abstract class ExtractorTransformer @Inject constructor(
160159
}
161160

162161
companion object {
163-
internal fun register(
164-
dependencies: DependencyHandler,
165-
compileClasspathConfiguration: Configuration,
166-
testCompileClasspathConfiguration: Configuration,
167-
intellijPlatformClasspath: Configuration,
168-
intellijPlatformTestClasspath: Configuration,
169-
) {
170-
Attributes.ArtifactType.Archives.forEach {
171-
dependencies.artifactTypes.maybeCreate(it.toString())
172-
.attributes.attribute(Attributes.extracted, false)
173-
}
174-
175-
listOf(compileClasspathConfiguration, testCompileClasspathConfiguration, intellijPlatformClasspath, intellijPlatformTestClasspath).forEach {
176-
it.attributes.attribute(Attributes.extracted, true)
177-
}
178-
162+
internal fun register(dependencies: DependencyHandler) {
179163
dependencies.registerTransform(ExtractorTransformer::class) {
180164
from.attribute(Attributes.extracted, false)
181165
to.attribute(Attributes.extracted, true)

src/main/kotlin/org/jetbrains/intellij/platform/gradle/plugins/project/IntelliJPlatformBasePlugin.kt

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,14 @@ import org.jetbrains.intellij.platform.gradle.artifacts.transform.CollectorTrans
2121
import org.jetbrains.intellij.platform.gradle.artifacts.transform.ExtractorTransformer
2222
import org.jetbrains.intellij.platform.gradle.artifacts.transform.LocalIvyArtifactPathComponentMetadataRule
2323
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.*
2725
import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformExtension.*
2826
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
3127
import org.jetbrains.intellij.platform.gradle.get
3228
import org.jetbrains.intellij.platform.gradle.plugins.checkGradleVersion
3329
import org.jetbrains.intellij.platform.gradle.tasks.*
3430
import org.jetbrains.intellij.platform.gradle.tasks.aware.*
3531
import org.jetbrains.intellij.platform.gradle.utils.*
36-
import org.jetbrains.intellij.platform.gradle.utils.create
3732
import kotlin.io.path.absolute
3833
import kotlin.io.path.invariantSeparatorsPathString
3934

@@ -136,7 +131,7 @@ abstract class IntelliJPlatformBasePlugin : Plugin<Project> {
136131

137132
log.info("$ruleName has been registered.")
138133
}
139-
} else {
134+
} else {
140135
log.info("$ruleName can not be registered because '${rulesMode}' mode is used in settings.")
141136
}
142137
}
@@ -345,24 +340,28 @@ abstract class IntelliJPlatformBasePlugin : Plugin<Project> {
345340
attribute(Attributes.extracted)
346341
}
347342

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)
366365

367366
project.pluginManager.withPlugin(Plugins.External.JAVA_TEST_FIXTURES) {
368367
project.configurations[Configurations.External.TEST_FIXTURES_COMPILE_CLASSPATH]

0 commit comments

Comments
 (0)