Fix JAR installation

zeroc-ice · Sep 25, 2023 · 237761f · 237761f
1 parent 9c3b731
commit 237761f
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/java/gradle/library.gradle b/java/gradle/library.gradle
@@ -85,22 +85,15 @@ if(project.name == "icebox-compat") {
 }
 
 clean {
-    if (GradleVersion.current() >= GradleVersion.version('8.0')) {
-        delete("${libDir}/${jar.archiveFileName}")
-    } else {
-        delete("${libDir}/${jar.archiveName}")
-    }
+    delete("${libDir}/${project.name}-${project.version}.jar")
     delete("${libDir}/${project.name}-${project.version}-sources.jar")
+    delete("${libDir}/${project.name}-${project.version}-javadoc.jar")
     delete(project.ext.pomName)
 }
 
 task installJars(type: Copy, dependsOn: jarSources) {
     from "${project.ext.pomName}"
-    if (GradleVersion.current() >= GradleVersion.version('8.0')) {
-        from "${libDir}/${jar.archiveFileName}"
-    } else {
-        from "${libDir}/${jar.archiveName}"
-    }
+    from "${libDir}/${project.name}-${project.version}.jar"
     from "${libDir}/${project.name}-${project.version}-sources.jar"
     into "${DESTDIR}${jarDir}"
 }