Merge pull request #1261 from KomodoPlatform/dev

0.5.1
KomodoPlatform · Sep 18, 2021 · 3cbc3e1 · 3cbc3e1
2 parents 6871199 + 3f98f94
commit 3cbc3e1
Show file tree

Hide file tree

Showing 88 changed files with 5,316 additions and 3,817 deletions.
diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -32,7 +32,7 @@ jobs:
 
         include:
           - name: ubuntu-qt-5-15-2
-            os: ubuntu-16.04
+            os: ubuntu-18.04
             qt: '5.15.2'
             type: 'release'
 

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -85,7 +85,7 @@ AtomicDex-linux-zip:
     paths:
       - $CI_PROJECT_DIR/atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.zip
     when: always
-    expire_in: 1 week
+    expire_in: 3 days
 
 AtomicDex-linux-AppImage:
   stage: upload_linux_appimage
@@ -97,7 +97,7 @@ AtomicDex-linux-AppImage:
     paths:
       - $CI_PROJECT_DIR/atomicdex-desktop-${CI_COMMIT_SHA::9}-x86_64.AppImage
     when: always
-    expire_in: 1 week
+    expire_in: 3 days
 
 AtomicDex-linux-tar:
   stage: upload_linux_tar
@@ -109,4 +109,4 @@ AtomicDex-linux-tar:
     paths:
       - $CI_PROJECT_DIR/atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.tar.zst
     when: always
-    expire_in: 1 week
+    expire_in: 3 days
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.0)
+project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.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/v1.1.0/mm2-41170748d-Darwin-Release.zip)
+            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.4270/mm2-3a3f159bf-Darwin-Release.zip)
 elseif (UNIX AND NOT APPLE)
     FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/v1.1.0/mm2-41170748d-Linux-Release.zip)
+            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.4270/mm2-3a3f159bf-Linux-Release.zip)
 else ()
     FetchContent_Declare(mm2
-            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/v1.1.0/mm2-41170748d-Windows_NT-Release.zip)
+            URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.4270/mm2-3a3f159bf-Windows_NT-Release.zip)
 endif ()
 
 #FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)