@@ -24,7 +24,6 @@ import org.gradle.api.plugins.JavaPlugin
24
24
import org.gradle.api.tasks.TaskContainer
25
25
import org.gradle.api.tasks.TaskProvider
26
26
import org.gradle.plugin.devel.plugins.JavaGradlePluginPlugin
27
- import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
28
27
29
28
public abstract class ShadowJavaPlugin @Inject constructor(
30
29
private val softwareComponentFactory : SoftwareComponentFactory ,
@@ -53,6 +52,8 @@ public abstract class ShadowJavaPlugin @Inject constructor(
53
52
task.manifest.attributes[classPathAttributeKey] = attrs.joinToString(" " ).trim()
54
53
}
55
54
}
55
+ task.from(sourceSets.named(" main" ).map { it.output })
56
+ task.configurations.convention(provider { listOf (runtimeConfiguration) })
56
57
task.exclude(
57
58
" META-INF/INDEX.LIST" ,
58
59
" META-INF/*.SF" ,
@@ -62,19 +63,6 @@ public abstract class ShadowJavaPlugin @Inject constructor(
62
63
" META-INF/versions/**/module-info.class" ,
63
64
" module-info.class" ,
64
65
)
65
-
66
- if (plugins.hasPlugin(" org.jetbrains.kotlin.multiplatform" )) {
67
- val kmpExtension = extensions.getByType(KotlinMultiplatformExtension ::class .java)
68
- val kotlinJvmMain = kmpExtension.jvm().compilations.named(" main" )
69
-
70
- task.from(kotlinJvmMain.map { it.output.allOutputs })
71
- task.configurations.convention(
72
- provider { listOf (configurations.getByName(kotlinJvmMain.get().runtimeDependencyConfigurationName)) },
73
- )
74
- } else {
75
- task.from(sourceSets.named(" main" ).map { it.output })
76
- task.configurations.convention(provider { listOf (runtimeConfiguration) })
77
- }
78
66
}
79
67
artifacts.add(configurations.shadow.name, taskProvider)
80
68
}
0 commit comments