From 0fc835a4c72273f3e2f10040944d5caa3211db4f Mon Sep 17 00:00:00 2001
From: Rocka <i@rocka.me>
Date: Wed, 18 Dec 2024 22:18:58 +0800
Subject: [PATCH] fixup

---
 .github/workflows/publish.yml                     |  2 +-
 .github/workflows/pull_request.yml                |  2 +-
 README.md                                         | 15 ++++++++++++++-
 app/org.fcitx.fcitx5.android.yml                  |  2 +-
 .../src/main/kotlin/FcitxComponentPlugin.kt       |  2 ++
 .../convention/src/main/kotlin/Versions.kt        |  2 +-
 flake.nix                                         |  2 +-
 lib/fcitx5/src/main/cpp/fcitx5                    |  2 +-
 8 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 87079b74..b09fc9df 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Setup Android environment
         uses: android-actions/setup-android@v3
         with:
-          packages: cmake;3.30.5
+          packages: cmake;3.31.1
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index b1517b46..df01065b 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -37,7 +37,7 @@ jobs:
 
       - name: Install Android NDK
         run: |
-          sdkmanager --install "cmake;3.30.5"
+          sdkmanager --install "cmake;3.31.1"
 
       - name: Install system dependencies (Ubuntu)
         if: ${{ startsWith(matrix.os, 'ubuntu') }}
diff --git a/README.md b/README.md
index 06343676..4d064822 100644
--- a/README.md
+++ b/README.md
@@ -70,12 +70,25 @@ Discuss on Telegram: [@fcitx5_android_group](https://t.me/fcitx5_android_group)
 ### Dependencies
 
 - Android SDK Platform & Build-Tools 35.
-- Android NDK (Side by side) 25 & CMake 3.30.5, they can be installed using SDK Manager in Android Studio or `sdkmanager` command line.
+- Android NDK (Side by side) 25 & CMake 3.31.1, they can be installed using SDK Manager in Android Studio or `sdkmanager` command line.
 - [KDE/extra-cmake-modules](https://github.com/KDE/extra-cmake-modules)
 - GNU Gettext >= 0.20 (for `msgfmt` binary; or install `appstream` if you really have to use gettext <= 0.19.)
 
 ### How to set up development environment
 
+<details>
+<summary>Prerequisites for Windows</summary>
+
+- Enable [Developer Mode](https://learn.microsoft.com/en-us/windows/apps/get-started/enable-your-device-for-development) so that symlinks can be created without administrator privilege.
+
+- Enable symlink support for `git`:
+
+    ```shell
+    git config --global core.symlinks true
+    ```
+
+</details>
+
 First, clone this repository and fetch all submodules:
 
 ```shell
diff --git a/app/org.fcitx.fcitx5.android.yml b/app/org.fcitx.fcitx5.android.yml
index 766d5142..02a63ac4 100644
--- a/app/org.fcitx.fcitx5.android.yml
+++ b/app/org.fcitx.fcitx5.android.yml
@@ -32,7 +32,7 @@ Builds:
     rm:
       - lib/fcitx5/src/main/cpp/prebuilt
     prebuild:
-      - sdkmanager 'cmake;3.30.5'
+      - sdkmanager 'cmake;3.22.1' 'cmake;3.31.1'
       - sed -i -e '/ImportQualifiedPost/d' $$fcitx5-android-prebuilder$$/src/Main.hs
       - sed -i -e 's/import \(.*\) qualified as/import qualified \1 as/g' $$fcitx5-android-prebuilder$$/src/*.hs
       - sed -i -e 's|https://maven.pkg.github.com|https://jitpack.io|g' ../build-logic/convention/build.gradle.kts
diff --git a/build-logic/convention/src/main/kotlin/FcitxComponentPlugin.kt b/build-logic/convention/src/main/kotlin/FcitxComponentPlugin.kt
index 4ca23e09..caf340b4 100644
--- a/build-logic/convention/src/main/kotlin/FcitxComponentPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/FcitxComponentPlugin.kt
@@ -114,6 +114,8 @@ class FcitxComponentPlugin : Plugin<Project> {
                     commandLine(cmake, "--install", ".", "--component", "modules")
                 }
             }
+            // otherwise module libraries won't be included in apk
+            runAfterNativeBuild(project)
         }
         project.tasks.getByName(INSTALL_TASK).dependsOn(task)
     }
diff --git a/build-logic/convention/src/main/kotlin/Versions.kt b/build-logic/convention/src/main/kotlin/Versions.kt
index fc00484e..23af341f 100644
--- a/build-logic/convention/src/main/kotlin/Versions.kt
+++ b/build-logic/convention/src/main/kotlin/Versions.kt
@@ -12,7 +12,7 @@ object Versions {
     const val minSdk = 23
     const val targetSdk = 35
 
-    const val defaultCMake = "3.30.5"
+    const val defaultCMake = "3.31.1"
     const val defaultNDK = "25.2.9519653"
     const val defaultBuildTools = "35.0.0"
 
diff --git a/flake.nix b/flake.nix
index 8524f5f5..2cd020e3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,7 +30,7 @@
 
               # Update versions here
               # This should match to build-logic/convention/src/main/kotlin/Versions.kt
-              cmakeVersion = "3.30.5";
+              cmakeVersion = "3.31.1";
               buildToolsVersion = "35.0.0";
               platformToolsVersion = "35.0.2";
               platformVersion = "35";
diff --git a/lib/fcitx5/src/main/cpp/fcitx5 b/lib/fcitx5/src/main/cpp/fcitx5
index 22593601..10f481a4 160000
--- a/lib/fcitx5/src/main/cpp/fcitx5
+++ b/lib/fcitx5/src/main/cpp/fcitx5
@@ -1 +1 @@
-Subproject commit 22593601ad9877b84cbb1cc68f85879d75bc0f78
+Subproject commit 10f481a41c2a52e8199d4a31a8460e907c734068