Skip to content

Commit ecc195c

Browse files
authored
use C++20; drop macOS 13.2 support (#227)
1 parent 212113a commit ecc195c

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.27)
22

3-
project(fcitx5-macos VERSION 0.1.0 LANGUAGES CXX Swift)
3+
project(fcitx5-macos VERSION 0.2.0 LANGUAGES CXX Swift)
44

55
list(PREPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
66
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -12,7 +12,7 @@ if(NOT CMAKE_OSX_ARCHITECTURES)
1212
set(CMAKE_OSX_ARCHITECTURES "${CMAKE_HOST_SYSTEM_PROCESSOR}")
1313
endif()
1414

15-
set(CMAKE_OSX_DEPLOYMENT_TARGET 13)
15+
set(CMAKE_OSX_DEPLOYMENT_TARGET 13.3)
1616
set(F5M_TARGET "${CMAKE_OSX_ARCHITECTURES}-apple-macos${CMAKE_OSX_DEPLOYMENT_TARGET}")
1717
add_definitions(-target "${F5M_TARGET}")
1818

@@ -21,7 +21,7 @@ set(SWIFT_LIBRARY_SEARCH_PATHS "")
2121
include(InitializeSwift)
2222
include(AddSwift)
2323

24-
set(CMAKE_CXX_STANDARD 17)
24+
set(CMAKE_CXX_STANDARD 20)
2525

2626
set(FIND_ROOT_PATH "${PROJECT_BINARY_DIR}/usr")
2727
set(PREBUILDER_INCLUDE_DIR "${FIND_ROOT_PATH}/include")

docs/release.zh-CN.md

+1
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@
1212
* 如果下一个版本将抛弃 macOS 的主/次版本,更改 CMakeLists.txt 中 project 的主/次版本和 CMAKE_OSX_DEPLOYMENT_TARGET。
1313
* 提交更改,`git push origin master`,这将更新 latest 中的 version.json,用户检查更新时将获取到新版信息。
1414
*[fcitx5-macos-installer](https://github.com/fcitx-contrib/fcitx5-macos-installer) 中发布新版安装包。
15+
* 更新 [homebrew-tap](https://github.com/fcitx-contrib/homebrew-tap)

scripts/install-deps.sh

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ deps=(
1313
default-icon-theme
1414
boost
1515
libexpat
16-
fmt
1716
libintl
1817
json
1918
json-c

version.jsonl

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"tag": "0.1.0", "macos": "13", "sha": "212113ab391eb6ec45bd881a22e7f1595834986a", "time": 1740952697}

0 commit comments

Comments
 (0)