Remove obsolete platforms from GitHub Actions

IB-7703

Signed-off-by: Raul Metsma <raul@metsma.ee>

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        target: [osx, ios, iossimulator, androidarm, androidarm64, androidx86, androidx86_64]
+        target: [osx, ios, iossimulator, androidarm, androidarm64, androidx86_64]
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -138,24 +138,18 @@ jobs:
     runs-on: ${{ matrix.image }}
     strategy:
       matrix:
-        toolset: [143, 142, 141]
+        toolset: [143, 142]
         include:
         - toolset: 143
           image: windows-2022
-          vcver: 14.34
           vcvars: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         - toolset: 142
           image: windows-2019
-          vcver: 14.29
-          vcvars: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat"
-        - toolset: 141
-          image: windows-2019
-          vcver: 14.16
           vcvars: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat"
     env:
       MAKEFLAGS: ""
       VER_SUFFIX: .VS${{ matrix.toolset }}
-      VERSION: 3.15.0.${{ github.run_number }}
+      VERSION: 3.16.0.${{ github.run_number }}
       VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/patches/vcpkg-triplets
       VCPKG_OVERLAY_PORTS: ${{ github.workspace }}/patches/vcpkg-ports
     steps:
@@ -184,7 +178,6 @@ jobs:
           -msiversion $env:VERSION `
           -toolset ${{ matrix.toolset }} `
           -vcvars "${{ matrix.vcvars }}" `
-          -vcver "${{ matrix.vcver }}" `
           -swig C:/ProgramData/chocolatey/bin/swig.exe `
           -doxygen "C:/Program files/doxygen/bin/doxygen.exe"
     - name: Archive artifacts

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16)
 if(POLICY CMP0122)
   cmake_policy(SET CMP0122 NEW)
 endif()
-project(libdigidocpp VERSION 3.15.0)
+project(libdigidocpp VERSION 3.16.0)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 
 include(VersionInfo)

README.md

@@ -58,7 +58,7 @@
         git clone --recursive https://github.com/open-eid/libdigidocpp
         cd libdigidocpp
 
-3. Prepare dependencies (available targets: osx, ios, iossimulator, androidarm, androidarm64, androidx86)
+3. Prepare dependencies (available targets: osx, ios, iossimulator, androidarm, androidarm64, androidx86_64)
 
         sh prepare_osx_build_environment.sh osx all
 
@@ -72,7 +72,7 @@
 	* swig - Optional, for C# and Java bindings
 	* openjdk - Optional, for Java bindings
 
-5. Configure, build and install (available targets: osx, ios, iossimulator, androidarm, androidarm64, androidx86)
+5. Configure, build and install (available targets: osx, ios, iossimulator, androidarm, androidarm64, androidx86_64)
 
         ./build-library.sh osx install
 
@@ -92,7 +92,6 @@
 	* [Java](https://www.oracle.com/java/technologies/downloads/) - Optional, for Java bindings
 
    Toolset:
-	* 141 - Visual Studio 2017
 	* 142 - Visual Studio 2019 (Default)
 	* 143 - Visual Studio 2022
 
@@ -115,7 +114,7 @@
 
    Optional CMake parameters:
 
-       -DSWIG_EXECUTABLE=C:/swigwin-4.0.2/swig.exe
+       -DSWIG_EXECUTABLE=C:/swigwin-4.1.1/swig.exe
 
    After running the cmake build, digidoc_csharp.dll along with the C# source files will be created, more info at
    [examples/DigiDocCSharp/README.md](examples/DigiDocCSharp/README.md).

build-library.sh

@@ -40,7 +40,7 @@ case "$@" in
   : ${ANDROID_NDK_HOME:=$(ls -d /Volumes/android-ndk-r*/AndroidNDK*.app/Contents/NDK)}
   TARGET_PATH=/Library/libdigidocpp.${TARGET}
   CMAKEARGS="
-    -DCMAKE_FIND_ROOT_PATH=${TARGET_PATH};/usr/local \
+    -DCMAKE_FIND_ROOT_PATH=${TARGET_PATH};/usr/local;/opt/homebrew \
     -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
     -DANDROID_PLATFORM=28 \
     -DANDROID_ABI=${ARCH} \

build.ps1

@@ -4,7 +4,7 @@ param(
   [string]$vcpkg = "vcpkg\vcpkg.exe",
   [string]$vcpkg_dir = (split-path -parent $vcpkg),
   [string]$buildver = "0",
-  [string]$msiversion = "3.15.0.$buildver",
+  [string]$msiversion = "3.16.0.$buildver",
   [string]$msi_name = "libdigidocpp-$msiversion$env:VER_SUFFIX.msi",
   [string]$cmake = "cmake.exe",
   [string]$generator = "NMake Makefiles",
@@ -25,7 +25,6 @@ param(
 
 if (!$vcvars) {
   switch ($toolset) {
-  '141' { $vcvars = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" }
   '142' { $vcvars = "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" }
   '143' { $vcvars = "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" }
   }

examples/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 

libdigidocpp.wxs

@@ -3,8 +3,6 @@
 <?define VCVER = "143" ?>
 <?elseif $(env.VisualStudioVersion) = "16.0" ?>
 <?define VCVER = "142" ?>
-<?elseif $(env.VisualStudioVersion) = "15.0" ?>
-<?define VCVER = "141" ?>
 <?endif?>
 <?define VCPKG_X86 = "$(var.vcpkg)\installed\x86-$(var.vcpkg_suffix)\bin" ?>
 <?define VCPKG_X64 = "$(var.vcpkg)\installed\x64-$(var.vcpkg_suffix)\bin" ?>

prepare_osx_build_environment.sh

@@ -258,7 +258,7 @@ function openssl {
                 case "${ARGS}" in
                 *simulator*) CC="" CFLAGS="" ./Configure iossimulator-xcrun --prefix=${TARGET_PATH} no-shared no-dso no-hw no-engine no-tests no-ui-console no-stdio enable-ec_nistp_64_gcc_128;;
                 *catalyst*) CC="" CFLAGS="-target x86_64-apple-ios-macabi" KERNEL_BITS=64 ./config --prefix=${TARGET_PATH} no-shared no-dso no-hw no-engine no-tests no-ui-console no-stdio enable-ec_nistp_64_gcc_128 ;;
-                *) CC="" CFLAGS="" KERNEL_BITS=64 ./config --prefix=${TARGET_PATH} shared no-hw no-engine no-tests enable-ec_nistp_64_gcc_128
+                *) CC="" CFLAGS="" MACHINE=x86_64 KERNEL_BITS=64 ./config --prefix=${TARGET_PATH} shared no-hw no-engine no-tests enable-ec_nistp_64_gcc_128
                 esac
                 ;;
             *arm64*)

prepare_win_build_environment.ps1

@@ -3,7 +3,7 @@ param(
 	[string]$vcpkg = "vcpkg\vcpkg.exe",
 	[string]$git = "git.exe",
 	[string]$7zip = "C:\Program Files\7-Zip\7z.exe",
-	[string]$toolset = "141",
+	[string]$toolset = "142",
 	[string]$xsdver = "xsd-4.0.0-i686-windows",
 	[switch]$openssl = $false,
 	[switch]$xerces = $false,

src/digidoc-tool.1.cmake

@@ -69,4 +69,4 @@ All commands:
     --loglevel=[0,1,2,3,4] - Log level 0 - none, 1 - error, 2 - warning, 3 - info, 4 - debug
     --logfile=      - File to log, empty to console
 .SH SEE ALSO
-cdigidoc(1), qdigidoc4(1)
+qdigidoc4(1)