diff --git a/flatlaf-core/build.gradle.kts b/flatlaf-core/build.gradle.kts
index c67e9066..e57ee369 100644
--- a/flatlaf-core/build.gradle.kts
+++ b/flatlaf-core/build.gradle.kts
@@ -38,14 +38,12 @@ if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
 	}
 }
 
-tasks {
-	assemble {
-		dependsOn(
-			"sourcesJar",
-			"javadocJar"
-		)
-	}
+java {
+	withSourcesJar()
+	withJavadocJar()
+}
 
+tasks {
 	if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
 		named<JavaCompile>( "compileModuleInfoJava" ) {
 			sourceCompatibility = "9"
@@ -82,18 +80,12 @@ tasks {
 		isFailOnError = false
 	}
 
-	register( "sourcesJar", Jar::class ) {
+	named<Jar>("sourcesJar" ) {
 		archiveBaseName.set( "flatlaf" )
-		archiveClassifier.set( "sources" )
-
-		from( sourceSets.main.get().allJava )
 	}
 
-	register( "javadocJar", Jar::class ) {
+	named<Jar>("javadocJar" ) {
 		archiveBaseName.set( "flatlaf" )
-		archiveClassifier.set( "javadoc" )
-
-		from( javadoc )
 	}
 }
 
@@ -105,9 +97,6 @@ publishing {
 
 			from( components["java"] )
 
-			artifact( tasks["sourcesJar"] )
-			artifact( tasks["javadocJar"] )
-
 			pom {
 				name.set( "FlatLaf" )
 				description.set( "Flat Look and Feel" )
diff --git a/flatlaf-extras/build.gradle.kts b/flatlaf-extras/build.gradle.kts
index 9ca14612..e5c8370b 100644
--- a/flatlaf-extras/build.gradle.kts
+++ b/flatlaf-extras/build.gradle.kts
@@ -26,14 +26,12 @@ dependencies {
 	implementation( "com.formdev:svgSalamander:1.1.2.1" )
 }
 
-tasks {
-	assemble {
-		dependsOn(
-			"sourcesJar",
-			"javadocJar"
-		)
-	}
+java {
+	withSourcesJar()
+	withJavadocJar()
+}
 
+tasks {
 	javadoc {
 		options {
 			this as StandardJavadocDocletOptions
@@ -41,18 +39,6 @@ tasks {
 		}
 		isFailOnError = false
 	}
-
-	register( "sourcesJar", Jar::class ) {
-		archiveClassifier.set( "sources" )
-
-		from( sourceSets.main.get().allJava )
-	}
-
-	register( "javadocJar", Jar::class ) {
-		archiveClassifier.set( "javadoc" )
-
-		from( javadoc )
-	}
 }
 
 publishing {
@@ -63,9 +49,6 @@ publishing {
 
 			from( components["java"] )
 
-			artifact( tasks["sourcesJar"] )
-			artifact( tasks["javadocJar"] )
-
 			pom {
 				name.set( "FlatLaf Extras" )
 				description.set( "Flat Look and Feel Extras" )
diff --git a/flatlaf-intellij-themes/build.gradle.kts b/flatlaf-intellij-themes/build.gradle.kts
index bc8e3839..54f0a364 100644
--- a/flatlaf-intellij-themes/build.gradle.kts
+++ b/flatlaf-intellij-themes/build.gradle.kts
@@ -37,14 +37,12 @@ if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
 	}
 }
 
-tasks {
-	assemble {
-		dependsOn(
-			"sourcesJar",
-			"javadocJar"
-		)
-	}
+java {
+	withSourcesJar()
+	withJavadocJar()
+}
 
+tasks {
 	if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
 		named<JavaCompile>( "compileModuleInfoJava" ) {
 			sourceCompatibility = "9"
@@ -72,18 +70,6 @@ tasks {
 		}
 		isFailOnError = false
 	}
-
-	register( "sourcesJar", Jar::class ) {
-		archiveClassifier.set( "sources" )
-
-		from( sourceSets.main.get().allJava )
-	}
-
-	register( "javadocJar", Jar::class ) {
-		archiveClassifier.set( "javadoc" )
-
-		from( javadoc )
-	}
 }
 
 publishing {
@@ -94,9 +80,6 @@ publishing {
 
 			from( components["java"] )
 
-			artifact( tasks["sourcesJar"] )
-			artifact( tasks["javadocJar"] )
-
 			pom {
 				name.set( "FlatLaf IntelliJ Themes Pack" )
 				description.set( "Flat Look and Feel IntelliJ Themes Pack" )
diff --git a/flatlaf-jide-oss/build.gradle.kts b/flatlaf-jide-oss/build.gradle.kts
index 158129e8..680cf6b2 100644
--- a/flatlaf-jide-oss/build.gradle.kts
+++ b/flatlaf-jide-oss/build.gradle.kts
@@ -26,14 +26,12 @@ dependencies {
 	implementation( "com.jidesoft:jide-oss:3.6.18" )
 }
 
-tasks {
-	assemble {
-		dependsOn(
-			"sourcesJar",
-			"javadocJar"
-		)
-	}
+java {
+	withSourcesJar()
+	withJavadocJar()
+}
 
+tasks {
 	javadoc {
 		options {
 			this as StandardJavadocDocletOptions
@@ -41,18 +39,6 @@ tasks {
 		}
 		isFailOnError = false
 	}
-
-	register( "sourcesJar", Jar::class ) {
-		archiveClassifier.set( "sources" )
-
-		from( sourceSets.main.get().allJava )
-	}
-
-	register( "javadocJar", Jar::class ) {
-		archiveClassifier.set( "javadoc" )
-
-		from( javadoc )
-	}
 }
 
 publishing {
@@ -63,9 +49,6 @@ publishing {
 
 			from( components["java"] )
 
-			artifact( tasks["sourcesJar"] )
-			artifact( tasks["javadocJar"] )
-
 			pom {
 				name.set( "FlatLaf addon for JIDE Common Layer" )
 				description.set( "Flat Look and Feel addon for JIDE Common Layer" )
diff --git a/flatlaf-swingx/build.gradle.kts b/flatlaf-swingx/build.gradle.kts
index 22b2e542..27aa351d 100644
--- a/flatlaf-swingx/build.gradle.kts
+++ b/flatlaf-swingx/build.gradle.kts
@@ -26,14 +26,12 @@ dependencies {
 	implementation( "org.swinglabs.swingx:swingx-all:1.6.5-1" )
 }
 
-tasks {
-	assemble {
-		dependsOn(
-			"sourcesJar",
-			"javadocJar"
-		)
-	}
+java {
+	withSourcesJar()
+	withJavadocJar()
+}
 
+tasks {
 	javadoc {
 		options {
 			this as StandardJavadocDocletOptions
@@ -41,18 +39,6 @@ tasks {
 		}
 		isFailOnError = false
 	}
-
-	register( "sourcesJar", Jar::class ) {
-		archiveClassifier.set( "sources" )
-
-		from( sourceSets.main.get().allJava )
-	}
-
-	register( "javadocJar", Jar::class ) {
-		archiveClassifier.set( "javadoc" )
-
-		from( javadoc )
-	}
 }
 
 publishing {
@@ -63,9 +49,6 @@ publishing {
 
 			from( components["java"] )
 
-			artifact( tasks["sourcesJar"] )
-			artifact( tasks["javadocJar"] )
-
 			pom {
 				name.set( "FlatLaf addon for SwingX" )
 				description.set( "Flat Look and Feel addon for SwingX" )