diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3fb7a76fa..274aba201 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: cancel-in-progress: true steps: - name: Checkout Code and Submodules - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: submodules: recursive @@ -41,7 +41,7 @@ jobs: # cURL - name: Cache cURL id: cache-curl - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: "C:\\hostedtoolcache\\windows\\libcurl" key: "ukcp-curl-build" @@ -79,7 +79,7 @@ jobs: run: echo "::set-output name=dir::$(yarn cache dir)" - name: Load Yarn Cache - uses: actions/cache@v4 + uses: actions/cache@v5 id: yarn-cache with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -88,7 +88,7 @@ jobs: ${{ runner.os }}-yarn- - name: Load Cached Node Modules - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: "**/node_modules" key: ${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock') }} @@ -136,19 +136,19 @@ jobs: # Upload artifacts - name: Upload Core Binary As Artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: UKControllerPluginCore.dll path: ".\\build\\bin\\UKControllerPluginCore.dll" - name: Upload Updater Binary As Artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: UKControllerPluginUpdater.dll path: ".\\build\\bin\\UKControllerPluginUpdater.dll" - name: Upload Loader Binary As Artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: UKControllerPlugin.dll path: ".\\build\\bin\\UKControllerPlugin.dll" @@ -161,7 +161,7 @@ jobs: cancel-in-progress: true steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: persist-credentials: false @@ -193,7 +193,7 @@ jobs: cancel-in-progress: false steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: persist-credentials: false @@ -208,7 +208,7 @@ jobs: run: echo "::set-output name=dir::$(yarn cache dir)" - name: Load Yarn Cache - uses: actions/cache@v4 + uses: actions/cache@v5 id: yarn-cache with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -217,7 +217,7 @@ jobs: ${{ runner.os }}-yarn- - name: Load Cached Node Modules - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: "**/node_modules" key: ${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock') }} diff --git a/CMakeLists.txt b/CMakeLists.txt index ff79c703f..f1f647249 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,14 @@ if(MSVC) set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS}") endif() +################################################################################ +# Global compile definitions for all targets +################################################################################ +add_compile_definitions( + $<$:_DEBUG> + $<$:NDEBUG> +) + ################################################################################ # Nuget packages function stub. ################################################################################ diff --git a/docs/UserGuide/Changelog/Changelog.md b/docs/UserGuide/Changelog/Changelog.md index 794d7d835..5341382fc 100644 --- a/docs/UserGuide/Changelog/Changelog.md +++ b/docs/UserGuide/Changelog/Changelog.md @@ -1,5 +1,12 @@ # UK Controller Plugin Changelog +## [5.18.1](https://github.com/VATSIM-UK/uk-controller-plugin/compare/5.18.0...5.18.1) (2025-12-01) + + +### Bug Fixes + +* configure debug options compile targets ([b21d96b](https://github.com/VATSIM-UK/uk-controller-plugin/commit/b21d96b8099bb7f054c9d164d52bffb1d1fdf87f)) + # [5.18.0](https://github.com/VATSIM-UK/uk-controller-plugin/compare/5.17.4...5.18.0) (2025-11-03) diff --git a/src/plugin/radarscreen/ScreenControls.h b/src/plugin/radarscreen/ScreenControls.h index 6ea30b482..964754495 100644 --- a/src/plugin/radarscreen/ScreenControls.h +++ b/src/plugin/radarscreen/ScreenControls.h @@ -55,10 +55,10 @@ namespace UKControllerPlugin::RadarScreen { const int toggleboxIdEuroscope; // Height for each control - const int controlHeight = 25; + const int controlHeight = 22; // Width for each control - const int controlWidth = 25; + const int controlWidth = 22; // Title for the options const std::string menuName = "UKCP Options"; diff --git a/yarn.lock b/yarn.lock index 45f7be4e2..5a66ad03a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2226,9 +2226,9 @@ lodash.uniqby@^4.7.0: integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI= lodash@^4.17.12, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + version "4.17.23" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a" + integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w== longest@^2.0.1: version "2.0.1"