Merge pull request #2014 from KomodoPlatform/stop_bech

0.5.6a
KomodoPlatform · Oct 20, 2022 · 83459a9 · 83459a9
2 parents c20a2c0 + c56255e
commit 83459a9
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git 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

diff --git 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)
@@ -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)
@@ -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/acd31bf.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 → assets/config/0.5.6.1-coins.json b/assets/config/0.5.6-coins.json → 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>${DEX_DISPLAY_NAME}</Name>
-    <Version>0.5.6</Version>
+    <Version>0.5.6a</Version>
     <Title>${DEX_DISPLAY_NAME} Installer</Title>
     <ProductUrl>${DEX_WEBSITE}</ProductUrl>
     <Publisher>${DEX_COMPANY}</Publisher>

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
@@ -2,7 +2,7 @@
 <Package>
     <DisplayName>${DEX_DISPLAY_NAME}</DisplayName>
     <Description>Install ${DEX_DISPLAY_NAME}.</Description>
-    <Version>0.5.6</Version>
+    <Version>0.5.6a</Version>
     <ReleaseDate>2022-07-12</ReleaseDate>
     <Licenses>
         <License name="GNU General Public License v2.0" file="license.txt" />

diff --git 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>@DEX_DISPLAY_NAME@</Name>
-    <Version>0.5.6</Version>
+    <Version>0.5.6a</Version>
     <Title>@DEX_DISPLAY_NAME@ Installer</Title>
     <ProductUrl>@DEX_WEBSITE@</ProductUrl>
     <Publisher>@DEX_COMPANY@</Publisher>

diff --git a/...ls_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in b/...ls_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in
@@ -2,7 +2,7 @@
 <Package>
     <DisplayName>${DEX_DISPLAY_NAME}</DisplayName>
     <Description>Install ${DEX_DISPLAY_NAME}.</Description>
-    <Version>0.5.6</Version>
+    <Version>0.5.6a</Version>
     <ReleaseDate>2022-07-12</ReleaseDate>
     <Licenses>
         <License name="GNU General Public License v2.0" file="license.txt" />

diff --git 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
@@ -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
@@ -1,6 +1,6 @@
 {
   "name": "atomicdex-desktop",
-  "version-string": "0.5.5.1",
+  "version-string": "0.5.6.1",
   "dependencies": [
     "entt",
     "boost-multiprecision",