diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 9732c96..52bb28e 100755 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -23,6 +23,12 @@ jobs: with: website: jdk.java.net release: 22 + + - name: Setup phc-winner-argon2 + run: | + chmod +x setup.sh + bash setup.sh + - name: Build with Gradle uses: gradle/gradle-build-action@v2 with: diff --git a/build.gradle b/build.gradle index fe5efc3..9233370 100755 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,9 @@ plugins { group 'com.zylquinal.argon2' version '2.1.2-SNAPSHOT' +sourceCompatibility = JavaVersion.VERSION_22 +targetCompatibility = JavaVersion.VERSION_22 + repositories { mavenCentral() } diff --git a/setup.sh b/setup.sh new file mode 100644 index 0000000..497a698 --- /dev/null +++ b/setup.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +wget https://github.com/Zylquinal/phc-winner-argon2/releases/download/latest/archive.zip +unzip archive.zip -d phc-winner-argon2 + +mkdir -p src/main/resources +mkdir -p src/main/resources/darwin-aarch64 +mkdir -p src/main/resources/darwin-x86-64 +mkdir -p src/main/resources/linux-aarch64 +mkdir -p src/main/resources/linux-x86-64 +mkdir -p src/main/resources/windows-aarch64 +mkdir -p src/main/resources/windows-x86-64 + +cp -a phc-winner-argon2/aarch64-apple/libargon2.1.dylib src/main/resources/darwin-aarch64/libargon2.dylib +cp -a phc-winner-argon2/x86_64-apple/libargon2.1.dylib src/main/resources/darwin-x86-64/libargon2.dylib +cp -a phc-winner-argon2/aarch64-linux/libargon2.so.1 src/main/resources/linux-aarch64/libargon2.so +cp -a phc-winner-argon2/x86_64-linux/libargon2.so.1 src/main/resources/linux-x86-64/libargon2.so +cp -a phc-winner-argon2/aarch64-windows/libargon2.dll src/main/resources/windows-aarch64/argon2.dll +cp -a phc-winner-argon2/x86_64-windows/libargon2.dll src/main/resources/windows-x86-64/argon2.dll + diff --git a/src/main/resources/darwin-aarch64/libargon2.dylib b/src/main/resources/darwin-aarch64/libargon2.dylib deleted file mode 100755 index 79e00f7..0000000 Binary files a/src/main/resources/darwin-aarch64/libargon2.dylib and /dev/null differ diff --git a/src/main/resources/darwin-x86-64/libargon2.dylib b/src/main/resources/darwin-x86-64/libargon2.dylib deleted file mode 100755 index 2524c1e..0000000 Binary files a/src/main/resources/darwin-x86-64/libargon2.dylib and /dev/null differ diff --git a/src/main/resources/linux-aarch64/libargon2.so b/src/main/resources/linux-aarch64/libargon2.so deleted file mode 100755 index 27f198e..0000000 Binary files a/src/main/resources/linux-aarch64/libargon2.so and /dev/null differ diff --git a/src/main/resources/linux-x86-64/libargon2.so b/src/main/resources/linux-x86-64/libargon2.so deleted file mode 100755 index bf8cad8..0000000 Binary files a/src/main/resources/linux-x86-64/libargon2.so and /dev/null differ diff --git a/src/main/resources/windows-aarch64/libargon2.dll b/src/main/resources/windows-aarch64/libargon2.dll deleted file mode 100755 index 27f198e..0000000 Binary files a/src/main/resources/windows-aarch64/libargon2.dll and /dev/null differ diff --git a/src/main/resources/windows-x86-64/libargon2.dll b/src/main/resources/windows-x86-64/libargon2.dll deleted file mode 100755 index a520b2b..0000000 Binary files a/src/main/resources/windows-x86-64/libargon2.dll and /dev/null differ