wip

Author: AlexandrePTJ

.github/workflows/main.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        qt_version: [6.7.2, 5.15.2]
+        qt_version: [6.9.2]
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3
@@ -30,12 +30,6 @@ jobs:
       - name: Install dev dependencies
         run: sudo apt install libxss-dev libxkbcommon-x11-dev libxcb-cursor0
 
-      - if: startsWith(matrix.qt_version, '6')
-        name: Build OpenSSLv3
-        run: |
-          cd $IQTA_TOOLS/OpenSSLv3/src
-          ./Configure && make -j3
-
       - name: Configure
         run: |
           cmake --preset release
@@ -44,25 +38,9 @@ jobs:
         run: |
           cmake --build --preset release
 
-      - if: startsWith(matrix.qt_version, '6')
-        name: Create Linux package
-        run: |
-          sudo add-apt-repository universe
-          sudo apt install libfuse2
-          chmod +x bundle/linux/create_appimage.sh
-          ./bundle/linux/create_appimage.sh -q $Qt6_DIR -b cmake-build-release -o $IQTA_TOOLS/OpenSSLv3/src
-
-      # Create release if on built on a tag
-      - if: startsWith(matrix.qt_version, '6') && startsWith(github.ref, 'refs/tags/')
-        name: Create/Update release
-        uses: ncipollo/release-action@v1
-        with:
-          allowUpdates: true
-          draft: true
-          artifacts: 'Kemai-*.AppImage'
 
   WindowsJob:
-    name: Windows Qt-6.7.2
+    name: Windows
     runs-on: windows-latest
     steps:
       - name: Checkout repo
@@ -74,7 +52,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: '6.7.2'
+          version: '6.9.2'
           tools: 'tools_opensslv3_x64'
           cache: true
           aqtversion: '==3.1.*'
@@ -104,7 +82,7 @@ jobs:
           artifacts: 'cmake-build-release-win/Kemai-*.msi'
 
   MacOSJob:
-    name: MacOS Qt-6.7.2
+    name: MacOS
     runs-on: macos-latest
     strategy:
       matrix:
@@ -119,7 +97,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: '6.7.2'
+          version: '6.9.2'
           cache: true
           aqtversion: '==3.1.*'
 

CMakeLists.txt

@@ -20,19 +20,19 @@ if (KEMAI_BUILD_LOCAL_DEPENDENCIES)
     include(FetchContent)
     FetchContent_Declare(fmt
             GIT_REPOSITORY https://github.com/fmtlib/fmt
-            GIT_TAG 11.0.2
+            GIT_TAG 12.1.0
             OVERRIDE_FIND_PACKAGE)
     FetchContent_Declare(magic_enum
             GIT_REPOSITORY https://github.com/Neargye/magic_enum.git
             GIT_TAG v0.9.7
             OVERRIDE_FIND_PACKAGE)
     FetchContent_Declare(spdlog
             GIT_REPOSITORY https://github.com/gabime/spdlog.git
-            GIT_TAG v1.15.0
+            GIT_TAG v1.15.3
             OVERRIDE_FIND_PACKAGE)
     FetchContent_Declare(json
             GIT_REPOSITORY https://github.com/nlohmann/json.git
-            GIT_TAG v3.11.3
+            GIT_TAG v3.12.0
             OVERRIDE_FIND_PACKAGE)
 endif (KEMAI_BUILD_LOCAL_DEPENDENCIES)
 

CMakePresets.json

@@ -21,7 +21,7 @@
       "name": "default-windows",
       "hidden": true,
       "cacheVariables": {
-        "CMAKE_PREFIX_PATH": "c:/Qt/6.7.3/msvc2019_64",
+        "CMAKE_PREFIX_PATH": "c:/Qt/6.10.2/msvc2022_64",
         "CMAKE_INSTALL_PREFIX": "dist"
       }
     },
@@ -48,19 +48,31 @@
     },
     {
       "name": "debug-win",
-      "inherits": ["default-windows", "debug"]
+      "inherits": [
+        "default-windows",
+        "debug"
+      ]
     },
     {
       "name": "release-win",
-      "inherits": ["default-windows", "release"]
+      "inherits": [
+        "default-windows",
+        "release"
+      ]
     },
     {
       "name": "release-macos",
-      "inherits": ["default-macos", "release"]
+      "inherits": [
+        "default-macos",
+        "release"
+      ]
     },
     {
       "name": "release-macos-noupdate",
-      "inherits": ["default-macos", "release"],
+      "inherits": [
+        "default-macos",
+        "release"
+      ],
       "cacheVariables": {
         "KEMAI_ENABLE_UPDATE_CHECK": "OFF"
       }
@@ -92,4 +104,4 @@
       "configurePreset": "release-macos-noupdate"
     }
   ]
-}
+}