diff --git a/.github/workflows/build-all-and-publish.yml b/.github/workflows/build-all-and-publish.yml
index 97a4df3..fd3d5e5 100644
--- a/.github/workflows/build-all-and-publish.yml
+++ b/.github/workflows/build-all-and-publish.yml
@@ -147,7 +147,7 @@ jobs:
if-no-files-found: error
windows:
- name: Windows natives (win32/amd64)
+ name: Windows natives (windows/amd64)
runs-on: windows-latest
steps:
- name: Checkout
@@ -188,8 +188,8 @@ jobs:
- name: Upload native library
uses: actions/upload-artifact@v4
with:
- name: natives-win32-amd64
- path: target/classes/net/jpountz/util/win32/amd64/liblz4-java.so
+ name: natives-windows-amd64
+ path: target/classes/net/jpountz/util/windows/amd64/liblz4-java.dll
if-no-files-found: error
assemble:
@@ -244,13 +244,13 @@ jobs:
shopt -s nullglob
for dir in assemble/natives/*; do
base="$(basename "$dir")"
- # Expect names like natives-linux-amd64, natives-darwin-aarch64, natives-win32-amd64
+ # Expect names like natives-linux-amd64, natives-darwin-aarch64, natives-windows-amd64
os="${base#natives-}"
arch="${os#*-}"; os="${os%%-*}"
case "$os" in
linux) ext=so ;;
darwin) ext=dylib ;;
- win32) ext=so ;;
+ windows) ext=dll ;;
*) echo "Unknown OS in artifact: $base" >&2; continue ;;
esac
dest="target/classes/net/jpountz/util/$os/$arch"
diff --git a/pom.xml b/pom.xml
index 52b1973..bc9b32a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -539,9 +539,8 @@
process-resources
-
-
-
+
+
diff --git a/src/java/net/jpountz/util/Native.java b/src/java/net/jpountz/util/Native.java
index b54c79d..5be8c0c 100644
--- a/src/java/net/jpountz/util/Native.java
+++ b/src/java/net/jpountz/util/Native.java
@@ -27,8 +27,7 @@ public enum Native {
;
private enum OS {
- // Even on Windows, the default compiler from cpptasks (gcc) uses .so as a shared lib extension
- WINDOWS("win32", "so"), LINUX("linux", "so"), MAC("darwin", "dylib"), SOLARIS("solaris", "so");
+ WINDOWS("windows", "dll"), LINUX("linux", "so"), MAC("darwin", "dylib"), SOLARIS("solaris", "so");
public final String name, libExtension;
private OS(String name, String libExtension) {