From d5c662a69cfb48144a4027c344ff254f12e1e78a Mon Sep 17 00:00:00 2001 From: Konstantin Gribov Date: Sat, 7 Sep 2019 07:49:39 +0300 Subject: [PATCH] Use convention mapping for classifier on old gradle (#502) Fixes #463 --- .../gradle/plugins/shadow/ShadowJavaPlugin.groovy | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy index 3551a1b3c..77a5aca4b 100644 --- a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy +++ b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy @@ -41,13 +41,14 @@ class ShadowJavaPlugin implements Plugin { ShadowJar shadow = project.tasks.create(SHADOW_JAR_TASK_NAME, ShadowJar) shadow.group = SHADOW_GROUP shadow.description = 'Create a combined JAR of project and runtime dependencies' - shadow.conventionMapping.with { - map('classifier') { - 'all' - } - } if (GradleVersion.current() >= GradleVersion.version("5.1")) { shadow.archiveClassifier.set("all") + } else { + shadow.conventionMapping.with { + map('classifier') { + 'all' + } + } } shadow.manifest.inheritFrom project.tasks.jar.manifest shadow.doFirst {