Increase version number

IB-7539

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

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

@@ -16,52 +16,34 @@ jobs:
     container: ${{matrix.container}}
     strategy:
       matrix:
-        container: ['ubuntu:18.04', 'ubuntu:20.04', 'ubuntu:22.04']
+        container: ['ubuntu:20.04', 'ubuntu:22.04']
         include:
-        - container: 'ubuntu:18.04'
-          name: ubuntu1804
         - container: 'ubuntu:20.04'
           name: ubuntu2004
         - container: 'ubuntu:22.04'
           name: ubuntu2204
 
     steps:
-      - uses: actions/checkout@v1
-        with:
-          submodules: recursive
-
       - name: Install dependencies
-        if: matrix.container != 'ubuntu:22.04'
-        run: apt update -qq && apt install --no-install-recommends -y lsb-release fakeroot build-essential devscripts cdbs pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev
+        if: matrix.container == 'ubuntu:20.04'
+        run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts cdbs pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev
 
       - name: Install dependencies
-        if: matrix.container == 'ubuntu:22.04'
-        run: apt update -qq && apt install --no-install-recommends -y lsb-release fakeroot build-essential devscripts cdbs pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev
+        if: matrix.container != 'ubuntu:20.04'
+        run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts cdbs pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev
 
-      - name: Ubuntu 18.04 workarounds
-        if: matrix.container == 'ubuntu:18.04'
-        run: |
-          mkdir gtest
-          cd gtest
-          cmake /usr/src/gtest
-          cmake --build . --target install
-          apt --no-install-recommends -y install clang-10
-          echo "CC=clang-10" >> $GITHUB_ENV
-          echo "CXX=clang++-10" >> $GITHUB_ENV
-
-      - name: Create build directory
-        run: mkdir build
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
 
       - name: Configure CMake
-        working-directory: ${{github.workspace}}/build
-        run: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
+        run: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -B build -S .
 
       - name: Build
-        working-directory: ${{github.workspace}}/build
         run: |
-          cmake --build . --config $BUILD_TYPE --target installer
+          cmake --build build --config $BUILD_TYPE --target installer
           # Debian creates artifacts outside of project dir, copy them back to make them available in the build artifacts
-          cp -r ../../web-eid*.* src/app
+          cp -r ../web-eid*.* build/src/app
 
       - uses: actions/upload-artifact@v3
         with:

CMakeLists.txt

@@ -1,7 +1,4 @@
-cmake_minimum_required(VERSION 3.8.0)
-if(POLICY CMP0092)
-  cmake_policy(SET CMP0092 NEW)
-endif()
+cmake_minimum_required(VERSION 3.16)
 
 if($ENV{BUILD_NUMBER})
     set(BUILD_NUMBER $ENV{BUILD_NUMBER})
@@ -10,7 +7,7 @@ elseif($ENV{CI_PIPELINE_IID})
 else()
     set(BUILD_NUMBER 0)
 endif()
-project(web-eid VERSION 2.2.0.${BUILD_NUMBER})
+project(web-eid VERSION 2.3.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})
@@ -32,7 +29,7 @@ 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(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} 5.9.0 REQUIRED COMPONENTS Core Widgets Network Test LinguistTools Svg)
+find_package(Qt${QT_VERSION_MAJOR} 5.12.0 REQUIRED COMPONENTS Core Widgets Network Test LinguistTools Svg)
 get_target_property(qtCore_install_prefix Qt${QT_VERSION_MAJOR}::qmake IMPORTED_LOCATION)
 get_filename_component(qtCore_install_prefix ${qtCore_install_prefix} DIRECTORY)
 

src/app/CMakeLists.txt

@@ -20,7 +20,6 @@ if(WIN32)
     else()
         set(PLATFORM x86)
     endif()
-    find_package(OpenSSL REQUIRED)
     if(OPENSSL_ROOT_DIR)
         set(SSL_PATH "${OPENSSL_ROOT_DIR}/bin")
     else()

src/controller/CMakeLists.txt

@@ -1,7 +1,6 @@
 add_library(controller STATIC
     application.cpp
     application.hpp
-    $<$<BOOL:${APPLE}>:application.mm>
     certandpininfo.hpp
     command-handlers/authenticate.cpp
     command-handlers/authenticate.hpp