Skip to content

Commit 075ca91

Browse files
Merge remote-tracking branch 'upstream/master'
2 parents 8ecd226 + 08445f0 commit 075ca91

File tree

166 files changed

+4869
-2887
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+4869
-2887
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Bug report
33
about: Create a report to help us improve
44
title: "[BUG]: "
55
labels: bug
6-
assignees: Milerius, tonymorony
6+
assignees: ''
77

88
---
99

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Feature request
33
about: Suggest an idea for this project
44
title: "[FEATURE REQUEST]: "
55
labels: ''
6-
assignees: Milerius, tonymorony
6+
assignees: ''
77

88
---
99

.github/workflows/atomicdex-desktop-ci.yml

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,65 +65,55 @@ jobs:
6565

6666
- name: Install QT (Linux)
6767
if: runner.os == 'Linux'
68-
uses: KomodoPlatform/install-qt-action@v2.9.0
68+
uses: KomodoPlatform/install-qt-action@v2.14.0
6969
with:
7070
version: ${{ matrix.qt }}
7171
host: 'linux'
7272
target: 'desktop'
7373
dir: '${{ github.workspace }}'
74-
#mirror: 'http://mirrors.ocf.berkeley.edu/qt'
75-
mirror: https://qt-mirror.dannhauer.de
76-
#mirror: https://www.funet.fi/pub/mirrors/download.qt-project.org
77-
#mirror: https://ftp.fau.de/qtproject
7874
modules: 'qtcharts qtwidgets debug_info qtwebengine qtwebview'
7975
aqtversion: '==0.8'
8076
py7zrversion: '==0.6'
8177

8278
- name: Install QT (MacOS)
8379
if: runner.os == 'macOS'
84-
uses: KomodoPlatform/install-qt-action@v2.9.0
80+
uses: KomodoPlatform/install-qt-action@v2.14.0
8581
with:
8682
version: ${{ matrix.qt }}
8783
host: 'mac'
8884
target: 'desktop'
89-
#mirror: 'http://mirrors.ocf.berkeley.edu/qt'
90-
mirror: https://qt-mirror.dannhauer.de
91-
#mirror: https://www.funet.fi/pub/mirrors/download.qt-project.org
92-
#mirror: https://ftp.fau.de/qtproject
9385
dir: '${{ github.workspace }}'
9486
modules: 'qtcharts qtwidgets debug_info qtwebview qtwebengine'
9587

9688
- name: Install QT IFW (MacOS)
9789
if: runner.os == 'macOS'
9890
run: |
99-
python3 -m aqt tool mac tools_ifw 4.2.0-0-202111080927 qt.tools.ifw.42 --outputdir ${{ github.workspace }}/Qt
91+
python3 -m aqt tool mac tools_ifw 4.3.0 qt.tools.ifw.43 --outputdir ${{ github.workspace }}/Qt
10092
echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.0/bin" >> $GITHUB_PATH
10193
echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.1/bin" >> $GITHUB_PATH
10294
echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.2/bin" >> $GITHUB_PATH
95+
echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.3/bin" >> $GITHUB_PATH
10396
10497
- name: Install QT (Windows)
10598
if: runner.os == 'Windows'
106-
uses: KomodoPlatform/install-qt-action@v2.9.0
99+
uses: KomodoPlatform/install-qt-action@v2.14.0
107100
with:
108101
version: ${{ matrix.qt }}
109102
host: 'windows'
110103
target: 'desktop'
111104
arch: 'win64_msvc2019_64'
112-
#mirror: 'http://mirrors.ocf.berkeley.edu/qt'
113-
mirror: https://qt-mirror.dannhauer.de
114-
#mirror: https://www.funet.fi/pub/mirrors/download.qt-project.org
115-
#mirror: https://ftp.fau.de/qtproject
116105
dir: 'C:\'
117106
modules: 'qtcharts qtwidgets debug_info qtwebview qtwebengine'
118107

119108
- name: Install QT IFW (Windows)
120109
if: runner.os == 'Windows'
121110
run: |
122111
python -m pip install --upgrade pip
123-
python -m aqt tool windows tools_ifw 4.2.0-0-202111080926 qt.tools.ifw.42 --outputdir C:/Qt
112+
python -m aqt tool windows tools_ifw 4.3.0 qt.tools.ifw.43 --outputdir C:/Qt
124113
echo "C:/Qt/Tools/QtInstallerFramework/4.0/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
125114
echo "C:/Qt/Tools/QtInstallerFramework/4.1/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
126115
echo "C:/Qt/Tools/QtInstallerFramework/4.2/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
116+
echo "C:/Qt/Tools/QtInstallerFramework/4.3/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
127117
echo $env:GITHUB_PATH
128118
echo $env:PATH
129119

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ include(vcpkg_prerequisites)
1111
include(qt_prerequisites)
1212
include(cfg_hash)
1313

14-
project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.4)
14+
project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.5)
1515
message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")
1616

1717
include(cmake_default_options)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Check out AtomicDEX mobile, available for [Android and iOS](https://atomicdex.io
8888

8989
| Dependencies | Version | Description | Categories |
9090
|---------------|---------------|-------------------------------------------------------------------------------------------------------------------------------------------------|---------------------|
91-
| boost | 1.75 | Boost provides free peer-reviewed portable C++ source libraries. | General Programming |
91+
| boost | 1.77 | Boost provides free peer-reviewed portable C++ source libraries. | General Programming |
9292
| doctest | 2.3.8 | The fastest feature-rich C++11/14/17/20 single-header testing framework | Testing |
9393
| fmt | 7.1.0 | A modern formatting library | Formatting |
9494
| nlohmann_json | 3.9.1 | JSON for Modern C++ | Parsing |

0 commit comments

Comments
 (0)