buildscripts: use withJavadocJar() and withSourcesJar()

stephengold · May 19, 2024 · 0657d38 · 0657d38
1 parent 2cbc09e
commit 0657d38
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/common.gradle b/common.gradle
@@ -35,19 +35,3 @@ tasks.withType(JavaExec).configureEach { // Java runtime options:
     //jvmArgs '-Xms512m', '-Xmx512m' // to enlarge the Java heap
     //jvmArgs '-XX:+UseG1GC', '-XX:MaxGCPauseMillis=10'
 }
-
-// Register custom tasks for creating source/javadoc JARs:
-
-tasks.register('javadocJar', Jar) {
-    archiveClassifier = 'javadoc'
-    dependsOn 'javadoc'
-    description 'Creates a JAR of javadoc.'
-    from javadoc.destinationDir
-}
-
-tasks.register('sourcesJar', Jar) {
-    archiveClassifier = 'sources'
-    description 'Creates a JAR of sourcecode.'
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    from sourceSets.main.allJava
-}
diff --git a/moon-ccbysa/build.gradle b/moon-ccbysa/build.gradle
@@ -14,6 +14,11 @@ ext {
     baseName = "${artifact}-${version}" // for artifacts
 }
 
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
 jar { archiveBaseName = project.ext.baseName }
 javadocJar { archiveBaseName = project.ext.baseName }
 sourcesJar { archiveBaseName = project.ext.baseName }

diff --git a/nifty/build.gradle b/nifty/build.gradle
@@ -24,6 +24,11 @@ dependencies {
     api acorusCoordinates
 }
 
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
 javadoc {
     // Disable doclint for JDK15+ to avoid "no comment" warnings.
     if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_15)) {
@@ -87,8 +92,6 @@ tasks.register('pomAsc', Copy) {
 publishing {
     publications {
         maven(MavenPublication) {
-            artifact javadocJar
-            artifact sourcesJar
             artifactId artifact
             from components.java
             groupId rootProject.ext.group

diff --git a/x/build.gradle b/x/build.gradle
@@ -20,6 +20,11 @@ dependencies {
     api heartCoordinates
 }
 
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
 // Register publishing tasks:
 
 tasks.register('install') {
@@ -76,8 +81,6 @@ tasks.register('pomAsc', Copy) {
 publishing {
     publications {
         maven(MavenPublication) {
-            artifact javadocJar
-            artifact sourcesJar
             artifactId artifact
             from components.java
             groupId rootProject.ext.group