Skip to content

Commit

Permalink
Merge pull request #147 from arpsmack/fix-asm-shading
Browse files Browse the repository at this point in the history
Fixed shading of the asm dependency
  • Loading branch information
hakanai authored Jan 22, 2024
2 parents bec21b3 + d8ba9c0 commit e862997
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ license {
}

configurations {
plugin.description = 'Plugin\'s dependencies'
implementation.extendsFrom plugin

[apiElements, runtimeElements].each {
it.outgoing.artifacts.removeIf { it.buildDependencies.getDependencies(null).contains(jar) }
it.outgoing.artifact(shadowJar)
Expand All @@ -90,7 +87,7 @@ dependencies {
shadow gradleTestKit()
shadow localGroovy()

implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32'
shadow group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32'

implementation "org.ow2.asm:asm:$asmVersion"
implementation "org.ow2.asm:asm-commons:$asmVersion"
Expand Down Expand Up @@ -124,15 +121,7 @@ gradlePlugin {
}

shadowJar {
configurations = [project.configurations.plugin]
archiveClassifier = null
dependencies {
include(dependency("org.ow2.asm:asm:$asmVersion"))
include(dependency("org.ow2.asm:asm-commons:$asmVersion"))
include(dependency("org.ow2.asm:asm-tree:$asmVersion"))
include(dependency("org.ow2.asm:asm-util:$asmVersion"))
include(dependency("org.ow2.asm:asm-anaysis:$asmVersion"))
}
relocate 'org.objectweb.asm', 'org.beryx.jlink.shadow.asm'
}

Expand Down

0 comments on commit e862997

Please sign in to comment.