From ffdeb0d97af38426ad3487d80057dd3b237bae64 Mon Sep 17 00:00:00 2001
From: Qijia Liu <liumeo@pku.edu.cn>
Date: Tue, 16 Sep 2025 22:06:22 -0400
Subject: [PATCH 1/2] use macos-26

---
 .github/workflows/ci.yml      | 8 ++++----
 .github/workflows/compare.yml | 2 +-
 .vscode/tasks.json            | 2 +-
 CMakeLists.txt                | 2 +-
 engines/fcitx5-chinese-addons | 2 +-
 engines/fcitx5-rime           | 2 +-
 engines/libime                | 2 +-
 fcitx5                        | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f83a17b..4f2e3c6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   lint:
-    runs-on: macos-15
+    runs-on: macos-26
     steps:
       - uses: actions/checkout@v5
 
@@ -42,7 +42,7 @@ jobs:
 
   build:
     needs: [lint, data]
-    runs-on: macos-15
+    runs-on: macos-26
     env:
       MOZC_SHA: ce1fb7fe48efb1d85f8e54eff1b05e9e692bf0d4
     strategy:
@@ -101,13 +101,13 @@ jobs:
       - name: Install
         if: ${{ matrix.platform == 'SIMULATORARM64' }}
         run: |
-          xcrun simctl boot "iPhone 16"
+          xcrun simctl boot "iPhone 17"
           xcrun simctl install booted build/${{ matrix.platform }}/src/Release-iphonesimulator/Fcitx5.app
           xcrun simctl launch booted org.fcitx.Fcitx5
 
       - name: Download artifact
         if: ${{ matrix.platform == 'OS64' }}
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           merge-multiple: true
 
diff --git a/.github/workflows/compare.yml b/.github/workflows/compare.yml
index 062cf44..f703749 100644
--- a/.github/workflows/compare.yml
+++ b/.github/workflows/compare.yml
@@ -17,7 +17,7 @@ jobs:
         run: wget -O release.ipa https://github.com/fcitx-contrib/fcitx5-ios/releases/download/latest/Fcitx5.ipa
 
       - name: Download artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           merge-multiple: true
 
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 56d3c46..c43b2ac 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -4,7 +4,7 @@
         {
             "type": "shell",
             "label": "Open simulator",
-            "command": "xcrun simctl boot 'iPhone 16' && open /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app",
+            "command": "xcrun simctl boot 'iPhone 17' && open /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app",
             "group": {
                 "kind": "build"
             }
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13da1b2..10a2807 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.27)
+cmake_minimum_required(VERSION 4.1)
 
 # Avoid MinSizeRel and RelWithDebInfo.
 set(CMAKE_CONFIGURATION_TYPES Debug Release CACHE STRING INTERNAL FORCE)
diff --git a/engines/fcitx5-chinese-addons b/engines/fcitx5-chinese-addons
index 4d10a4a..13f4eac 160000
--- a/engines/fcitx5-chinese-addons
+++ b/engines/fcitx5-chinese-addons
@@ -1 +1 @@
-Subproject commit 4d10a4a84f87c0a96969583115c91928f54802d1
+Subproject commit 13f4eacacae8d204463c34880e0cba9d81c521e1
diff --git a/engines/fcitx5-rime b/engines/fcitx5-rime
index d76a3c3..7fedbbf 160000
--- a/engines/fcitx5-rime
+++ b/engines/fcitx5-rime
@@ -1 +1 @@
-Subproject commit d76a3c345332f1aa32cf6f4fd0c8189bf222531f
+Subproject commit 7fedbbff72f49bc2ea2ef5f2e1d8ccafd9a5e4a6
diff --git a/engines/libime b/engines/libime
index a6609b1..39ced92 160000
--- a/engines/libime
+++ b/engines/libime
@@ -1 +1 @@
-Subproject commit a6609b1206bb036dffe8c2d8829f1448e54a97ad
+Subproject commit 39ced92b4450f49b03e38bdd6a58d1f1b9430824
diff --git a/fcitx5 b/fcitx5
index 5b12bf2..bd075df 160000
--- a/fcitx5
+++ b/fcitx5
@@ -1 +1 @@
-Subproject commit 5b12bf216dda31c0f11eb85af54a43fce9d5a2ab
+Subproject commit bd075df56f67ec1fcff757d0034db9b9d72fc721

From 90f6cc505dccf7b6eff540d3a6c82fe7e592d8ac Mon Sep 17 00:00:00 2001
From: Qijia Liu <liumeo@pku.edu.cn>
Date: Tue, 16 Sep 2025 22:26:34 -0400
Subject: [PATCH 2/2] don't override xcode

---
 .github/workflows/ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4f2e3c6..dc60f07 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,10 +65,6 @@ jobs:
           path: engines/fcitx5-mozc/mozc
           ref: ${{ env.MOZC_SHA }}
 
-      - uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: 16.4
-
       - name: Install dependencies
         run: |
           brew install librsvg