From 13dbc78869ba06240b69f27a0f9ffe18cf760da1 Mon Sep 17 00:00:00 2001 From: Bambooin Date: Sat, 4 Jul 2026 13:46:19 +0800 Subject: [PATCH] feat: upgrade opencc to 1.4.0 --- app/src/main/jni/OpenCC | 2 +- app/src/main/jni/cmake/Boost.cmake | 4 +++- app/src/main/jni/librime | 2 +- .../src/main/kotlin/OpenCCDataPlugin.kt | 20 +++++++++++-------- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/app/src/main/jni/OpenCC b/app/src/main/jni/OpenCC index 907bfcbbd3..e9f3bb3fa1 160000 --- a/app/src/main/jni/OpenCC +++ b/app/src/main/jni/OpenCC @@ -1 +1 @@ -Subproject commit 907bfcbbd3aae86ff04bc8eaca67c8af03108ddf +Subproject commit e9f3bb3fa1d058fe2fd4f096503222854bdc31ab diff --git a/app/src/main/jni/cmake/Boost.cmake b/app/src/main/jni/cmake/Boost.cmake index 9e08aa233b..c3a647ca8a 100644 --- a/app/src/main/jni/cmake/Boost.cmake +++ b/app/src/main/jni/cmake/Boost.cmake @@ -30,11 +30,13 @@ set(BOOST_INCLUDE_LIBRARIES crc dll interprocess + preprocessor range regex scope_exit signals2 utility - uuid) + uuid + vmd) add_subdirectory(boost EXCLUDE_FROM_ALL) diff --git a/app/src/main/jni/librime b/app/src/main/jni/librime index 33e7814025..d4c324ca98 160000 --- a/app/src/main/jni/librime +++ b/app/src/main/jni/librime @@ -1 +1 @@ -Subproject commit 33e78140250125871856cdc5b42ddc6a5fcd3cd4 +Subproject commit d4c324ca988ed67f45e41524c2ab01d40cb55695 diff --git a/build-logic/convention/src/main/kotlin/OpenCCDataPlugin.kt b/build-logic/convention/src/main/kotlin/OpenCCDataPlugin.kt index 177500aca7..f669055a77 100644 --- a/build-logic/convention/src/main/kotlin/OpenCCDataPlugin.kt +++ b/build-logic/convention/src/main/kotlin/OpenCCDataPlugin.kt @@ -66,22 +66,26 @@ class OpenCCDataPlugin : Plugin { companion object { private val DICTS_RAW = arrayOf( + "CJK_Compatibility_Ideographs", + "HKPhrasesRev", + "HKPhrases", + "HKVariantsPhrases", + "HKVariantsRevPhrases", + "HKVariants", + "JPShinjitaiCharacters", + "JPShinjitaiPhrases", "STCharacters", "STPhrases", "TSCharacters", "TSPhrases", - "TWPhrases", "TWPhrasesRev", - "TWVariants", + "TWPhrases", + "TWVariantsPhrases", "TWVariantsRevPhrases", - "HKVariants", - "HKVariantsRevPhrases", - "JPVariants", - "JPShinjitaiCharacters", - "JPShinjitaiPhrases", + "TWVariants", ) - private val DICTS_GENERATED = arrayOf("TWVariantsRev", "HKVariantsRev", "JPVariantsRev") + private val DICTS_GENERATED = arrayOf("TWVariantsRev", "HKVariantsRev") } @TaskAction