Merging with main

GIBIS-UNIFESP · Oct 16, 2024 · 730662e · 730662e
2 parents 677f460 + 8960bb2
commit 730662e
Show file tree

Hide file tree

Showing 159 changed files with 187 additions and 188 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-# Copyright 2015 - 2022, GIBIS-Unifesp and the WiRedPanda contributors
+# Copyright 2015 - 2024, GIBIS-Unifesp and the WiRedPanda contributors
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 name: Build
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        qt_version: [5.12.12, 5.13.2, 5.14.2, 5.15.2, 6.2.4, 6.3.2, 6.4.3, 6.5.2, 6.6.0]
+        qt_version: [5.12.12, 5.13.2, 5.14.2, 5.15.2, 6.2.4, 6.3.2, 6.4.3, 6.5.3, 6.6.3, 6.7.3]
 
 # =================================
 
@@ -20,27 +20,25 @@ jobs:
 
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
         fetch-depth: 0
 
     - name: Install Qt5
       if: startsWith(matrix.qt_version, '5')
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         version: ${{ matrix.qt_version }}
         cache: true
-        aqtversion: ==3.1.7
 
     - name: Install Qt6
       if: startsWith(matrix.qt_version, '6')
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         version: ${{ matrix.qt_version }}
         modules: qtmultimedia
         cache: true
-        aqtversion: ==3.1.7
 
     - name: ccache
       uses: hendrikmuhs/ccache-action@v1.2
@@ -68,7 +66,7 @@ jobs:
 
     - name: Setup MSVC Toolchain
       if: runner.os == 'Windows'
-      uses: seanmiddleditch/gha-setup-vsdevenv@v4
+      uses: pbeast/gha-setup-vsdevenv@master
 
     - name: Build Windows
       if: runner.os == 'Windows'
@@ -86,13 +84,14 @@ jobs:
         jom check
 
 # =================================
+# https://bugreports.qt.io/browse/QTBUG-117225
 
     - name: Build macOS
       if: runner.os == 'macOS'
       run: |
         mkdir build
         cd build
-        qmake ../WPanda.pro
+        qmake ../WPanda.pro -early QMAKE_DEFAULT_LIBDIRS=$(xcrun -show-sdk-path)/usr/lib
         make -j3
 
     - name: Test macOS

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -1,3 +1,6 @@
+# Copyright 2015 - 2024, GIBIS-Unifesp and the WiRedPanda contributors
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 name: "CodeQL"
 
 on:
@@ -20,19 +23,18 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
 
-    - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+    - name: Install Qt5
+      uses: jurplel/install-qt-action@v4
       with:
         version: 5.15.2
         cache: true
-        aqtversion: ==3.1.6
 
     - name: ccache
       uses: hendrikmuhs/ccache-action@v1.2
@@ -53,4 +55,4 @@ jobs:
         ./WPanda-test -platform offscreen
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -1,4 +1,4 @@
-# Copyright 2015 - 2022, GIBIS-Unifesp and the WiRedPanda contributors
+# Copyright 2015 - 2024, GIBIS-Unifesp and the WiRedPanda contributors
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 name: Coverage
@@ -13,17 +13,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
         fetch-depth: 0
 
-    - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+    - name: Install Qt5
+      uses: jurplel/install-qt-action@v4
       with:
         version: 5.12.12
         cache: true
-        aqtversion: ==3.1.6
 
     - name: ccache
       uses: hendrikmuhs/ccache-action@v1.2

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,4 +1,4 @@
-# Copyright 2015 - 2022, GIBIS-Unifesp and the WiRedPanda contributors
+# Copyright 2015 - 2024, GIBIS-Unifesp and the WiRedPanda contributors
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 name: Deploy
@@ -19,27 +19,25 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
         fetch-depth: 0
 
-    - name: Install Qt 32bit
+    - name: Install Qt5 32bit
       if: matrix.os == 'windows-latest'
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         version: 5.15.2
         cache: true
-        aqtversion: ==3.1.6
         arch: win32_msvc2019
 
-    - name: Install Qt 64bit
+    - name: Install Qt5 64bit
       if: matrix.os != 'windows-latest'
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         version: 5.15.2
         cache: true
-        aqtversion: ==3.1.6
 
     - name: ccache
       uses: hendrikmuhs/ccache-action@v1.2
@@ -77,7 +75,7 @@ jobs:
         mv WiRedPanda-4-x86_64.AppImage WiRedPanda-Ubuntu-Qt5.AppImage
 
     - name: Publish Ubuntu
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       if: runner.os == 'Linux'
       with:
         fail_on_unmatched_files: true
@@ -87,7 +85,7 @@ jobs:
 
     - name: Setup MSVC Toolchain
       if: startsWith(matrix.os, 'windows')
-      uses: seanmiddleditch/gha-setup-vsdevenv@v4
+      uses: pbeast/gha-setup-vsdevenv@master
       with:
         arch: x86
 
@@ -119,20 +117,21 @@ jobs:
         Compress-Archive -Path wpanda -DestinationPath WiRedPanda-Windows-Qt5-Portable.zip
 
     - name: Publish Windows
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       if: startsWith(matrix.os, 'windows')
       with:
         fail_on_unmatched_files: true
         files: 'build/app/*.zip'
 
 # =================================
+# https://bugreports.qt.io/browse/QTBUG-117225
 
     - name: Build macOS
       if: runner.os == 'macOS'
       run: |
         mkdir build
         cd build
-        qmake ../WPanda.pro
+        qmake ../WPanda.pro -early QMAKE_DEFAULT_LIBDIRS=$(xcrun -show-sdk-path)/usr/lib
         make -j3
 
     - name: Test macOS
@@ -149,7 +148,7 @@ jobs:
         mv wiredpanda.dmg WiRedPanda-macOS-Qt5.dmg
 
     - name: Publish macOS
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       if: runner.os == 'macOS'
       with:
         fail_on_unmatched_files: true

diff --git a/app/arduino/codegenerator.cpp b/app/arduino/codegenerator.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "codegenerator.h"

diff --git a/app/arduino/codegenerator.h b/app/arduino/codegenerator.h
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once

diff --git a/app/bewaveddolphin.cpp b/app/bewaveddolphin.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "bewaveddolphin.h"

diff --git a/app/bewaveddolphin.h b/app/bewaveddolphin.h
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once

diff --git a/app/clockdialog.cpp b/app/clockdialog.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "clockdialog.h"

diff --git a/app/clockdialog.h b/app/clockdialog.h
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once

diff --git a/app/commands.cpp b/app/commands.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "commands.h"

diff --git a/app/commands.h b/app/commands.h
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once

diff --git a/app/common.cpp b/app/common.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "common.h"

diff --git a/app/common.h b/app/common.h
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once

diff --git a/app/element/and.cpp b/app/element/and.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "and.h"

diff --git a/app/element/and.h b/app/element/and.h
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once

diff --git a/app/element/buzzer.cpp b/app/element/buzzer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "buzzer.h"

diff --git a/app/element/buzzer.h b/app/element/buzzer.h
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once

diff --git a/app/element/clock.cpp b/app/element/clock.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "clock.h"

diff --git a/app/element/clock.h b/app/element/clock.h
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once

diff --git a/app/element/demux.cpp b/app/element/demux.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "demux.h"

diff --git a/app/element/demux.h b/app/element/demux.h
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once

diff --git a/app/element/dflipflop.cpp b/app/element/dflipflop.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "dflipflop.h"

diff --git a/app/element/dflipflop.h b/app/element/dflipflop.h
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once

diff --git a/app/element/display_14.cpp b/app/element/display_14.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "display_14.h"

diff --git a/app/element/display_14.h b/app/element/display_14.h
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once

diff --git a/app/element/display_7.cpp b/app/element/display_7.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "display_7.h"

diff --git a/app/element/display_7.h b/app/element/display_7.h
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once

diff --git a/app/element/dlatch.cpp b/app/element/dlatch.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "dlatch.h"

diff --git a/app/element/dlatch.h b/app/element/dlatch.h
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once

diff --git a/app/element/inputbutton.cpp b/app/element/inputbutton.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "inputbutton.h"

diff --git a/app/element/inputbutton.h b/app/element/inputbutton.h
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once

diff --git a/app/element/inputgnd.cpp b/app/element/inputgnd.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015 - 2022, GIBIS-UNIFESP and the wiRedPanda contributors
+// Copyright 2015 - 2024, GIBIS-UNIFESP and the wiRedPanda contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "inputgnd.h"