From e67b3c957bf41e4938a8f3275190c509836bdc8c Mon Sep 17 00:00:00 2001 From: Alexandre MUNSCH Date: Thu, 18 Sep 2025 00:46:52 +0200 Subject: [PATCH] feat: updated to 2.3.2 --- .DS_Store | Bin 0 -> 6148 bytes .cppcheck.suppress | 1 - .github/.DS_Store | Bin 0 -> 6148 bytes .github/workflows/build-and-test.yml | 48 +++-------------- .github/workflows/publish-doc-release.yml | 49 +++--------------- .github/workflows/publish-doc-snapshot.yml | 48 +++-------------- CMakeLists.txt | 2 +- include/CMakeLists.txt.keyple-util | 2 +- .../keyple/core/plugin/CardIOException.hpp | 4 +- .../keyple/core/plugin/PluginIOException.hpp | 4 +- .../keyple/core/plugin/ReaderIOException.hpp | 4 +- 11 files changed, 25 insertions(+), 137 deletions(-) create mode 100644 .DS_Store create mode 100644 .github/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4359283a8b00d222e41fa84bbe19b13ace9adf0e GIT binary patch literal 6148 zcmeHKJxc>Y5S>j9;s=2gik1iVLJAvEJi}QELOQE_NfNktL6iO(|BRiTc6R;^8~=xI zcGqx|yR#AznF+h^Zf17p?StFR5|QaFM{S}O5pAF`23zP#jN{x2R`Z@6py4@^al1QA zXY)d)I#dBw;4dn`-)=yMG^Qyn#P_?`f6T{bX&eudbO0YVgY5F<^zB^6N8iThlic2L z%=-;BzUtD1mNXF6Yt4^h#u|sGhXc!DZJt>wm{ep5KDD0XGo@P^QUW$3x)FTL(V68V zG9({5d3KsKpk;0z$)_qy^08ZJo$l$5hJpv}Ho?P3D(bJIc^y`DeN@z=D_;L5Ehxn= zfd&)m^D1QR>-X}k3LYi%RcKL?Dfzvku-XqRfHRwIW80zjs(>n>3ak|1{UJnSj67xz z?bdEd)c7lgal_#ceO}}-bLfVXv6V58uWbAc z#n|fbhc=x|oSQ@UIjwLEMcySdu?m3yb5kHbm>8 qv2kAJ&<;W8k7N75NAW(IHN--G07f1&hw#AkkARgyJ5}IU75D_MRGMP| literal 0 HcmV?d00001 diff --git a/.cppcheck.suppress b/.cppcheck.suppress index b2fe9e2..f35ba3b 100644 --- a/.cppcheck.suppress +++ b/.cppcheck.suppress @@ -1,3 +1,2 @@ cstyleCast -missingIncludeSystem missingInclude diff --git a/.github/.DS_Store b/.github/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d166734bb139b4864a6d3d17c78b93ab5920a61c GIT binary patch literal 6148 zcmeHKK~BRk5FD3EZ3Tyl6URt=fZjn0Rd_)^fZ9Sqw4`c5gh#NoP%7u^c0%pCd ziZrPN7lhERWRJ6+wKo$hwgH6x{kR8o0kl~J8y!|PCjC+>)-cZ=F~l(@xWMgn(i@EO z3fmojQ33gOEsT-l0gw3d{buu+Zum&6j9H##!)ZQb4;M!9{B-zwTE`lHgEhaB)nc>h zifUnr5f-?{9CujidNKyu?{TIQqnrus literal 0 HcmV?d00001 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index b53e412..313400d 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -1,4 +1,4 @@ -name: Build and test code +name: Build and Test code on: push: @@ -6,45 +6,9 @@ on: - main pull_request: -jobs: - build: - - strategy: - matrix: - env: - - toolchain: "toolchain/gcc-linux.cmake" - runner: ubuntu-latest - generator: "" - - toolchain: "toolchain/clang-macos.cmake" - runner: macos-latest - generator: "" - - toolchain: "\"toolchain/clang-windows.cmake\"" - runner: windows-latest - generator: "-G \"Visual Studio 17 2022\"" - - runs-on: ${{ matrix.env.runner }} - - steps: - - name: Check out repository - uses: actions/checkout@v4 - - name: Install Linux reqs - if: ${{ matrix.env.runner == 'ubuntu-latest' }} - run: | - sudo apt-get update - sudo apt-get install -y clang cmake cppcheck clang-format clang-tidy gcc pre-commit - - - name: Install macOS reqs - if: ${{ matrix.env.runner == 'macos-latest' }} - run: | - brew install llvm cmake cppcheck clang-format gcc pre-commit - - - name: Build - run: | - cmake ${{ matrix.env.generator }} -B build -S . -DCMAKE_TOOLCHAIN_FILE=${{ matrix.env.toolchain }} - cmake --build build -j8 - - - name: Run Linux/macOS tests - if: ${{ matrix.env.runner == 'ubuntu-latest' || matrix.env.runner == 'macos-latest' }} - run: | - ./build/bin/keypleplugincppapi_ut +jobs: + call-reusable-workflow: + uses: eclipse-keyple/keyple-actions/.github/workflows/reusable-cpp-build-and-test.yml@main # NOSONAR - Same organization, trusted source + with: + test_executable_name: 'build/bin/keypleplugincppapi_ut' diff --git a/.github/workflows/publish-doc-release.yml b/.github/workflows/publish-doc-release.yml index 6fa978d..d26dd8d 100644 --- a/.github/workflows/publish-doc-release.yml +++ b/.github/workflows/publish-doc-release.yml @@ -1,47 +1,14 @@ -name: Publish API documentation - +name: Publish API documentation (release) on: release: types: [published] +permissions: + checks: write + jobs: publish-doc-release: - runs-on: ubuntu-latest - steps: - - name: Check out repository code from ${{ github.repository }}/${{ github.ref }} - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Make scripts executable - run: chmod +x ./.github/scripts/*.sh - - - name: Check version - working-directory: . - run: ./.github/scripts/check_version.sh $(echo "${{ github.ref }}" | sed -e "s,^refs/tags/,,") - - - name: Patch Doxyfile - working-directory: . - run: ./.github/scripts/patch_doxyfile.sh ${{ env.PROJECT_VERSION }} - - - name: Generate and prepare documentation - uses: eclipse-keyple/keyple-actions/doxygen@0c8593c4ed6b393642a1732af1fdef84d5e59540 - with: - repo-name: ${{ github.event.repository.name }} - version: ${{ github.event.inputs.version || github.ref_name }} - - - name: Prepare Doxygen doc page locally - working-directory: . - run: ./.github/scripts/prepare_doxygen.sh ${{ env.PROJECT_VERSION }} - - - name: Deploy to doc branch - run: | - git config --global user.name "Eclipse Keypop Bot" - git config --global user.email "${{ github.repository }}-bot@eclipse.org" - cd ${{ github.event.repository.name }} - git remote set-url origin "https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" - git add . - git commit -m "docs: update ${{ github.event.inputs.version || github.ref_name }} documentation" - git push origin doc --force - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: eclipse-keyple/keyple-actions/.github/workflows/reusable-publish-doxygen.yml@main # NOSONAR - Same organization, trusted source + with: + version: ${{ github.event.inputs.version || github.ref_name }} + secrets: inherit # NOSONAR - Same organization, trusted source diff --git a/.github/workflows/publish-doc-snapshot.yml b/.github/workflows/publish-doc-snapshot.yml index 8600b32..d5d29a6 100644 --- a/.github/workflows/publish-doc-snapshot.yml +++ b/.github/workflows/publish-doc-snapshot.yml @@ -1,50 +1,14 @@ name: Publish API documentation (snapshot) - on: push: branches: - main - - master - - doxygen + workflow_dispatch: + +permissions: + checks: write jobs: publish-doc-snapshot: - runs-on: ubuntu-latest - steps: - - name: Check out repository code from ${{ github.repository }}/${{ github.ref }} - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Make scripts executable - run: chmod +x ./.github/scripts/*.sh - - - name: Check version - working-directory: . - run: ./.github/scripts/check_version.sh - - - name: Patch Doxyfile - working-directory: . - run: ./.github/scripts/patch_doxyfile.sh ${{ env.PROJECT_VERSION }} - - - name: Generate and prepare documentation - uses: eclipse-keyple/keyple-actions/doxygen@0c8593c4ed6b393642a1732af1fdef84d5e59540 - with: - repo-name: ${{ github.event.repository.name }} - version: ${{ github.event.inputs.version || github.ref_name }} - - - name: Prepare Doxygen doc page locally - working-directory: . - run: ./.github/scripts/prepare_doxygen.sh ${{ env.PROJECT_VERSION }} - - - name: Deploy to doc branch - run: | - git config --global user.name "Eclipse Keypop Bot" - git config --global user.email "${{ github.repository }}-bot@eclipse.org" - cd ${{ github.event.repository.name }} - git remote set-url origin "https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" - git add . - git diff --quiet && git diff --staged --quiet || git commit -m "docs: update snapshot documentation" - git push origin doc --force - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: eclipse-keyple/keyple-actions/.github/workflows/reusable-publish-doxygen.yml@main # NOSONAR - Same organization, trusted source + secrets: inherit # NOSONAR - Same organization, trusted source diff --git a/CMakeLists.txt b/CMakeLists.txt index f60acd4..a21ce84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ PROJECT(KeyplePluginCppApi C CXX) SET(CMAKE_PROJECT_VERSION_MAJOR "2") SET(CMAKE_PROJECT_VERSION_MINOR "3") -SET(CMAKE_PROJECT_VERSION_PATCH "1") +SET(CMAKE_PROJECT_VERSION_PATCH "2") SET(CMAKE_PROJECT_VERSION "${CMAKE_PROJECT_VERSION_MAJOR}. ${CMAKE_PROJECT_VERSION_MINOR}. diff --git a/include/CMakeLists.txt.keyple-util b/include/CMakeLists.txt.keyple-util index 4f4a2ec..8b9e588 100644 --- a/include/CMakeLists.txt.keyple-util +++ b/include/CMakeLists.txt.keyple-util @@ -27,7 +27,7 @@ IF(NOT EXISTS "${CMAKE_BINARY_DIR}/_deps/keypleutilcpplib-src") DOWNLOAD_EXTRACT_TIMESTAMP true GIT_REPOSITORY https://github.com/eclipse-keyple/keyple-util-cpp-lib - GIT_TAG develop-2.4.0 + GIT_TAG 2.4.0 ) ELSE() diff --git a/include/keyple/core/plugin/CardIOException.hpp b/include/keyple/core/plugin/CardIOException.hpp index 7e5ec1a..d199482 100644 --- a/include/keyple/core/plugin/CardIOException.hpp +++ b/include/keyple/core/plugin/CardIOException.hpp @@ -10,7 +10,6 @@ #pragma once -#include #include #include "keyple/core/util/cpp/exception/Exception.hpp" @@ -41,8 +40,7 @@ class CardIOException : public Exception { * @param cause the cause * @since 2.0.0 */ - CardIOException( - const std::string& message, const std::shared_ptr cause) + CardIOException(const std::string& message, const Exception& cause) : Exception(message, cause) { } }; diff --git a/include/keyple/core/plugin/PluginIOException.hpp b/include/keyple/core/plugin/PluginIOException.hpp index 2d863b5..f7a3d66 100644 --- a/include/keyple/core/plugin/PluginIOException.hpp +++ b/include/keyple/core/plugin/PluginIOException.hpp @@ -10,7 +10,6 @@ #pragma once -#include #include #include "keyple/core/util/cpp/exception/Exception.hpp" @@ -41,8 +40,7 @@ class PluginIOException : public Exception { * @param cause the cause * @since 2.0.0 */ - PluginIOException( - const std::string& message, const std::shared_ptr cause) + PluginIOException(const std::string& message, const Exception& cause) : Exception(message, cause) { } }; diff --git a/include/keyple/core/plugin/ReaderIOException.hpp b/include/keyple/core/plugin/ReaderIOException.hpp index 14feda4..f2163e7 100644 --- a/include/keyple/core/plugin/ReaderIOException.hpp +++ b/include/keyple/core/plugin/ReaderIOException.hpp @@ -10,7 +10,6 @@ #pragma once -#include #include #include "keyple/core/util/cpp/exception/Exception.hpp" @@ -41,8 +40,7 @@ class ReaderIOException : public Exception { * @param cause the cause * @since 2.0.0 */ - ReaderIOException( - const std::string& message, const std::shared_ptr cause) + ReaderIOException(const std::string& message, const Exception& cause) : Exception(message, cause) { } };