Skip to content

Commit

Permalink
Merge pull request #2175 from kungfu-trader/alpha/v2/v2.4
Browse files Browse the repository at this point in the history 
Release v2.4.76
  • Loading branch information
@ayizhi
ayizhi authored Nov 3, 2023
2 parents d36c709 + 2520e93 commit a6c01cd
Show file tree
Hide file tree
Showing 15 changed files with 40 additions and 40 deletions.
14 changes: 7 additions & 7 deletions artifact/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"name": "Kungfu Trader",
"email": "[email protected]"
},
"version": "2.4.75",
"version": "2.4.76-alpha.0",
"description": "Kungfu Trader Artifact",
"license": "Apache-2.0",
"private": true,
Expand All @@ -22,12 +22,12 @@
"cli": "yarn kfs craft cli"
},
"dependencies": {
"@kungfu-trader/kfx-broker-sim": "^2.4.75",
"@kungfu-trader/kfx-broker-xtp-demo": "^2.4.75",
"@kungfu-trader/kungfu-app": "^2.4.75",
"@kungfu-trader/kungfu-cli": "^2.4.75",
"@kungfu-trader/kungfu-core": "^2.4.75",
"@kungfu-trader/kungfu-sdk": "^2.4.75"
"@kungfu-trader/kfx-broker-sim": "^2.4.76-alpha.0",
"@kungfu-trader/kfx-broker-xtp-demo": "^2.4.76-alpha.0",
"@kungfu-trader/kungfu-app": "^2.4.76-alpha.0",
"@kungfu-trader/kungfu-cli": "^2.4.76-alpha.0",
"@kungfu-trader/kungfu-core": "^2.4.76-alpha.0",
"@kungfu-trader/kungfu-sdk": "^2.4.76-alpha.0"
},
"repository": {
"url": "https://github.com/kungfu-trader/kungfu.git"
Expand Down
12 changes: 6 additions & 6 deletions developer/sdk/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "Kungfu Trader",
"email": "[email protected]"
},
"version": "2.4.75",
"version": "2.4.76-alpha.0",
"description": "SDK for developing Kungfu Applications",
"license": "Apache-2.0",
"main": "src/index.js",
Expand Down Expand Up @@ -34,10 +34,10 @@
"format": "prettier -l -w --config ../../framework/core/.prettierrc.js ."
},
"dependencies": {
"@kungfu-trader/kungfu-app": "^2.4.75",
"@kungfu-trader/kungfu-cli": "^2.4.75",
"@kungfu-trader/kungfu-core": "^2.4.75",
"@kungfu-trader/kungfu-js-api": "^2.4.75",
"@kungfu-trader/kungfu-toolchain": "^2.4.75"
"@kungfu-trader/kungfu-app": "^2.4.76-alpha.0",
"@kungfu-trader/kungfu-cli": "^2.4.76-alpha.0",
"@kungfu-trader/kungfu-core": "^2.4.76-alpha.0",
"@kungfu-trader/kungfu-js-api": "^2.4.76-alpha.0",
"@kungfu-trader/kungfu-toolchain": "^2.4.76-alpha.0"
}
}
2 changes: 1 addition & 1 deletion developer/toolchain/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "Kungfu Trader",
"email": "[email protected]"
},
"version": "2.4.75",
"version": "2.4.76-alpha.0",
"description": "Toolchain for Kungfu Development (babel/cmake-js/node-gyp/webpack/yarn/etc).",
"license": "Apache-2.0",
"main": "package.json",
Expand Down
4 changes: 2 additions & 2 deletions examples/assemble-python/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kungfu-trader/examples-assemble-python",
"author": "kungfu-trader",
"version": "2.4.75",
"version": "2.4.76-alpha.0",
"description": "KungFu Example Assemble Python",
"license": "Apache-2.0",
"private": true,
Expand All @@ -13,6 +13,6 @@
"read_bytes": "kfc -l debug assemble src/json/read_bytes_10026.json"
},
"devDependencies": {
"@kungfu-trader/kungfu-sdk": "^2.4.75"
"@kungfu-trader/kungfu-sdk": "^2.4.76-alpha.0"
}
}
4 changes: 2 additions & 2 deletions examples/strategy-cpp-101/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kungfu-trader/examples-strategy-cpp",
"author": "kungfu-trader",
"version": "2.4.75",
"version": "2.4.76-alpha.0",
"description": "KungFu Strategy 101 - C++ Demo",
"license": "Apache-2.0",
"private": true,
Expand All @@ -15,7 +15,7 @@
"format": "node ../../framework/core/.gyp/run-format-cpp.js src"
},
"devDependencies": {
"@kungfu-trader/kungfu-sdk": "^2.4.75"
"@kungfu-trader/kungfu-sdk": "^2.4.76-alpha.0"
},
"repository": {
"url": "https://github.com/kungfu-trader/kungfu.git"
Expand Down
4 changes: 2 additions & 2 deletions examples/strategy-cpp-exe/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kungfu-trader/examples-strategy-cpp-exe",
"author": "kungfu-trader",
"version": "2.4.75",
"version": "2.4.76-alpha.0",
"description": "KungFu Strategy 101 - C++ Demo",
"license": "Apache-2.0",
"private": true,
Expand All @@ -23,7 +23,7 @@
"cached": "kfc -l debug run -c system -g service -n cached"
},
"devDependencies": {
"@kungfu-trader/kungfu-sdk": "^2.4.75"
"@kungfu-trader/kungfu-sdk": "^2.4.76-alpha.0"
},
"repository": {
"url": "https://github.com/kungfu-trader/kungfu.git"
Expand Down
4 changes: 2 additions & 2 deletions examples/strategy-python-101/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kungfu-trader/examples-strategy-python",
"author": "kungfu-trader",
"version": "2.4.75",
"version": "2.4.76-alpha.0",
"description": "KungFu Strategy 101 - Python Demo",
"license": "Apache-2.0",
"private": true,
Expand All @@ -15,7 +15,7 @@
"format": "node ../../framework/core/.gyp/run-format-python.js src"
},
"devDependencies": {
"@kungfu-trader/kungfu-sdk": "^2.4.75"
"@kungfu-trader/kungfu-sdk": "^2.4.76-alpha.0"
},
"repository": {
"url": "https://github.com/kungfu-trader/kungfu.git"
Expand Down
6 changes: 3 additions & 3 deletions extensions/sim/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "Kungfu Trader",
"email": "[email protected]"
},
"version": "2.4.75",
"version": "2.4.76-alpha.0",
"description": "Kungfu Extension - SIM",
"license": "Apache-2.0",
"main": "package.json",
Expand All @@ -29,10 +29,10 @@
"package": "kfs project package"
},
"dependencies": {
"@kungfu-trader/kungfu-core": "^2.4.75"
"@kungfu-trader/kungfu-core": "^2.4.76-alpha.0"
},
"devDependencies": {
"@kungfu-trader/kungfu-sdk": "^2.4.75"
"@kungfu-trader/kungfu-sdk": "^2.4.76-alpha.0"
},
"kungfuBuild": {
"python": {
Expand Down
6 changes: 3 additions & 3 deletions extensions/xtp/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "Kungfu Trader",
"email": "[email protected]"
},
"version": "2.4.75",
"version": "2.4.76-alpha.0",
"description": "Kungfu Extension - XTP Demo",
"license": "Apache-2.0",
"main": "package.json",
Expand All @@ -29,10 +29,10 @@
"package": "kfs project package"
},
"dependencies": {
"@kungfu-trader/kungfu-core": "^2.4.75"
"@kungfu-trader/kungfu-core": "^2.4.76-alpha.0"
},
"devDependencies": {
"@kungfu-trader/kungfu-sdk": "^2.4.75"
"@kungfu-trader/kungfu-sdk": "^2.4.76-alpha.0"
},
"kungfuDependencies": {
"xtp": "v2.2.32.2"
Expand Down
4 changes: 2 additions & 2 deletions framework/api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "Kungfu Trader",
"email": "[email protected]"
},
"version": "2.4.75",
"version": "2.4.76-alpha.0",
"description": "Kungfu Javascript/Typescript API",
"license": "Apache-2.0",
"repository": {
Expand All @@ -31,7 +31,7 @@
"format": "prettier -l -w --config ../core/.prettierrc.js ."
},
"dependencies": {
"@kungfu-trader/kungfu-core": "^2.4.75",
"@kungfu-trader/kungfu-core": "^2.4.76-alpha.0",
"cfonts": "^2.10.0",
"chalk": "^4.1.0",
"fast-csv": "^4.3.5",
Expand Down
6 changes: 3 additions & 3 deletions framework/app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "Kungfu Trader",
"email": "[email protected]"
},
"version": "2.4.75",
"version": "2.4.76-alpha.0",
"description": "Kungfu App Framework",
"license": "Apache-2.0",
"repository": {
Expand All @@ -31,7 +31,7 @@
"format": "prettier -l -w --config ../core/.prettierrc.js ."
},
"dependencies": {
"@kungfu-trader/kungfu-js-api": "^2.4.75",
"@kungfu-trader/kungfu-js-api": "^2.4.76-alpha.0",
"ant-design-vue": "^3.2.16",
"core-js": "^3.20.0",
"iconv-lite": "^0.6.3",
Expand All @@ -42,7 +42,7 @@
"vue": "^3.2.34"
},
"devDependencies": {
"@kungfu-trader/kungfu-toolchain": "^2.4.75",
"@kungfu-trader/kungfu-toolchain": "^2.4.76-alpha.0",
"@types/markdown-it": "^12.2.3",
"electron": "19.1.8",
"webpack-bundle-analyzer": "^4.6.1"
Expand Down
6 changes: 3 additions & 3 deletions framework/cli/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "Kungfu Trader",
"email": "[email protected]"
},
"version": "2.4.75",
"version": "2.4.76-alpha.0",
"description": "Kungfu App Framework",
"license": "Apache-2.0",
"repository": {
Expand Down Expand Up @@ -33,14 +33,14 @@
"format": "prettier -l -w --config ../core/.prettierrc.js ."
},
"dependencies": {
"@kungfu-trader/kungfu-js-api": "^2.4.75",
"@kungfu-trader/kungfu-js-api": "^2.4.76-alpha.0",
"blessed": "^0.1.81",
"core-js": "^3.20.0"
},
"devDependencies": {
"@babel/core": "^7.0.0",
"@babel/polyfill": "^7.12.1",
"@kungfu-trader/kungfu-toolchain": "^2.4.75",
"@kungfu-trader/kungfu-toolchain": "^2.4.76-alpha.0",
"@types/blessed": "^0.1.19",
"colors": "^1.4.0",
"commander": "^9.0.0",
Expand Down
4 changes: 2 additions & 2 deletions framework/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "Kungfu Trader",
"email": "[email protected]"
},
"version": "2.4.75",
"version": "2.4.76-alpha.0",
"description": "Kungfu Core Library",
"license": "Apache-2.0",
"main": "lib/index.js",
Expand Down Expand Up @@ -70,7 +70,7 @@
"sywac": "^1.3.0"
},
"devDependencies": {
"@kungfu-trader/kungfu-toolchain": "^2.4.75",
"@kungfu-trader/kungfu-toolchain": "^2.4.76-alpha.0",
"@kungfu-trader/libnode": "16.15.0",
"cmake-js": "^7.0.0",
"electron": "19.1.8",
Expand Down
2 changes: 1 addition & 1 deletion framework/core/src/include/kungfu/common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ template <typename DataType> struct data {
auto accessor = boost::hana::second(it);
j[name.c_str()] = accessor(*reinterpret_cast<const DataType *>(this));
});
return j.dump();
return j.dump(-1, ' ', false, nlohmann::json::basic_json::error_handler_t::replace);
}

explicit operator std::string() const { return to_string(); }
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.4.75",
"version": "2.4.76-alpha.0",
"packages": [
"framework/*",
"developer/*",
Expand Down

0 comments on commit a6c01cd

Please sign in to comment.