diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index c8006d7541..3fd5efb9a8 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -23,7 +23,7 @@ val properties = Properties().also { props -> dependencies { implementation(gradleApi()) implementation("org.ajoberstar.grgit:grgit-gradle:5.3.2") - implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.9") + implementation("com.gradleup.shadow:shadow-gradle-plugin:9.1.0") implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:2.0.0-SNAPSHOT") constraints { val asmVersion = "[9.7,)" diff --git a/buildSrc/src/main/kotlin/LibsConfig.kt b/buildSrc/src/main/kotlin/LibsConfig.kt index d21f146fb3..434529c964 100644 --- a/buildSrc/src/main/kotlin/LibsConfig.kt +++ b/buildSrc/src/main/kotlin/LibsConfig.kt @@ -45,7 +45,7 @@ fun Project.applyLibrariesConfiguration() { ) tasks.register("jar") { - configurations = listOf(project.configurations["shade"]) + configurations.set(listOf(project.configurations["shade"])) archiveClassifier.set("") dependencies { diff --git a/buildSrc/src/main/kotlin/PlatformConfig.kt b/buildSrc/src/main/kotlin/PlatformConfig.kt index bc579e7d9e..dc6afadc91 100644 --- a/buildSrc/src/main/kotlin/PlatformConfig.kt +++ b/buildSrc/src/main/kotlin/PlatformConfig.kt @@ -1,3 +1,4 @@ +import com.github.jengelman.gradle.plugins.shadow.ShadowExtension import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.api.Project import org.gradle.api.component.AdhocComponentWithVariants @@ -35,6 +36,10 @@ fun Project.applyPlatformAndCoreConfiguration() { ext["internalVersion"] = "$version" } + configure { + addShadowVariantIntoJavaComponent.set(false) + } + configure { disableAutoTargetJvm() withJavadocJar() @@ -45,9 +50,6 @@ fun Project.applyPlatformAndCoreConfiguration() { } val javaComponent = components["java"] as AdhocComponentWithVariants - javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) { - skip() - } val publishingExtension = the()