From 062f10b68aa8f8284aa4840fb3cdbe5379895e50 Mon Sep 17 00:00:00 2001
From: zaaarf <me@zaaarf.foo>
Date: Wed, 18 Sep 2024 14:11:02 +0200
Subject: [PATCH] ci(java): produce artifact with no classifier without native

---
 dist/java/build.gradle | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/dist/java/build.gradle b/dist/java/build.gradle
index 8644483..75e71fd 100644
--- a/dist/java/build.gradle
+++ b/dist/java/build.gradle
@@ -31,11 +31,9 @@ dependencies {
 	annotationProcessor 'org.projectlombok:lombok:1.18.34'
 }
 
-shadowJar {
-	jar.archiveClassifier = archiveClassifier = osdetector.classifier
-	dependencies {
-		include(dependency('com.github.adamheinrich:native-utils:master-SNAPSHOT'))
-	}
+tasks.register('cargoBuild', Exec) {
+	workingDir '.'
+	commandLine 'cargo', 'build', '--release', '--features=java'
 }
 
 def rustDir = projectDir.toPath()
@@ -44,8 +42,8 @@ def rustDir = projectDir.toPath()
 	.resolve('target')
 	.resolve('release')
 	.toFile()
-
-processResources {
+shadowJar {
+	dependsOn cargoBuild
 	outputs.upToDateWhen { false } // no caching
 	from(rustDir) {
 		include('*.dll')
@@ -53,17 +51,15 @@ processResources {
 		include('*dylib')
 		into('natives/')
 	}
+
+	archiveClassifier = osdetector.classifier
+	dependencies {
+		include(dependency('com.github.adamheinrich:native-utils:master-SNAPSHOT'))
+	}
 }
 
-tasks.register('cargoBuild', Exec) {
-	workingDir '.'
-	commandLine 'cargo', 'build', '--release', '--features=java'
-}
-
-processResources.dependsOn cargoBuild
 build.finalizedBy shadowJar
 
-
 mavenPublishing {
 	//publishToMavenCentral(SonatypeHost.S01) // for snapshots
 	publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) // central repository