Skip to content

Commit

Permalink
Merge pull request #1764 from KomodoPlatform/dev
Browse files Browse the repository at this point in the history 
0.5.6
  • Loading branch information
@ca333
ca333 committed Jul 28, 2022
2 parents c95869e + cbfc300 commit 1ce665d
Show file tree
Hide file tree
Showing 894 changed files with 14,322 additions and 12,821 deletions.
14 changes: 4 additions & 10 deletions .github/workflows/atomicdex-desktop-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,8 @@ jobs:
- name: Install QT IFW (MacOS)
if: runner.os == 'macOS'
run: |
python3 -m aqt tool mac tools_ifw 4.3.0 qt.tools.ifw.43 --outputdir ${{ github.workspace }}/Qt
echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.0/bin" >> $GITHUB_PATH
echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.1/bin" >> $GITHUB_PATH
echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.2/bin" >> $GITHUB_PATH
echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.3/bin" >> $GITHUB_PATH
python3 -m aqt tool mac tools_ifw 4.4.1 qt.tools.ifw.44 --outputdir ${{ github.workspace }}/Qt
echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.4/bin" >> $GITHUB_PATH
- name: Install QT (Windows)
if: runner.os == 'Windows'
Expand All @@ -110,11 +107,8 @@ jobs:
if: runner.os == 'Windows'
run: |
python -m pip install --upgrade pip
python -m aqt tool windows tools_ifw 4.3.0 qt.tools.ifw.43 --outputdir C:/Qt
echo "C:/Qt/Tools/QtInstallerFramework/4.0/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
echo "C:/Qt/Tools/QtInstallerFramework/4.1/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
echo "C:/Qt/Tools/QtInstallerFramework/4.2/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
echo "C:/Qt/Tools/QtInstallerFramework/4.3/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
python -m aqt tool windows tools_ifw 4.4.1 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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/atomicdex-desktop-release-vt.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
.zip$
.tar.zst$
.dmg$
.7z$
.7z$
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
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.5.1)
project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.6)
message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")

include(cmake_default_options)
Expand Down Expand Up @@ -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.5182/mm2-0fea16d6b-Darwin-Release.zip)
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.6805/mm2-ce32ab8da-Darwin-Release.zip)
elseif (UNIX AND NOT APPLE)
FetchContent_Declare(mm2
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.5182/mm2-0fea16d6b-Linux-Release.zip)
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.6805/mm2-ce32ab8da-Linux-Release.zip)
else ()
FetchContent_Declare(mm2
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.5182/mm2-0fea16d6b-Windows_NT-Release.zip)
URL https://github.com/KomodoPlatform/atomicDEX-API/releases/download/beta-2.1.6805/mm2-ce32ab8da-Windows_NT-Release.zip)
endif ()

#FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)
Expand Down
28 changes: 14 additions & 14 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,20 @@ Check out AtomicDEX mobile, available for [Android and iOS](https://atomicdex.io

## Self-Hosted Dependencies

| Dependencies | Version | Description | Categories |
|---------------|---------------|-------------------------------------------------------------------------------------------------------------------------------------------------|---------------------|
| boost | 1.77 | Boost provides free peer-reviewed portable C++ source libraries. | General Programming |
| doctest | 2.3.8 | The fastest feature-rich C++11/14/17/20 single-header testing framework | Testing |
| fmt | 7.1.0 | A modern formatting library | Formatting |
| nlohmann_json | 3.9.1 | JSON for Modern C++ | Parsing |
| range-v3 | 0.11.0 | Range library for C++14/17/20, basis for C++20's std::ranges | Algorithm |
| date | 2019-11-08 | A date and time library based on the C++11/14/17 <chrono> header | Timezone/Calendar |
| spdlog | 1.8.0 | Fast C++ logging library. | Logging |
| openssl | 1.1.1h | TLS/SSL and crypto library | Network/Crypto |
| entt | 3.5.1 | Gaming meets modern C++ - a fast and reliable entity component system (ECS) and much more | Architecture |
| cpprestsdk | 2.10.15-1 | The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. | HTTP |
| taskflow | 2.2.0 | Parallel and Heterogeneous Task Programming in Modern C++ | Threading |
| qt | 5.15.2 | Qt is a cross-platform application development framework for desktop, embedded and mobile. | GUI |
| Dependencies | Version | Description | Categories |
|---------------|------------|-------------------------------------------------------------------------------------------------------------------------------------------------|---------------------|
| boost | 1.78 | Boost provides free peer-reviewed portable C++ source libraries. | General Programming |
| doctest | 2.3.8 | The fastest feature-rich C++11/14/17/20 single-header testing framework | Testing |
| fmt | 7.1.0 | A modern formatting library | Formatting |
| nlohmann_json | 3.9.1 | JSON for Modern C++ | Parsing |
| range-v3 | 0.11.0 | Range library for C++14/17/20, basis for C++20's std::ranges | Algorithm |
| date | 2019-11-08 | A date and time library based on the C++11/14/17 <chrono> header | Timezone/Calendar |
| spdlog | 1.8.5 | Fast C++ logging library. | Logging |
| openssl | 1.1.1h | TLS/SSL and crypto library | Network/Crypto |
| entt | 3.5.1 | Gaming meets modern C++ - a fast and reliable entity component system (ECS) and much more | Architecture |
| cpprestsdk | 2.10.15-1 | The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. | HTTP |
| taskflow | 2.2.0 | Parallel and Heterogeneous Task Programming in Modern C++ | Threading |
| qt | 5.15.2 | Qt is a cross-platform application development framework for desktop, embedded and mobile. | GUI |


## Contributors / Thanks
Expand Down
Loading

0 comments on commit 1ce665d

Please sign in to comment.