@@ -74,20 +74,6 @@ class PreprocessPlugin : Plugin<Project> {
7474 val preprocessedJava = File (project.buildDir, " preprocessed/$name /java" )
7575 val preprocessedResources = File (project.buildDir, " preprocessed/$name /resources" )
7676
77- if (kotlin) {
78- val preprocessKotlin = project.tasks.register<PreprocessTask >(" preprocess${cName} Kotlin" ) {
79- source = inherited.file(inheritedSourceSet.withGroovyBuilder { getProperty(" kotlin" ) as SourceDirectorySet }.srcDirs.first())
80- generated = preprocessedKotlin
81- compileTask(inherited.tasks[" compile${cName} Kotlin" ] as AbstractCompile )
82- mapping = mappingFile
83- reverseMapping = coreVersion < mcVersion
84- vars = mutableMapOf (" MC" to mcVersion)
85- }
86- val sourceKotlinTask = project.tasks.findByName(" source${name.capitalize()} Kotlin" )
87- (sourceKotlinTask ? : project.tasks[" compile${cName} Kotlin" ]).dependsOn(preprocessKotlin)
88- withGroovyBuilder { getProperty(" kotlin" ) as SourceDirectorySet }.setSrcDirs(listOf (preprocessKotlin, preprocessedJava))
89- }
90-
9177 val preprocessJava = project.tasks.register<PreprocessTask >(" preprocess${cName} Java" ) {
9278 source = inherited.file(inheritedSourceSet.java.srcDirs.first())
9379 generated = preprocessedJava
@@ -103,6 +89,22 @@ class PreprocessPlugin : Plugin<Project> {
10389 (sourceJavaTask ? : project.tasks[" compile${cName} Java" ]).dependsOn(preprocessJava)
10490 java.setSrcDirs(listOf (preprocessedJava))
10591
92+ if (kotlin) {
93+ val preprocessKotlin = project.tasks.register<PreprocessTask >(" preprocess${cName} Kotlin" ) {
94+ source = inherited.file(inheritedSourceSet.withGroovyBuilder { getProperty(" kotlin" ) as SourceDirectorySet }.srcDirs.first())
95+ generated = preprocessedKotlin
96+ compileTask(inherited.tasks[" compile${cName} Kotlin" ] as AbstractCompile )
97+ mapping = mappingFile
98+ reverseMapping = coreVersion < mcVersion
99+ vars = mutableMapOf (" MC" to mcVersion)
100+ }
101+ val kotlinConsumerTask = project.tasks.findByName(" source${name.capitalize()} Kotlin" )
102+ ? : project.tasks[" compile${cName} Kotlin" ]
103+ kotlinConsumerTask.dependsOn(preprocessKotlin)
104+ kotlinConsumerTask.dependsOn(preprocessJava)
105+ withGroovyBuilder { getProperty(" kotlin" ) as SourceDirectorySet }.setSrcDirs(listOf (preprocessKotlin, preprocessedJava))
106+ }
107+
106108 val preprocessResources = project.tasks.register<PreprocessTask >(" preprocess${cName} Resources" ) {
107109 source = inherited.file(inheritedSourceSet.resources.srcDirs.first())
108110 generated = preprocessedResources
0 commit comments