diff options
| author | ruki <[email protected]> | 2021-12-03 21:09:48 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-12-03 21:09:48 +0800 |
| commit | 7ae3c378f897fac7e0bf7dc9e0f7562a589514c8 (patch) | |
| tree | 8fadab1aa5486611b95c48e2eee2b8f889033c5d | |
| parent | ec8a29530ef5c7a60cb21a32fb07557d12c12cb7 (diff) | |
update version
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | core/project.mak | 4 | ||||
| -rw-r--r-- | core/xmake.lua | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a0360f917..83bdf65ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## master (unreleased) +## v2.6.1 + ### New features * [#1799](https://github.com/xmake-io/xmake/issues/1799): Support mixed rust & c++ target and cargo dependences @@ -1140,6 +1142,8 @@ ## master (开发中) +## v2.6.1 + ### 新特性 * [#1799](https://github.com/xmake-io/xmake/issues/1799): 支持混合 Rust 和 C++ 程序，以及集成 Cargo 依赖库 diff --git a/core/project.mak b/core/project.mak index 99e6ca226..945871e92 100644 --- a/core/project.mak +++ b/core/project.mak @@ -7,10 +7,10 @@ PRO_NAME = xmake PRO_VERSION_MAJOR = 2 # the project minor version -PRO_VERSION_MINOR = 5 +PRO_VERSION_MINOR = 6 # the project alter version -PRO_VERSION_ALTER = 9 +PRO_VERSION_ALTER = 1 # the project prefix PRO_PREFIX = XM_ diff --git a/core/xmake.lua b/core/xmake.lua index 08fc49301..5b72c672a 100644 --- a/core/xmake.lua +++ b/core/xmake.lua @@ -2,7 +2,7 @@ set_project("xmake") -- version -set_version("2.5.9", {build = "%Y%m%d%H%M"}) +set_version("2.6.1", {build = "%Y%m%d%H%M"}) -- set xmake min version set_xmakever("2.2.3") |