diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index abe55e1d..6cf039fc 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -20,17 +20,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v7 with: submodules: true - name: Setup Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: 17 - java-package: jdk - architecture: x64 - name: Compile shell: bash @@ -41,7 +39,7 @@ jobs: compile - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v7 with: name: target-cache path: | @@ -55,12 +53,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v7 with: submodules: true - name: Download - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v8 with: name: target-cache path: ${{github.workspace}}/target @@ -101,25 +99,25 @@ jobs: cmake --install target/build/jni/ - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v7 with: - name: library-resources + name: library-resources-apple-arm64 path: | ${{github.workspace}}/src/main/resources if-no-files-found: error compile-apple-x86_64: needs: compile-java - runs-on: macos-latest + runs-on: macos-26-intel steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v7 with: submodules: true - name: Download - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v8 with: name: target-cache path: ${{github.workspace}}/target @@ -160,9 +158,9 @@ jobs: cmake --install target/build/jni/ - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v7 with: - name: library-resources + name: library-resources-apple-x86_64 path: | ${{github.workspace}}/src/main/resources if-no-files-found: error @@ -174,12 +172,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v7 with: submodules: true - name: Download - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v8 with: name: target-cache path: ${{github.workspace}}/target @@ -252,9 +250,9 @@ jobs: cmake --install target/build/jni/ - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v7 with: - name: library-resources + name: library-resources-linux-arm path: | ${{github.workspace}}/src/main/resources if-no-files-found: error @@ -265,12 +263,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v7 with: submodules: true - name: Download - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v8 with: name: target-cache path: ${{github.workspace}}/target @@ -343,9 +341,9 @@ jobs: cmake --install target/build/jni/ - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v7 with: - name: library-resources + name: library-resources-linux-arm64 path: | ${{github.workspace}}/src/main/resources if-no-files-found: error @@ -356,12 +354,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v7 with: submodules: true - name: Download - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v8 with: name: target-cache path: ${{github.workspace}}/target @@ -430,9 +428,9 @@ jobs: cmake --install target/build/jni/ - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v7 with: - name: library-resources + name: library-resources-linux-x86 path: | ${{github.workspace}}/src/main/resources if-no-files-found: error @@ -443,12 +441,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v7 with: submodules: true - name: Download - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v8 with: name: target-cache path: ${{github.workspace}}/target @@ -505,43 +503,38 @@ jobs: cmake --install target/build/jni/ - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v7 with: - name: library-resources + name: library-resources-linux-x86_64 path: | ${{github.workspace}}/src/main/resources if-no-files-found: error - compile-windows-arm: + compile-windows-arm64: needs: compile-java runs-on: windows-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v7 with: submodules: true - name: Download - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v8 with: name: target-cache path: ${{github.workspace}}/target - - name: Setup - uses: ilammy/msvc-dev-cmd@v1 - with: - arch: amd64_arm - - name: Compile env: - CFLAGS: '/arch:ARMv7VE /O1 /Oy' + CFLAGS: '/arch:armv8.0 /O1 /Oy' shell: cmd run: | md target\build\libuiohook\ cmake -B target\build\libuiohook\ -S src\external\libuiohook\ ^ - -G "Visual Studio 17 2022" -A ARM ^ + -G "Visual Studio 18 2026" -A ARM64 ^ -D CMAKE_INSTALL_PREFIX=target\ ^ -D CMAKE_VERBOSE_MAKEFILE=ON ^ -D BUILD_SHARED_LIBS=OFF ^ @@ -557,10 +550,10 @@ jobs: md target\build\jni\ cmake -B target\build\jni\ ^ - -G "Visual Studio 17 2022" -A ARM ^ + -G "Visual Studio 18 2026" -A ARM64 ^ -D CMAKE_PREFIX_PATH=target\ ^ -D CMAKE_SYSTEM_NAME=windows ^ - -D CMAKE_SYSTEM_PROCESSOR=arm ^ + -D CMAKE_SYSTEM_PROCESSOR=ARM64 ^ -D CMAKE_VERBOSE_MAKEFILE=ON cmake --build target\build\jni\ ^ @@ -572,9 +565,9 @@ jobs: --config RelWithDebInfo - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v7 with: - name: library-resources + name: library-resources-windows-arm64 path: | ${{github.workspace}}/src/main/resources if-no-files-found: error @@ -585,27 +578,22 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v7 with: submodules: true - name: Download - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v8 with: name: target-cache path: ${{github.workspace}}/target - - name: Setup - uses: ilammy/msvc-dev-cmd@v1 - with: - arch: amd64_x86 - - name: Compile shell: cmd run: | md target\build\libuiohook\ cmake -B target\build\libuiohook\ -S src\external\libuiohook\ ^ - -G "Visual Studio 17 2022" -A Win32 ^ + -G "Visual Studio 18 2026" -A Win32 ^ -D CMAKE_INSTALL_PREFIX=target\ ^ -D CMAKE_VERBOSE_MAKEFILE=ON ^ -D BUILD_SHARED_LIBS=OFF ^ @@ -621,7 +609,7 @@ jobs: md target\build\jni\ cmake -B target\build\jni\ ^ - -G "Visual Studio 17 2022" -A Win32 ^ + -G "Visual Studio 18 2026" -A Win32 ^ -D CMAKE_PREFIX_PATH=target\ ^ -D CMAKE_SYSTEM_NAME=windows ^ -D CMAKE_SYSTEM_PROCESSOR=x86 ^ @@ -636,9 +624,9 @@ jobs: --config RelWithDebInfo - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v7 with: - name: library-resources + name: library-resources-windows-x86 path: | ${{github.workspace}}/src/main/resources if-no-files-found: error @@ -649,27 +637,22 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v7 with: submodules: true - name: Download - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v8 with: name: target-cache path: ${{github.workspace}}/target - - name: Setup - uses: ilammy/msvc-dev-cmd@v1 - with: - arch: amd64 - - name: Compile shell: cmd run: | md target\build\libuiohook\ cmake -B target\build\libuiohook\ -S src\external\libuiohook\ ^ - -G "Visual Studio 17 2022" -A x64 ^ + -G "Visual Studio 18 2026" -A x64 ^ -D CMAKE_INSTALL_PREFIX=target\ ^ -D CMAKE_VERBOSE_MAKEFILE=ON ^ -D BUILD_SHARED_LIBS=OFF ^ @@ -685,7 +668,7 @@ jobs: md target\build\jni\ cmake -B target\build\jni\ ^ - -G "Visual Studio 17 2022" -A x64 ^ + -G "Visual Studio 18 2026" -A x64 ^ -D CMAKE_PREFIX_PATH=target\ ^ -D CMAKE_SYSTEM_NAME=windows ^ -D CMAKE_SYSTEM_PROCESSOR=x86_64 ^ @@ -700,9 +683,9 @@ jobs: --config RelWithDebInfo - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v7 with: - name: library-resources + name: library-resources-windows-x86_64 path: | ${{github.workspace}}/src/main/resources if-no-files-found: error @@ -715,36 +698,35 @@ jobs: compile-linux-arm64, compile-linux-x86, compile-linux-x86_64, - compile-windows-arm, + compile-windows-arm64, compile-windows-x86, compile-windows-x86_64 ] runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v7 with: submodules: true - name: Download Cache - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v8 with: name: target-cache path: ${{github.workspace}}/target - name: Download Libraries - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v8 with: - name: library-resources path: ${{github.workspace}}/src/main/resources + pattern: 'library-resources-*' + merge-multiple: true - name: Setup Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: 17 - java-package: jdk - architecture: x64 server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD @@ -791,7 +773,7 @@ jobs: deploy - name: Upload Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v7 with: name: build-artifacts path: | diff --git a/doc/Compiling.md b/doc/Compiling.md index c7675d21..6140a898 100644 --- a/doc/Compiling.md +++ b/doc/Compiling.md @@ -242,11 +242,11 @@ cmake --build target/build/jni/ \ cmake --install target/build/jni/ ``` -#### Compile Windows ARM +#### Compile Windows ARM64 ``` md target\build\libuiohook\ cmake -B target\build\libuiohook\ -S src\external\libuiohook\ ^ - -G "Visual Studio 17 2022" -A ARM ^ + -G "Visual Studio 18 2026" -A ARM64 ^ -D CMAKE_INSTALL_PREFIX=target\ ^ -D CMAKE_VERBOSE_MAKEFILE=ON ^ -D BUILD_SHARED_LIBS=OFF ^ @@ -264,10 +264,10 @@ cmake --install target\build\libuiohook\ ^ ``` md target\build\jni\ cmake -B target\build\jni\ ^ - -G "Visual Studio 17 2022" -A ARM ^ + -G "Visual Studio 18 2026" -A ARM64 ^ -D CMAKE_PREFIX_PATH=target\ ^ -D CMAKE_SYSTEM_NAME=windows ^ - -D CMAKE_SYSTEM_PROCESSOR=arm ^ + -D CMAKE_SYSTEM_PROCESSOR=ARM64 ^ -D CMAKE_VERBOSE_MAKEFILE=ON cmake --build target\build\jni\ ^ @@ -283,7 +283,7 @@ cmake --install target\build\jni\ ^ ``` md target\build\libuiohook\ cmake -B target\build\libuiohook\ -S src\external\libuiohook\ ^ - -G "Visual Studio 17 2022" -A Win32 ^ + -G "Visual Studio 18 2026" -A Win32 ^ -D CMAKE_INSTALL_PREFIX=target\ ^ -D CMAKE_VERBOSE_MAKEFILE=ON ^ -D BUILD_SHARED_LIBS=OFF ^ @@ -301,7 +301,7 @@ cmake --install target\build\libuiohook\ ^ ``` md target\build\jni\ cmake -B target\build\jni\ ^ - -G "Visual Studio 17 2022" -A Win32 ^ + -G "Visual Studio 18 2026" -A Win32 ^ -D CMAKE_PREFIX_PATH=target\ ^ -D CMAKE_SYSTEM_NAME=windows ^ -D CMAKE_SYSTEM_PROCESSOR=x86 ^ @@ -320,7 +320,7 @@ cmake --install target\build\jni\ ^ ``` md target\build\libuiohook\ cmake -B target\build\libuiohook\ -S src\external\libuiohook\ ^ - -G "Visual Studio 17 2022" -A x64 ^ + -G "Visual Studio 18 2026" -A x64 ^ -D CMAKE_INSTALL_PREFIX=target\ ^ -D CMAKE_VERBOSE_MAKEFILE=ON ^ -D BUILD_SHARED_LIBS=OFF ^ @@ -338,7 +338,7 @@ cmake --install target\build\libuiohook\ ^ ``` md target\build\jni\ cmake -B target\build\jni\ ^ - -G "Visual Studio 17 2022" -A x64 ^ + -G "Visual Studio 18 2026" -A x64 ^ -D CMAKE_PREFIX_PATH=target\ ^ -D CMAKE_SYSTEM_NAME=windows ^ -D CMAKE_SYSTEM_PROCESSOR=x86_64 ^