Increase version number

Signed-off-by: Raul Metsma <[email protected]>

Author: metsma

.github/workflows/cmake-linux-ubuntu.yml

@@ -17,7 +17,7 @@ jobs:
     container: ubuntu:${{matrix.container}}
     strategy:
       matrix:
-        container: ['22.04', '24.04', '24.10', '25.04']
+        container: ['22.04', '24.04', '25.04']
         arch: ['amd64', 'arm64']
 
     steps:

.github/workflows/cmake-macos.yml

@@ -10,7 +10,7 @@ env:
   GTest_ROOT: ${{ github.workspace }}/gtest-binary
   QT_QPA_PLATFORM: offscreen
   CMAKE_BUILD_PARALLEL_LEVEL: 3
-  MACOSX_DEPLOYMENT_TARGET: 12.0
+  MACOSX_DEPLOYMENT_TARGET: 13.0
 
 jobs:
   build:
@@ -39,16 +39,16 @@ jobs:
             -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
             -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
             -DCMAKE_INSTALL_PREFIX=${GTest_ROOT} \
-            -DCMAKE_CXX_STANDARD=17
+            -DCMAKE_CXX_STANDARD=20
           cmake --build gtest-build --target install
 
       - name: Build OpenSSL
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
-          git clone --depth=1 https://github.com/openssl/openssl.git -b openssl-3.0
+          git clone --depth=1 https://github.com/openssl/openssl.git -b openssl-3.5
           cd openssl
           for ARCH in x86_64 arm64; do
-            ./Configure darwin64-${ARCH} --prefix=${OPENSSL_ROOT_DIR} no-shared no-module no-tests enable-ec_nistp_64_gcc_128
+            ./Configure darwin64-${ARCH} --prefix=${OPENSSL_ROOT_DIR} no-apps no-shared no-module no-tests enable-ec_nistp_64_gcc_128
             MAKEFLAGS=-j1 make -s install_sw
             mv ${OPENSSL_ROOT_DIR}{,.${ARCH}}
             make distclean
@@ -64,7 +64,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: 6.7.3
+          version: 6.9.1
           arch: clang_64
 
       - name: Configure

.github/workflows/cmake-windows.yml

@@ -9,15 +9,10 @@ env:
 
 jobs:
   build:
-    runs-on: ${{ matrix.image }}
+    runs-on: windows-2022
     strategy:
       matrix:
-        vcver: [142, 143]
-        include:
-        - vcver: 142
-          image: windows-2019
-        - vcver: 143
-          image: windows-2022
+        arch: [x64, arm64]
 
     steps:
       - name: Checkout code
@@ -29,26 +24,26 @@ jobs:
         uses: lukka/run-vcpkg@v7
         with:
           vcpkgArguments: gtest openssl
-          vcpkgTriplet: x64-windows
-          vcpkgGitCommitId: 1f619be01b436b796dab797dd1e1721c5676f8ac
+          vcpkgTriplet: ${{matrix.arch}}-windows
+          vcpkgGitCommitId: 031ad89ce6c575df35a8e58707ad2c898446c63e
 
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: 6.7.3
-          arch: win64_msvc2019_64
+          version: 6.9.1
+          arch: ${{ matrix.arch == 'arm64' && 'win64_msvc2022_arm64_cross_compiled' || 'win64_msvc2022_64' }}
 
       - name: Setup MS Visual C++ dev env
         uses: ilammy/msvc-dev-cmd@v1
         with:
-          arch: x64
+          arch: ${{ matrix.arch == 'arm64' && 'amd64_arm64' || 'amd64' }}
 
       - name: Install WiX
         run: |
-          dotnet tool install --global wix --version 5.0.2
-          wix extension -g add WixToolset.UI.wixext/5.0.2
-          wix extension -g add WixToolset.Util.wixext/5.0.2
-          wix extension -g add WixToolset.BootstrapperApplications.wixext/5.0.2
+          dotnet tool install --global wix --version 6.0.1
+          wix extension -g add WixToolset.UI.wixext/6.0.1
+          wix extension -g add WixToolset.Util.wixext/6.0.1
+          wix extension -g add WixToolset.BootstrapperApplications.wixext/6.0.1
 
       - name: Configure
         run: |
@@ -63,12 +58,13 @@ jobs:
           cmake --build build --config ${env:BUILD_TYPE} --target bundle
 
       - name: Test
+        if: ${{ matrix.arch == 'x64' }}
         run: ctest -V -C ${env:BUILD_TYPE} --test-dir build
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: web-eid-app-windows-build-VC${{matrix.vcver}}-${{github.run_number}}
+          name: web-eid-app-windows-build-${{matrix.arch}}-${{github.run_number}}
           path: |
             build/src/app/*.msi
             build/src/app/*.exe

CMakeLists.txt

@@ -11,7 +11,7 @@ elseif($ENV{CI_PIPELINE_IID})
 else()
     set(BUILD_NUMBER 0)
 endif()
-project(web-eid VERSION 2.7.0.${BUILD_NUMBER})
+project(web-eid VERSION 2.8.0.${BUILD_NUMBER})
 
 set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION_TWEAK})
@@ -33,8 +33,6 @@ set(CROSSSIGNCERT "" CACHE STRING "Common name of certificate to used cross sign
 set(SAFARI_PROVISIONPROFILE "" CACHE STRING "Provision profile to include in application (macOS)")
 
 find_package(Qt6 6.2.0 REQUIRED COMPONENTS Core Widgets Network Test LinguistTools SvgWidgets)
-get_target_property(qtCore_install_prefix Qt6::qmake IMPORTED_LOCATION)
-get_filename_component(qtCore_install_prefix ${qtCore_install_prefix} DIRECTORY)
 
 add_subdirectory(lib/libelectronic-id)
 

install/web-eid.wxs

@@ -8,10 +8,10 @@
 <?define VCVER = "142" ?>
 <?endif?>
 
-<?if $(sys.BUILDARCH) = x64 ?>
-  <?define ssl_suffix = "-x64" ?>
-<?else?>
+<?if $(sys.BUILDARCH) = x86 ?>
   <?define ssl_suffix = "" ?>
+<?else?>
+  <?define ssl_suffix = "-$(sys.BUILDARCH)" ?>
 <?endif?>
 
 <?if $(var.qt_suffix) = "d" ?>
@@ -85,21 +85,15 @@
         <File Source="$(var.qt_path)\Qt6Network$(var.qt_suffix).dll" />
         <File Source="$(var.qt_path)\Qt6Svg$(var.qt_suffix).dll" />
         <File Source="$(var.qt_path)\Qt6Widgets$(var.qt_suffix).dll" />
+        <File Source="$(var.qt_path)\Qt6SvgWidgets$(var.qt_suffix).dll" />
+<?if $(sys.BUILDARCH) != arm64 ?>
         <File Source="$(var.qt_path)\D3DCompiler_47.dll" />
         <File Source="$(var.qt_path)\opengl32sw.dll" />
-        <File Source="$(var.qt_path)\Qt6SvgWidgets$(var.qt_suffix).dll" />
-        <Directory Id="platforms" Name="platforms">
-          <File Source="$(var.qt_path)\..\plugins\platforms\qwindows$(var.qt_suffix).dll" />
-        </Directory>
-        <Directory Id="styles" Name="styles">
-          <File Source="$(var.qt_path)\..\plugins\styles\qmodernwindowsstyle$(var.qt_suffix).dll" />
-        </Directory>
-        <Directory Id="imageformats" Name="imageformats">
-          <File Source="$(var.qt_path)\..\plugins\imageformats\qsvg$(var.qt_suffix).dll" />
-        </Directory>
-        <Directory Id="tls" Name="tls">
-          <File Source="$(var.qt_path)\..\plugins\tls\qopensslbackend$(var.qt_suffix).dll" />
-        </Directory>
+<?endif?>
+        <File Subdirectory="platforms" Source="$(var.qt_path)\..\plugins\platforms\qwindows$(var.qt_suffix).dll" />
+        <File Subdirectory="styles" Source="$(var.qt_path)\..\plugins\styles\qmodernwindowsstyle$(var.qt_suffix).dll" />
+        <File Subdirectory="imageformats" Source="$(var.qt_path)\..\plugins\imageformats\qsvg$(var.qt_suffix).dll" />
+        <File Subdirectory="tls" Source="$(var.qt_path)\..\plugins\tls\qopensslbackend$(var.qt_suffix).dll" />
 <?endif?>
         <Component Id="ChromeEdge" Transitive="yes" Condition="(CHROMEINSTALL = 1 OR EDGEINSTALL = 1)">
           <File Source="$(var.json)" />

src/app/CMakeLists.txt

@@ -15,20 +15,15 @@ set_property(SOURCE web-eid.rc APPEND PROPERTY COMPILE_DEFINITIONS
 target_link_libraries(web-eid controller ui pcsc)
 
 if(WIN32)
-    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-        set(PLATFORM x64)
-    else()
-        set(PLATFORM x86)
-    endif()
     if(OPENSSL_ROOT_DIR)
         set(SSL_PATH "${OPENSSL_ROOT_DIR}/bin")
     else()
         get_filename_component(SSL_PATH "${OPENSSL_INCLUDE_DIR}/../bin" ABSOLUTE)
     endif()
     set(WEBEID_PATH web-eid.exe)
-    set(BASE_FILE $<TARGET_NAME:web-eid>_${PROJECT_VERSION}.${PLATFORM})
+    set(BASE_FILE $<TARGET_NAME:web-eid>_${PROJECT_VERSION}.$ENV{PLATFORM})
     set(WIX_CMD wix.exe build -nologo
-        -arch ${PLATFORM}
+        -arch $ENV{PLATFORM}
         -ext WixToolset.UI.wixext
         -bv WixUIDialogBmp=${CMAKE_SOURCE_DIR}/install/dlgbmp.bmp
         -d ssl_path="${SSL_PATH}"
@@ -45,7 +40,7 @@ if(WIN32)
     add_custom_target(installer DEPENDS web-eid
         COMMAND ${WIX_CMD} -o "${BASE_FILE}.msi"
         #Build MSI with QT
-        COMMAND ${WIX_CMD} -d qt_path=${qtCore_install_prefix} -o "${BASE_FILE}.qt.msi"
+        COMMAND ${WIX_CMD} -d qt_path=${Qt6_DIR}/../../../bin -o "${BASE_FILE}.qt.msi"
         WORKING_DIRECTORY $<TARGET_FILE_DIR:web-eid>
     )
     add_custom_target(bundle DEPENDS installer
@@ -93,7 +88,7 @@ elseif(APPLE)
     install(FILES ${CMAKE_SOURCE_DIR}/install/ncibgoaomkmdpilpocfeponihegamlic.json COMPONENT chrome
         DESTINATION "/Library/Application Support/Google/Chrome/External Extensions")
     add_custom_target(macdeployqt DEPENDS web-eid
-        COMMAND ${qtCore_install_prefix}/macdeployqt $<TARGET_BUNDLE_DIR:web-eid>
+        COMMAND Qt6::macdeployqt $<TARGET_BUNDLE_DIR:web-eid>
     )
     add_custom_target(installer-native DEPENDS macdeployqt
         COMMAND rm -rf root_native
@@ -153,7 +148,7 @@ else()
     option(BUNDLE_XPI "Download and bundle the Firefox extension" OFF)
     include(GNUInstallDirs)
     if (BUNDLE_XPI)
-      file(DOWNLOAD ${FIREFOX_URL} ${CMAKE_CURRENT_BINARY_DIR}/${FIREFOX_UUID}.xpi)
+        file(DOWNLOAD ${FIREFOX_URL} ${CMAKE_CURRENT_BINARY_DIR}/${FIREFOX_UUID}.xpi)
     endif()
     set(WEBEID_PATH ${CMAKE_INSTALL_FULL_BINDIR}/web-eid)
     install(TARGETS web-eid DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -177,7 +172,7 @@ else()
     install(FILES ${CMAKE_SOURCE_DIR}/install/web-eid.desktop
         DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
     if (BUNDLE_XPI)
-      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${FIREFOX_UUID}.xpi
+        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${FIREFOX_UUID}.xpi
               DESTINATION ${CMAKE_INSTALL_DATADIR}/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384})
     endif()
     foreach(RES 16 32 128 256 512)

src/app/main.cpp

@@ -30,8 +30,6 @@
 
 int main(int argc, char* argv[])
 {
-    Q_INIT_RESOURCE(web_eid_resources);
-
     Application app(argc, argv, QStringLiteral("web-eid"));
 
     try {

src/controller/utils/observer_ptr.hpp

@@ -1,3 +1,25 @@
+/*
+ * Copyright (c) 2020-2024 Estonian Information System Authority
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 #pragma once
 
 // Non-owning observing pointer.

src/mac/CMakeLists.txt

@@ -56,7 +56,7 @@ add_custom_command(TARGET web-eid-safari POST_BUILD
 )
 
 add_custom_target(macdeployqt-safari DEPENDS web-eid-safari
-    COMMAND ${qtCore_install_prefix}/macdeployqt $<TARGET_BUNDLE_DIR:web-eid-safari>
+    COMMAND Qt6::macdeployqt $<TARGET_BUNDLE_DIR:web-eid-safari> -appstore-compliant
 )
 
 # Installer

src/mac/main.mm

@@ -171,8 +171,6 @@ void showSafariSettings() final
 
 int main(int argc, char* argv[])
 {
-    Q_INIT_RESOURCE(web_eid_resources);
-
     SafariApplication app(argc, argv, QStringLiteral("web-eid-safari"));
     auto appPtr = &app;