Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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,)"
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/LibsConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ fun Project.applyLibrariesConfiguration() {
)

tasks.register<ShadowJar>("jar") {
configurations = listOf(project.configurations["shade"])
configurations.set(listOf(project.configurations["shade"]))
archiveClassifier.set("")

dependencies {
Expand Down
8 changes: 5 additions & 3 deletions buildSrc/src/main/kotlin/PlatformConfig.kt
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -35,6 +36,10 @@ fun Project.applyPlatformAndCoreConfiguration() {
ext["internalVersion"] = "$version"
}

configure<ShadowExtension> {
addShadowVariantIntoJavaComponent.set(false)
}

configure<JavaPluginExtension> {
disableAutoTargetJvm()
withJavadocJar()
Expand All @@ -45,9 +50,6 @@ fun Project.applyPlatformAndCoreConfiguration() {
}

val javaComponent = components["java"] as AdhocComponentWithVariants
javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) {
skip()
}

val publishingExtension = the<PublishingExtension>()

Expand Down
Loading