Skip to content

Commit

Permalink
Merge pull request #2217 from KomodoPlatform/update_version_0571
Browse files Browse the repository at this point in the history
0.5.7 -> 0.5.7.1
  • Loading branch information
smk762 authored Mar 6, 2023
2 parents 737b58f + 551b44f commit 146b1ea
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]


Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ci_tools_atomic_dex/installer/osx/config/config.xml.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Installer>
<Name>${DEX_DISPLAY_NAME}</Name>
<Version>0.5.7</Version>
<Version>0.5.7.1</Version>
<Title>${DEX_DISPLAY_NAME} Installer</Title>
<ProductUrl>${DEX_WEBSITE}</ProductUrl>
<Publisher>${DEX_COMPANY}</Publisher>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<Package>
<DisplayName>${DEX_DISPLAY_NAME}</DisplayName>
<Description>Install ${DEX_DISPLAY_NAME}.</Description>
<Version>0.5.7</Version>
<ReleaseDate>2022-11-09</ReleaseDate>
<Version>0.5.7.1</Version>
<ReleaseDate>2023-06-03</ReleaseDate>
<Licenses>
<License name="GNU General Public License v2.0" file="license.txt" />
</Licenses>
Expand Down
2 changes: 1 addition & 1 deletion ci_tools_atomic_dex/installer/windows/config/config.xml.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Installer>
<Name>@DEX_DISPLAY_NAME@</Name>
<Version>0.5.7</Version>
<Version>0.5.7.1</Version>
<Title>@DEX_DISPLAY_NAME@ Installer</Title>
<ProductUrl>@DEX_WEBSITE@</ProductUrl>
<Publisher>@DEX_COMPANY@</Publisher>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<Package>
<DisplayName>${DEX_DISPLAY_NAME}</DisplayName>
<Description>Install ${DEX_DISPLAY_NAME}.</Description>
<Version>0.5.7</Version>
<ReleaseDate>2022-10-24</ReleaseDate>
<Version>0.5.7.1</Version>
<ReleaseDate>2023-03-06</ReleaseDate>
<Licenses>
<License name="GNU General Public License v2.0" file="license.txt" />
</Licenses>
Expand Down
4 changes: 2 additions & 2 deletions cmake/install/macos/dex_install.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions src/core/atomicdex/services/mm2/mm2.service.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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();
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/core/atomicdex/version/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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";
}
} // namespace atomic_dex
2 changes: 1 addition & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "atomicdex-desktop",
"version-string": "0.5.6.1",
"version-string": "0.5.7.1",
"dependencies": [
"entt",
"boost-multiprecision",
Expand Down

0 comments on commit 146b1ea

Please sign in to comment.