From 6b1227d8085d71255b507019f09f55c0a65b62e3 Mon Sep 17 00:00:00 2001
From: Nikita Prokopov <niki@tonsky.me>
Date: Tue, 9 Jul 2024 17:53:17 +0200
Subject: [PATCH] 0.4.18

---
 .github/workflows/build-deploy.yml | 24 ++++++++++++------------
 .gitignore                         |  2 +-
 CHANGELOG.md                       | 11 +++++++++++
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
index 08c5f03c..7fa82c29 100644
--- a/.github/workflows/build-deploy.yml
+++ b/.github/workflows/build-deploy.yml
@@ -21,9 +21,9 @@ jobs:
     runs-on: ubuntu-latest
     container: tonsky/jwm:latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: bash -c 'source /etc/profile && python3 script/build.py --only native'
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: native
           path: linux/build/libjwm_x64.so
@@ -31,8 +31,8 @@ jobs:
   build_windows:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: abdes/gha-setup-ninja@660f330a40aefa8d11632b3f901e92a4adb33d65
+      - uses: actions/checkout@v4
+      - uses: seanmiddleditch/gha-setup-ninja@master
       - run: |
           echo "JAVA_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
           echo "$JAVA_HOME_11_X64/bin" >> $GITHUB_PATH
@@ -41,22 +41,22 @@ jobs:
         with:
           arch: amd64
       - run: python3 script/build.py --only native
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: native
           path: windows/build/jwm_x64.dll
 
   build_macos:
-    runs-on: macos-11
+    runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: abdes/gha-setup-ninja@660f330a40aefa8d11632b3f901e92a4adb33d65
+      - uses: actions/checkout@v4
+      - uses: seanmiddleditch/gha-setup-ninja@master
       - run: |
           echo "JAVA_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
           echo "$JAVA_HOME_11_X64/bin" >> $GITHUB_PATH
       - run: python3 script/build.py --arch=x64 --only native
       - run: python3 script/build.py --arch=arm64 --only native
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: native
           path: |
@@ -67,17 +67,17 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build_linux, build_windows, build_macos]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: |
           echo "JAVA_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
           echo "$JAVA_HOME_11_X64/bin" >> $GITHUB_PATH
       - run: python3 script/build.py --only java
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: native
           path: target/classes
       - run: python3 script/package.py --only java --ref ${{ github.ref }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: jars
           path: |
diff --git a/.gitignore b/.gitignore
index 4d39354b..2283ec96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@ docs/apidocs
 .idea
 
 # clion build directories
-/*build*
+# /*build*
 /macos/cmake-build-debug
 
 # jvm crash logs
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b81607b..22763fb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# 0.4.18 - Jul 9, 2024
+
+- macOS: Stable screen ids
+- macOS: Do not stop CVDisplayLink, improves frame pacing
+
+# 0.4.17 - Jan 16, 2024
+
+- X11: add KeyLocation, additional keys via @dzaima
+- X11: fix i3 workspace switching #283 via @bulby
+- macOS: Fix fullscreen
+
 # 0.4.16 - Dec 1, 2023
 
 Added: