File tree 3 files changed +4
-2
lines changed
3 files changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ repositories {
12
12
dependencies {
13
13
implementation(kotlin(" gradle-plugin" ))
14
14
implementation(" biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0" )
15
- implementation(" com.github.jengelman.gradle.plugins:shadow:6.1 .0" )
15
+ implementation(" gradle.plugin. com.github.jengelman.gradle.plugins:shadow:7.0 .0" )
16
16
implementation(" org.gradle:test-retry-gradle-plugin:1.2.1" )
17
17
compileOnly(" com.gradle.enterprise:test-distribution-gradle-plugin:2.0.3" )
18
18
}
Original file line number Diff line number Diff line change
1
+ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
1
2
import org.gradle.api.tasks.PathSensitivity.RELATIVE
2
3
3
4
plugins {
@@ -163,7 +164,7 @@ tasks.withType<Jar>().configureEach {
163
164
into(" META-INF" )
164
165
}
165
166
val suffix = archiveClassifier.getOrElse(" " )
166
- if (suffix.isBlank() || suffix == " all " ) { // "all" is used by shadow plugin
167
+ if (suffix.isBlank() || this is ShadowJar ) {
167
168
dependsOn(allMainClasses, compileModule)
168
169
from(" $moduleOutputDir /$javaModuleName " ) {
169
170
include(" module-info.class" )
Original file line number Diff line number Diff line change @@ -47,6 +47,7 @@ tasks {
47
47
shadowJar {
48
48
configurations = listOf (shadowed)
49
49
exclude(" META-INF/maven/**" )
50
+ excludes.remove(" module-info.class" )
50
51
archiveClassifier.set(" " )
51
52
}
52
53
jar {
You can’t perform that action at this time.
0 commit comments