fix duplicate lib files gradle issue and rename build task

bitwarden · Nov 27, 2023 · 65e25d4 · 65e25d4
1 parent c57ef08
commit 65e25d4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/build-java.yml b/.github/workflows/build-java.yml
@@ -12,8 +12,8 @@ jobs:
   build_rust:
     uses: ./.github/workflows/build-rust-cross-platform.yml
 
-  build_dotnet:
-    name: Build .NET
+  build_java:
+    name: Build Java
     runs-on: ubuntu-22.04
     needs:
       - generate_schemas

diff --git a/languages/java/build.gradle b/languages/java/build.gradle
@@ -86,10 +86,16 @@ jar {
 //  Requires GitHub workflow to copy native library to resources
 //  Uncomment the line below and copyNativeLib task above to use the local build (modify architecture if needed)
 //    dependsOn tasks.named("copyNativeLib")
-    from('src/main/resources') {
-        include 'darwin-aarch64/**'
-        include 'darwin-x64/**'
-        include 'ubuntu-x64/**'
-        include 'windows-x64/**'
+    into('darwin-aarch64') {
+        from 'src/main/resources/darwin-aarch64'
+    }
+    into('darwin-x64') {
+        from 'src/main/resources/darwin-x64'
+    }
+    into('ubuntu-x64') {
+        from 'src/main/resources/ubuntu-x64'
+    }
+    into('windows-x64') {
+        from 'src/main/resources/windows-x64'
     }
 }