Update shadow plugin

junit-team · May 13, 2021 · 4f206d3 · 4f206d3
1 parent 81e6b00
commit 4f206d3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -12,7 +12,7 @@ repositories {
 dependencies {
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0")
-	implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
+	implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
 	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.0.3")
 }

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -1,3 +1,4 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
 
 plugins {
@@ -163,7 +164,7 @@ tasks.withType<Jar>().configureEach {
 		into("META-INF")
 	}
 	val suffix = archiveClassifier.getOrElse("")
-	if (suffix.isBlank() || suffix == "all") { // "all" is used by shadow plugin
+	if (suffix.isBlank() || this is ShadowJar) {
 		dependsOn(allMainClasses, compileModule)
 		from("$moduleOutputDir/$javaModuleName") {
 			include("module-info.class")

diff --git a/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts b/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts
@@ -47,6 +47,7 @@ tasks {
 	shadowJar {
 		configurations = listOf(shadowed)
 		exclude("META-INF/maven/**")
+		excludes.remove("module-info.class")
 		archiveClassifier.set("")
 	}
 	jar {