From 55b8e38e10560bd4eaecbcd96b906ca55c047dcf Mon Sep 17 00:00:00 2001 From: zaaarf Date: Wed, 18 Sep 2024 14:08:58 +0200 Subject: [PATCH] ci(java): produce artifact with no classifier without native --- dist/java/build.gradle | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dist/java/build.gradle b/dist/java/build.gradle index 8644483..4f02042 100644 --- a/dist/java/build.gradle +++ b/dist/java/build.gradle @@ -31,21 +31,13 @@ dependencies { annotationProcessor 'org.projectlombok:lombok:1.18.34' } -shadowJar { - jar.archiveClassifier = archiveClassifier = osdetector.classifier - dependencies { - include(dependency('com.github.adamheinrich:native-utils:master-SNAPSHOT')) - } -} - def rustDir = projectDir.toPath() .parent .parent .resolve('target') .resolve('release') .toFile() - -processResources { +shadowJar { outputs.upToDateWhen { false } // no caching from(rustDir) { include('*.dll') @@ -53,6 +45,11 @@ processResources { include('*dylib') into('natives/') } + + archiveClassifier = osdetector.classifier + dependencies { + include(dependency('com.github.adamheinrich:native-utils:master-SNAPSHOT')) + } } tasks.register('cargoBuild', Exec) {