Skip to content

Commit

Permalink
used versioned common and latest dependencies (#78)
Browse files Browse the repository at this point in the history
* used versioned common and latest dependencies

* fixed typo
  • Loading branch information
EddyTheCo authored Mar 29, 2024
1 parent d6e47bd commit 24189e6
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-test-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
matrix:
os: [ubuntu-latest,macos-latest,windows-latest]

uses: EddyTheCo/Common/.github/workflows/build-test-install.yml@use_IFW
uses: EddyTheCo/Common/.github/workflows/build-test-install.yml@v0.3.0
with:
os: ${{ matrix.os }}
cmakeArgs: ' -DUSE_THREADS=ON -DQTDEPLOY=ON [email protected] -DREPO_URL=https://eddytheco.github.io/NftMinter -DCPACK_PACKAGE_VENDOR=estervtech'
Expand All @@ -25,7 +25,7 @@ jobs:
matrix:
qtArch: ['android_arm64_v8a','android_armv7']

uses: EddyTheCo/Common/.github/workflows/build-android.yml@use_IFW
uses: EddyTheCo/Common/.github/workflows/build-android.yml@v0.3.0
with:
qtModules: 'qtwebsockets qtshadertools qtmultimedia'
qtTarget: 'nftminter'
Expand All @@ -35,7 +35,7 @@ jobs:
secrets:
QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.QT_ANDROID_KEYSTORE_STORE_PASS }}
build-wasm:
uses: EddyTheCo/Common/.github/workflows/build-wasm.yml@use_IFW
uses: EddyTheCo/Common/.github/workflows/build-wasm.yml@v0.3.0
with:
qtModules: 'qtwebsockets qtshadertools'
qtVersion: '6.6.0'
Expand Down
22 changes: 11 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include(FetchContent)
FetchContent_Declare(
ccommon
GIT_REPOSITORY https://github.com/EddyTheCo/Common.git
GIT_TAG use_IFW
GIT_TAG v0.3.0
)
FetchContent_MakeAvailable(ccommon)
version_from_git(
Expand All @@ -27,33 +27,33 @@ find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Qml OPTIONAL_COMPONENTS Mult
FetchContent_Declare(
EstervDesigns
GIT_REPOSITORY https://github.com/EddyTheCo/MyDesigns.git
GIT_TAG use_IFW
FIND_PACKAGE_ARGS 1.1 COMPONENTS SimpleStyle CustomControls CONFIG
GIT_TAG v1.2.0
FIND_PACKAGE_ARGS 1.2 COMPONENTS SimpleStyle CustomControls CONFIG
)
FetchContent_MakeAvailable(EstervDesigns)

FetchContent_Declare(
IotaWallet
GIT_REPOSITORY https://github.com/EddyTheCo/qWallet-IOTA.git
GIT_TAG use_IFW
FIND_PACKAGE_ARGS 0.2 CONFIG
GIT_TAG v0.3.0
FIND_PACKAGE_ARGS 0.3 CONFIG
)
FetchContent_MakeAvailable(IotaWallet)


FetchContent_Declare(
qrCode
GIT_REPOSITORY https://github.com/EddyTheCo/qrCode.git
GIT_TAG use_IFW
FIND_PACKAGE_ARGS 1.0 COMPONENTS QtQrDec QtQrGen CONFIG
GIT_TAG v1.1.0
FIND_PACKAGE_ARGS 1.1 COMPONENTS QtQrDec QtQrGen CONFIG
)
FetchContent_MakeAvailable(qrCode)

FetchContent_Declare(
DTPickersQML
GIT_REPOSITORY https://github.com/EddyTheCo/DateTimePickers.git
GIT_TAG use_IFW
FIND_PACKAGE_ARGS 0.1 CONFIG
GIT_TAG v0.2.0
FIND_PACKAGE_ARGS 0.2 CONFIG
)
FetchContent_MakeAvailable(DTPickersQML)

Expand Down Expand Up @@ -149,8 +149,8 @@ if(QTDEPLOY)
FetchContent_Declare(
QtUpdater
GIT_REPOSITORY https://github.com/EddyTheCo/QUpdater.git
GIT_TAG use_IFW
FIND_PACKAGE_ARGS 0.1 CONFIG
GIT_TAG v0.0.4
FIND_PACKAGE_ARGS 0.0 CONFIG
)
FetchContent_MakeAvailable(QtUpdater)

Expand Down

0 comments on commit 24189e6

Please sign in to comment.