From 10201e7fe1b7454d41e146a6c76ff96fc28f9dd9 Mon Sep 17 00:00:00 2001 From: smk762 Date: Sat, 4 Mar 2023 23:03:17 +0800 Subject: [PATCH 1/3] 0.5.7 -> 0.5.7.1 --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- CMakeLists.txt | 2 +- ci_tools_atomic_dex/installer/osx/config/config.xml.in | 2 +- .../com.komodoplatform.atomicdex/meta/package.xml.in | 4 ++-- ci_tools_atomic_dex/installer/windows/config/config.xml.in | 2 +- .../com.komodoplatform.atomicdex/meta/package.xml.in | 4 ++-- cmake/install/macos/dex_install.cmake | 4 ++-- src/core/atomicdex/version/version.hpp | 6 +++--- vcpkg.json | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index a6c06597fa..a31d2a73f0 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -26,7 +26,7 @@ Please describe what you expected to happen. **Operating Environment(s):** - OS: [e.g. Windows/OSX/Linux. If Linux, include distro. ] - OS version: [e.g. 7/10/11, 10.13/10.15, 18.04/20.04 ] - - AtomicDEX Version: [e.g. 0.5.7] + - AtomicDEX Version: [e.g. 0.5.7.1] - Build branch: [e.g. master/dev] diff --git a/CMakeLists.txt b/CMakeLists.txt index edf592568b..88055e70cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ include(vcpkg_prerequisites) include(qt_prerequisites) include(cfg_hash) -project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.7) +project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.7.1) message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}") include(cmake_default_options) diff --git a/ci_tools_atomic_dex/installer/osx/config/config.xml.in b/ci_tools_atomic_dex/installer/osx/config/config.xml.in index 7b601889c4..c3d57543ce 100644 --- a/ci_tools_atomic_dex/installer/osx/config/config.xml.in +++ b/ci_tools_atomic_dex/installer/osx/config/config.xml.in @@ -1,7 +1,7 @@ ${DEX_DISPLAY_NAME} - 0.5.7 + 0.5.7.1 ${DEX_DISPLAY_NAME} Installer ${DEX_WEBSITE} ${DEX_COMPANY} diff --git a/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in b/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in index 06109f6ba9..3c71c1edf4 100644 --- a/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in +++ b/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in @@ -2,8 +2,8 @@ ${DEX_DISPLAY_NAME} Install ${DEX_DISPLAY_NAME}. - 0.5.7 - 2022-11-09 + 0.5.7.1 + 2023-06-03 diff --git a/ci_tools_atomic_dex/installer/windows/config/config.xml.in b/ci_tools_atomic_dex/installer/windows/config/config.xml.in index 2a33ec7019..abcfc8ed14 100644 --- a/ci_tools_atomic_dex/installer/windows/config/config.xml.in +++ b/ci_tools_atomic_dex/installer/windows/config/config.xml.in @@ -1,7 +1,7 @@ @DEX_DISPLAY_NAME@ - 0.5.7 + 0.5.7.1 @DEX_DISPLAY_NAME@ Installer @DEX_WEBSITE@ @DEX_COMPANY@ diff --git a/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in b/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in index 1a0b0bc1c3..128fdd7f46 100644 --- a/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in +++ b/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in @@ -2,8 +2,8 @@ ${DEX_DISPLAY_NAME} Install ${DEX_DISPLAY_NAME}. - 0.5.7 - 2022-10-24 + 0.5.7.1 + 2023-03-06 diff --git a/cmake/install/macos/dex_install.cmake b/cmake/install/macos/dex_install.cmake index c472d7684d..916e682cfa 100644 --- a/cmake/install/macos/dex_install.cmake +++ b/cmake/install/macos/dex_install.cmake @@ -4,8 +4,8 @@ if (APPLE) MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}" RESOURCE ${ICON} MACOSX_BUNDLE_ICON_FILE dex-logo - MACOSX_BUNDLE_SHORT_VERSION_STRING 0.5.7 - MACOSX_BUNDLE_LONG_VERSION_STRING 0.5.7 + MACOSX_BUNDLE_SHORT_VERSION_STRING 0.5.7.1 + MACOSX_BUNDLE_LONG_VERSION_STRING 0.5.7.1 MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/cmake/MacOSXBundleInfo.plist.in") add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND diff --git a/src/core/atomicdex/version/version.hpp b/src/core/atomicdex/version/version.hpp index 4947939a04..ce9473a9e4 100644 --- a/src/core/atomicdex/version/version.hpp +++ b/src/core/atomicdex/version/version.hpp @@ -21,7 +21,7 @@ namespace atomic_dex constexpr const char* get_version() { - return "0.5.7-beta"; + return "0.5.7.1-beta"; } constexpr int @@ -33,12 +33,12 @@ namespace atomic_dex constexpr const char* get_raw_version() { - return "0.5.7"; + return "0.5.7.1"; } constexpr const char* get_precedent_raw_version() { - return "0.5.6.1"; + return "0.5.7.1"; } } // namespace atomic_dex diff --git a/vcpkg.json b/vcpkg.json index c2dc3d1870..5c085f92ef 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "atomicdex-desktop", - "version-string": "0.5.6.1", + "version-string": "0.5.7.1", "dependencies": [ "entt", "boost-multiprecision", From 769e872b80906a45b7416fb192ff9e17f2b1bd77 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 6 Mar 2023 19:52:58 +0800 Subject: [PATCH 2/3] fix precedent_raw_version --- src/core/atomicdex/version/version.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/atomicdex/version/version.hpp b/src/core/atomicdex/version/version.hpp index ce9473a9e4..de74639360 100644 --- a/src/core/atomicdex/version/version.hpp +++ b/src/core/atomicdex/version/version.hpp @@ -39,6 +39,6 @@ namespace atomic_dex constexpr const char* get_precedent_raw_version() { - return "0.5.7.1"; + return "0.5.7"; } } // namespace atomic_dex From 551b44f24b7129cccca782248dea2e198d92b8dc Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 6 Mar 2023 19:56:21 +0800 Subject: [PATCH 3/3] better logging for coins file update --- src/core/atomicdex/services/mm2/mm2.service.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/atomicdex/services/mm2/mm2.service.cpp b/src/core/atomicdex/services/mm2/mm2.service.cpp index 3137c3ee49..40c891fd23 100644 --- a/src/core/atomicdex/services/mm2/mm2.service.cpp +++ b/src/core/atomicdex/services/mm2/mm2.service.cpp @@ -63,7 +63,7 @@ namespace SPDLOG_INFO("There is a precedent configuration file, upgrading the new one with precedent settings"); //! Old cfg to ifs - LOG_PATH("opening file: {}", precedent_version_cfg_path); + LOG_PATH("opening previous version coins file: {}", precedent_version_cfg_path); QFile ifs; ifs.setFileName(atomic_dex::std_path_to_qstring(precedent_version_cfg_path)); ifs.open(QIODevice::Text | QIODevice::ReadOnly); @@ -72,7 +72,7 @@ namespace //! New cfg to ifs std::filesystem::path actual_version_filepath = cfg_path / (std::string(atomic_dex::get_raw_version()) + "-coins."s + wallet_name + ".json"s); - LOG_PATH("opening file: {}", actual_version_filepath); + LOG_PATH("opening new version coins file: {}", actual_version_filepath); QFile actual_version_ifs; actual_version_ifs.setFileName(atomic_dex::std_path_to_qstring(actual_version_filepath)); actual_version_ifs.open(QIODevice::Text | QIODevice::ReadOnly); @@ -97,13 +97,13 @@ namespace } } - LOG_PATH("closing file: {}", precedent_version_cfg_path); + LOG_PATH("closing old version coins file: {}", precedent_version_cfg_path); ifs.close(); - LOG_PATH("closing file: {}", actual_version_filepath); + LOG_PATH("closing new version coins file: {}", actual_version_filepath); actual_version_ifs.close(); //! Write contents - LOG_PATH("opening file: {}", actual_version_filepath); + LOG_PATH("opening new version file: {}", actual_version_filepath); QFile ofs; ofs.setFileName(atomic_dex::std_path_to_qstring(actual_version_filepath)); ofs.open(QIODevice::Text | QIODevice::WriteOnly); @@ -116,7 +116,7 @@ namespace { SPDLOG_ERROR("error: {}", ec.message()); } - LOG_PATH("closing file: {}", actual_version_filepath); + LOG_PATH("closing new version file: {}", actual_version_filepath); ofs.close(); } }