From c0444a3b56a13d1bc0a408eb1d5c70b5f8bf224b Mon Sep 17 00:00:00 2001 From: smk762 Date: Tue, 18 Oct 2022 04:02:53 +0800 Subject: [PATCH 1/4] version and coins --- CMakeLists.txt | 4 ++-- assets/config/{0.5.6-coins.json => 0.5.6.1-coins.json} | 0 ci_tools_atomic_dex/installer/osx/config/config.xml.in | 2 +- .../com.komodoplatform.atomicdex/meta/package.xml.in | 2 +- ci_tools_atomic_dex/installer/windows/config/config.xml.in | 2 +- .../com.komodoplatform.atomicdex/meta/package.xml.in | 2 +- cmake/install/macos/dex_install.cmake | 4 ++-- src/core/atomicdex/version/version.hpp | 6 +++--- vcpkg.json | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) rename assets/config/{0.5.6-coins.json => 0.5.6.1-coins.json} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b1c01a392..2be70adb30 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.6) +project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.6.1) message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}") include(cmake_default_options) @@ -79,7 +79,7 @@ FetchContent_Declare( ) FetchContent_Declare(jl777-coins - URL https://github.com/KomodoPlatform/coins/archive/master.zip) + URL https://github.com/KomodoPlatform/coins/archive/bechless.zip) #FetchContent_Declare(adex-generics-coins # URL https://github.com/KomodoPlatform/atomicdex-desktop-generics/archive/main.zip) diff --git a/assets/config/0.5.6-coins.json b/assets/config/0.5.6.1-coins.json similarity index 100% rename from assets/config/0.5.6-coins.json rename to assets/config/0.5.6.1-coins.json 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 ce75ba1161..2dfc6a1959 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.6 + 0.5.6a ${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 89c8e81c29..215fb77c2e 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,7 +2,7 @@ ${DEX_DISPLAY_NAME} Install ${DEX_DISPLAY_NAME}. - 0.5.6 + 0.5.6a 2022-07-12 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 3ea5ee7723..a7fde001e0 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.6 + 0.5.6a @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 89c8e81c29..215fb77c2e 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,7 +2,7 @@ ${DEX_DISPLAY_NAME} Install ${DEX_DISPLAY_NAME}. - 0.5.6 + 0.5.6a 2022-07-12 diff --git a/cmake/install/macos/dex_install.cmake b/cmake/install/macos/dex_install.cmake index 96f48384a4..da2933b3a8 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.6 - MACOSX_BUNDLE_LONG_VERSION_STRING 0.5.6 + MACOSX_BUNDLE_SHORT_VERSION_STRING 0.5.6a + MACOSX_BUNDLE_LONG_VERSION_STRING 0.5.6a 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 1e1dfe9a44..a6949540a9 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.6-beta"; + return "0.5.6a-beta"; } constexpr int @@ -33,12 +33,12 @@ namespace atomic_dex constexpr const char* get_raw_version() { - return "0.5.6"; + return "0.5.6.1"; } constexpr const char* get_precedent_raw_version() { - return "0.5.5.1"; + return "0.5.6"; } } // namespace atomic_dex diff --git a/vcpkg.json b/vcpkg.json index f19d064d78..c2dc3d1870 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "atomicdex-desktop", - "version-string": "0.5.5.1", + "version-string": "0.5.6.1", "dependencies": [ "entt", "boost-multiprecision", From e87c690725d02d3849adf77c457aaac8d36f0eac Mon Sep 17 00:00:00 2001 From: smk762 Date: Tue, 18 Oct 2022 04:07:26 +0800 Subject: [PATCH 2/4] ifw --- .github/workflows/atomicdex-desktop-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index 84a86a17d5..010b32d13b 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -89,7 +89,7 @@ jobs: - name: Install QT IFW (MacOS) if: runner.os == 'macOS' run: | - python3 -m aqt tool mac tools_ifw 4.4.1 qt.tools.ifw.44 --outputdir ${{ github.workspace }}/Qt + python3 -m aqt tool mac tools_ifw 4.4.2 qt.tools.ifw.44 --outputdir ${{ github.workspace }}/Qt echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.4/bin" >> $GITHUB_PATH - name: Install QT (Windows) @@ -107,7 +107,7 @@ jobs: if: runner.os == 'Windows' run: | python -m pip install --upgrade pip - python -m aqt tool windows tools_ifw 4.4.1 qt.tools.ifw.44 --outputdir C:/Qt + python -m aqt tool windows tools_ifw 4.4.2 qt.tools.ifw.44 --outputdir C:/Qt echo "C:/Qt/Tools/QtInstallerFramework/4.4/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append echo $env:GITHUB_PATH echo $env:PATH From 1af1569414d9e69d10e5a83e7ca9a59c1e1ea7ed Mon Sep 17 00:00:00 2001 From: smk762 Date: Tue, 18 Oct 2022 04:11:33 +0800 Subject: [PATCH 3/4] use latest api release' --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2be70adb30..7a0404bee3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,13 +61,13 @@ endif () ##! We fetch our dependencies if (APPLE) FetchContent_Declare(mm2 - URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.7132/mm2-cfb031a21-Darwin-Release.zip) + URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.7404/mm2-0f6c72615-Darwin-Release.zip) elseif (UNIX AND NOT APPLE) FetchContent_Declare(mm2 - URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.7132/mm2-cfb031a21-Linux-Release.zip) + URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.7404/mm2-0f6c72615-Linux-Release.zip) else () FetchContent_Declare(mm2 - URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.7132/mm2-cfb031a21-Windows_NT-Release.zip) + URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.7404/mm2-0f6c72615-Windows_NT-Release.zip) endif () #FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip) From c56255e78916a703b48e4c78f8736877c2048629 Mon Sep 17 00:00:00 2001 From: smk762 Date: Tue, 18 Oct 2022 21:17:11 +0800 Subject: [PATCH 4/4] use coins file commit with BCH as UTXO --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a0404bee3..09387aa357 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,7 @@ FetchContent_Declare( ) FetchContent_Declare(jl777-coins - URL https://github.com/KomodoPlatform/coins/archive/bechless.zip) + URL https://github.com/KomodoPlatform/coins/archive/acd31bf.zip) #FetchContent_Declare(adex-generics-coins # URL https://github.com/KomodoPlatform/atomicdex-desktop-generics/archive/main.zip)