diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc60f07..8916313 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: lint: runs-on: macos-26 steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Install dependencies run: brew install clang-format swift-format @@ -34,7 +34,7 @@ jobs: custom_phrase.txt - name: Upload artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: artifact.zip path: | @@ -54,11 +54,11 @@ jobs: - { platform: OS64 } steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: submodules: recursive - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: submodules: recursive repository: google/mozc @@ -103,7 +103,7 @@ jobs: - name: Download artifact if: ${{ matrix.platform == 'OS64' }} - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: merge-multiple: true @@ -122,7 +122,7 @@ jobs: - name: Upload artifact if: ${{ github.ref != 'refs/heads/master' && matrix.platform == 'OS64' }} - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: Fcitx5.ipa path: | diff --git a/.github/workflows/compare.yml b/.github/workflows/compare.yml index f703749..eca3e67 100644 --- a/.github/workflows/compare.yml +++ b/.github/workflows/compare.yml @@ -9,7 +9,6 @@ jobs: steps: - name: Install bsdtar run: | - sudo rm /var/lib/man-db/auto-update sudo apt update && sudo apt install -y libarchive-tools sudo ln -sf /usr/bin/bsdtar /usr/bin/tar @@ -17,7 +16,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@v5 + uses: actions/download-artifact@v6 with: merge-multiple: true diff --git a/CREDITS.md b/CREDITS.md index 65dea8c..9d29f8c 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -31,7 +31,6 @@ * [fmt](https://github.com/fmtlib/fmt): MIT * [glog](https://github.com/google/glog): BSD-3-Clause * [json](https://github.com/nlohmann/json): MIT -* [json-c](https://github.com/json-c/json-c): MIT * [leveldb](https://github.com/google/leveldb): BSD-3-Clause * [libintl](https://github.com/j-jorge/libintl-lite): BSL-1.0 * [libuv](https://github.com/libuv/libuv): MIT diff --git a/engines/fcitx5-chinese-addons b/engines/fcitx5-chinese-addons index 13f4eac..f0314ad 160000 --- a/engines/fcitx5-chinese-addons +++ b/engines/fcitx5-chinese-addons @@ -1 +1 @@ -Subproject commit 13f4eacacae8d204463c34880e0cba9d81c521e1 +Subproject commit f0314adc7da3f942639363351b52e129d3840c13 diff --git a/engines/fcitx5-mozc b/engines/fcitx5-mozc index 3715411..79cd029 160000 --- a/engines/fcitx5-mozc +++ b/engines/fcitx5-mozc @@ -1 +1 @@ -Subproject commit 3715411eec5327fb12add6988f7bd83954e11f0d +Subproject commit 79cd0294f89b812f7afc5956349caa951e67ae47 diff --git a/engines/fcitx5-rime b/engines/fcitx5-rime index 7fedbbf..52b2118 160000 --- a/engines/fcitx5-rime +++ b/engines/fcitx5-rime @@ -1 +1 @@ -Subproject commit 7fedbbff72f49bc2ea2ef5f2e1d8ccafd9a5e4a6 +Subproject commit 52b21180baf59f3f890229d9a6d4e1d81be37ecb diff --git a/engines/libime b/engines/libime index 39ced92..1bae691 160000 --- a/engines/libime +++ b/engines/libime @@ -1 +1 @@ -Subproject commit 39ced92b4450f49b03e38bdd6a58d1f1b9430824 +Subproject commit 1bae691968e002ea937b6fa8ec04dfc3360d3de1 diff --git a/fcitx5 b/fcitx5 index bd075df..70fe117 160000 --- a/fcitx5 +++ b/fcitx5 @@ -1 +1 @@ -Subproject commit bd075df56f67ec1fcff757d0034db9b9d72fc721 +Subproject commit 70fe117d4458d2598331161e59fd4585b2df4558 diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh index e31146a..28d0da3 100755 --- a/scripts/install-deps.sh +++ b/scripts/install-deps.sh @@ -5,7 +5,6 @@ deps=( fmt glog json - json-c leveldb libintl libmozc