Merge pull request #153 from chewing/update-dependency

chore: update dependencies
chewing · May 19, 2024 · 68b9eff · 68b9eff
2 parents de36ff1 + 161898f
commit 68b9eff
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,34 @@
+name: CI
+
+on:
+  push:
+    branches: ["master"]
+  pull_request:
+    branches: ["master"]
+  merge_group:
+    types: [checks_requested]
+
+env:
+  RUST_VERSION: "1.70"
+
+jobs:
+  build:
+    runs-on: windows-latest
+    name: Smoke test - build only
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
+
+      - name: Setup rustup
+        run: |
+          rustup default ${{ env.RUST_VERSION }}
+          rustup update
+
+      - name: Build
+        run: |
+          cmake -B build
+          cmake --build build
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,8 @@
 [submodule "libchewing"]
 	path = libchewing
 	url = https://github.com/chewing/libchewing.git
+	branch = 0.8.x
 [submodule "libIME"]
 	path = libIME
 	url = https://github.com/EasyIME/libIME.git
+	branch = master
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 3.24.0)
 
 # override default c/c++ flags, add /MT to link VC++ runtime statically.
 set(CMAKE_USER_MAKE_RULES_OVERRIDE	${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake)

diff --git a/ChewingPreferences/CMakeLists.txt b/ChewingPreferences/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 2.8.8)
-
 project(ChewingPreferences)
 
 # http://www.utf8everywhere.org/

diff --git a/ChewingTextService/CMakeLists.txt b/ChewingTextService/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 2.8.8)
-
 project(ChewingTextService)
 
 if(NOT DEFINED PROJECT_LIBCHEWING)

diff --git a/chewingwrapper/CMakeLists.txt b/chewingwrapper/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.8)
 project(chewingwrapper)
 
 if(NOT DEFINED PROJECT_LIBCHEWING OR NOT DEFINED CHEWING_DATA_PREFIX)

diff --git a/chewingwrapper/test/test-chewingwrapper.cpp b/chewingwrapper/test/test-chewingwrapper.cpp
@@ -8,8 +8,8 @@
 int main()
 {
 	// XXX: Use SetEnvironmentVariableA here will cause crash in Visual Studio.
-	_putenv("CHEWING_PATH="CHEWING_PATH);
-	_putenv("CHEWING_USER_PATH="CHEWING_USER_PATH);
+	_putenv("CHEWING_PATH=" CHEWING_PATH);
+	_putenv("CHEWING_USER_PATH=" CHEWING_USER_PATH);
 
 	const wchar_t EXPECT[] = { 0x6e2c, 0x8a66, 0 /* 測試 */ };
 	const wchar_t EXPECT_BOPOMOFO[] = { 0x3118, 0x311c, 0 /* ㄘㄜ */ };

diff --git a/libIME b/libIME
diff --git a/libchewing b/libchewing
+0 −2		CMakeLists.txt
+0 −97		CandidateListUIElement.cpp
+0 −46		CandidateListUIElement.h
+136 −0		CandidateWindow.cpp
+30 −2		CandidateWindow.h
+33 −9		ComPtr.h
+2 −2		DisplayAttributeInfo.cpp
+3 −1		DisplayAttributeInfo.h
+3 −3		DisplayAttributeInfoEnum.cpp
+3 −1		DisplayAttributeInfoEnum.h
+3 −3		DisplayAttributeProvider.cpp
+3 −3		DisplayAttributeProvider.h
+3 −3		EditSession.cpp
+3 −1		EditSession.h
+202 −10		ImeModule.cpp
+6 −3		ImeModule.h
+22 −23		LangBarButton.cpp
+5 −2		LangBarButton.h
+1 −1		PropertyDialog.cpp
+36 −29		TextService.cpp
+8 −6		TextService.h