From 7e36ed0ea9415d0f5dd6f11dcd371dfa96597a71 Mon Sep 17 00:00:00 2001 From: Sean Gilligan Date: Sat, 22 Apr 2023 11:25:37 -0700 Subject: [PATCH] build.gradle: use `archiveClassifier` if available `classifier` was deprecated in Gradle 5.1 and removed in Gradle 8.x, so use `archiveClassifier` on Gradle 5.0 or later. --- core/build.gradle | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 20b80b7e8..623508539 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -97,13 +97,23 @@ jar { } } +def minGradleArchiveClassifierVersion = GradleVersion.version("5.0") + task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' + if (GradleVersion.current().compareTo(minGradleArchiveClassifierVersion) > 0) { + archiveClassifier.set('javadoc') + } else { + classifier = 'javadoc' + } from javadoc.destinationDir } task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' + if (GradleVersion.current().compareTo(minGradleArchiveClassifierVersion) > 0) { + archiveClassifier.set('sources') + } else { + classifier = 'sources' + } from sourceSets.main.allSource }