diff --git a/CHANGELOG.md b/CHANGELOG.md index e1929dd3a..82009b0b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Change Log +## v2.15.0-RC +* 修复文件列表的问题, #188 +* 修复 MiraiCP-native 的问题, 现在理论上应该是能开始用了, 但还没经过完全测试 +* 更新 Mirai 版本 -> 2.15.0-M1 +* 修复 filter const 的问题 PR #191 by @shuli106 +* 增加发布 native 版本的 CI + +Internal: +* 修改了一些 MiraiCPString 内部实现 +* 修改了 BS 线程池实现 + ## v2.14.0 * Command注册函数`registerCommand`现在不接受参数,只接受一个模板参数,会调用默认构造函数构造子类对象;command类必须重写基类析构函数 * schedule不会从重载前的插件传递timeout event给重载后的插件 diff --git a/cpp/Doxyfile b/cpp/Doxyfile index 5507dcac3..a9104da26 100644 --- a/cpp/Doxyfile +++ b/cpp/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = MiraiCP # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = v2.14.0 +PROJECT_NUMBER = v2.15.0-RC # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a @@ -920,8 +920,7 @@ RECURSIVE = YES # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = include/libloader/BS_thread_pool.hpp \ - src/single_include +EXCLUDE = src/single_include # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded diff --git a/cpp/include/common/PluginConfig.h b/cpp/include/common/PluginConfig.h index 9900b279d..753233b8b 100644 --- a/cpp/include/common/PluginConfig.h +++ b/cpp/include/common/PluginConfig.h @@ -22,7 +22,7 @@ namespace MiraiCP { - constexpr const char *m_MiraiCPVersion = "v2.14.0"; + constexpr const char *m_MiraiCPVersion = "v2.15.0-RC"; inline const std::string MiraiCPVersion = m_MiraiCPVersion; struct PluginConfig { diff --git a/cpp/src/libloader/PlatformException.cpp b/cpp/src/libloader/PlatformException.cpp index cfc8e46c3..f6dc433a7 100644 --- a/cpp/src/libloader/PlatformException.cpp +++ b/cpp/src/libloader/PlatformException.cpp @@ -66,7 +66,7 @@ class EventHandlerPitch { LibLoader::logger.error("请检查您的插件代码,崩溃发生后的任何行为均未定义,MiraiCP将尽可能尝试继续运行"); LibLoader::sendPluginException(std::move(pluginName)); - size_t threadIndex = BS::thread_pool::getCurrentThreadIndexView(); + size_t threadIndex = Antares::pool->getCurrentThreadIndexView(); if (threadIndex != (std::numeric_limits::max)()) { // 是线程池线程 LibLoader::sendThreadReset(threadIndex); diff --git a/kotlin/buildSrc/src/main/kotlin/Version.kt b/kotlin/buildSrc/src/main/kotlin/Version.kt index 2d8080410..c54ed5c96 100644 --- a/kotlin/buildSrc/src/main/kotlin/Version.kt +++ b/kotlin/buildSrc/src/main/kotlin/Version.kt @@ -17,7 +17,8 @@ */ object Version { - const val miraiCP = "2.14.0" + const val miraiCP = "2.15.0-RC" + // plugins const val kotlin = "1.8.10" const val shadowJar = "7.1.2" diff --git a/kotlin/loader/src/nativeMain/kotlin/scripts/runMiraiCP.sh b/kotlin/loader/src/nativeMain/kotlin/scripts/runMiraiCP.sh index 05ecc029d..22c8b931e 100644 --- a/kotlin/loader/src/nativeMain/kotlin/scripts/runMiraiCP.sh +++ b/kotlin/loader/src/nativeMain/kotlin/scripts/runMiraiCP.sh @@ -1,5 +1,23 @@ #!/bin/bash -executable="./MiraiCP-loader-v2.14.0.kexe" +# +# Copyright (c) 2020 - 2023. Eritque arcus and contributors. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or any later version(in your opinion). +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +# + +executable="./MiraiCP-loader-v2.15.0-RC.kexe" grep_re=$(LD_LIBRARY_PATH=./ ldd $executable | grep "not found") if [ "$grep_re" != "" ]; then echo "检测到以下依赖缺失" diff --git a/kotlin/shared/src/commonMain/kotlin/BuiltInConstants.kt b/kotlin/shared/src/commonMain/kotlin/BuiltInConstants.kt index 595dc5dd0..d040896fa 100644 --- a/kotlin/shared/src/commonMain/kotlin/BuiltInConstants.kt +++ b/kotlin/shared/src/commonMain/kotlin/BuiltInConstants.kt @@ -19,7 +19,7 @@ package tech.eritquearcus.miraicp.shared object BuiltInConstants { - const val date = "Sat Feb 18 12:08:44 EST 2023" - const val version = "2.13.2" - const val miraiVersion = "2.14.0" + const val date = "Sun Apr 09 23:31:15 EDT 2023" + const val version = "2.15.0-RC" + const val miraiVersion = "2.15.0-M1" } \ No newline at end of file