From 1878f30a13285d453c2e81960c9b63e0273dd351 Mon Sep 17 00:00:00 2001
From: Talo Halton <talohalton@gmail.com>
Date: Wed, 12 Jun 2024 23:04:57 +0100
Subject: [PATCH] Update workflows, bump KJna version

---
 .github/workflows/build-linux-arm64.yml    | 4 ++--
 .github/workflows/build-linux-x86_64.yml   | 4 ++--
 .github/workflows/build-windows-x86_64.yml | 8 ++++----
 gradle.properties                          | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-linux-arm64.yml b/.github/workflows/build-linux-arm64.yml
index 7ed38fa..6d0eed7 100644
--- a/.github/workflows/build-linux-arm64.yml
+++ b/.github/workflows/build-linux-arm64.yml
@@ -84,8 +84,8 @@ jobs:
       working-directory: zeromq-4.3.5
       run: make -j$(nproc) && make install
 
-    - name: Copy libzmq into src/nativeInterop/linuxArm64
-      run: mkdir -p src/nativeInterop/linuxArm64 && cp -r libzmq/* src/nativeInterop/linuxArm64
+    - name: Copy libzmq into library/src/nativeInterop/linuxArm64
+      run: mkdir -p library/src/nativeInterop/linuxArm64 && cp -r libzmq/* library/src/nativeInterop/linuxArm64
 
     - name: Add arm64 architecture to dpkg
       run: dpkg --add-architecture arm64
diff --git a/.github/workflows/build-linux-x86_64.yml b/.github/workflows/build-linux-x86_64.yml
index 748202b..7c09ddb 100644
--- a/.github/workflows/build-linux-x86_64.yml
+++ b/.github/workflows/build-linux-x86_64.yml
@@ -82,8 +82,8 @@ jobs:
       working-directory: zeromq-4.3.5
       run: make -j$(nproc) && make install
 
-    - name: Copy libzmq into src/nativeInterop/linuxX64
-      run: mkdir -p src/nativeInterop/linuxX64 && cp -r libzmq/* src/nativeInterop/linuxX64
+    - name: Copy libzmq into library/src/nativeInterop/linuxX64
+      run: mkdir -p library/src/nativeInterop/linuxX64 && cp -r libzmq/* library/src/nativeInterop/linuxX64
 
     - name: Set up Gradle
       uses: gradle/gradle-build-action@v3
diff --git a/.github/workflows/build-windows-x86_64.yml b/.github/workflows/build-windows-x86_64.yml
index 95dfc0c..502f21c 100644
--- a/.github/workflows/build-windows-x86_64.yml
+++ b/.github/workflows/build-windows-x86_64.yml
@@ -35,7 +35,7 @@ jobs:
         github-binarycache: true
 
     - name: Copy built files
-      run: xcopy /s /i /y "${{ github.workspace }}\vcpkg\installed\x64-windows\*" "${{ github.workspace }}\src\nativeInterop\mingwX64"
+      run: xcopy /s /i /y "${{ github.workspace }}\vcpkg\installed\x64-windows\*" "${{ github.workspace }}\library\src\nativeInterop\mingwX64"
 
     - name: Download mpv
       run: curl -L https://downloads.sourceforge.net/project/mpv-player-windows/libmpv/mpv-dev-x86_64-20240114-git-bd35dc8.7z --output mpv.7z
@@ -43,13 +43,13 @@ jobs:
     - name: Extract mpv
       shell: bash
       run: |
-        "/c/Program Files/7-Zip/7z.exe" x mpv.7z -o"src\nativeInterop\mingwX64"
+        "/c/Program Files/7-Zip/7z.exe" x mpv.7z -o"library\src\nativeInterop\mingwX64"
 
     - name: Move libmpv.dll.a
-      run: move src\nativeInterop\mingwX64\libmpv.dll.a src\nativeInterop\mingwX64\lib\libmpv.dll.a
+      run: move library\src\nativeInterop\mingwX64\libmpv.dll.a library\src\nativeInterop\mingwX64\lib\libmpv.dll.a
 
     - name: Move libmpv-2.dll
-      run: move src\nativeInterop\mingwX64\libmpv-2.dll src\nativeInterop\mingwX64\bin\libmpv-2.dll
+      run: move library\src\nativeInterop\mingwX64\libmpv-2.dll library\src\nativeInterop\mingwX64\bin\libmpv-2.dll
 
     - name: Set up Gradle
       uses: gradle/gradle-build-action@v3
diff --git a/gradle.properties b/gradle.properties
index f9c1273..e16993b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,6 +13,6 @@ clikt.version=4.4.0
 mediasession.version=0.1.1
 ytm.version=0.2.1
 ktor.version=3.0.0-beta-1
-kjna.version=69923b28b5
+kjna.version=06023e1f27
 
 kotlin.native.cacheKind.linuxX64=none