Update minimum OS versions

IB-7825, IB-8026 Signed-off-by: Raul Metsma <[email protected]>
open-eid · May 30, 2024 · 1ecb627 · 1ecb627
1 parent 9f83f8e
commit 1ecb627
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 116 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -84,7 +84,7 @@ jobs:
     - name: Install Deps
       run: |
         dnf install -y --setopt=install_weak_deps=False \
-          git gcc-c++ cmake rpm-build xml-security-c-devel zlib-devel vim-common doxygen boost-test swig python3-devel java-1.8.0-openjdk-devel xsd minizip-devel
+          git gcc-c++ cmake rpm-build xml-security-c-devel zlib-devel vim-common doxygen boost-test swig python3-devel java-17-openjdk-devel xsd minizip-devel
     - name: Install CMake
       if: matrix.container == 39
       run: |
@@ -118,7 +118,7 @@ jobs:
       DEBEMAIL: [email protected]
     steps:
     - name: Install dependencies
-      run: apt update -qq && apt install --no-install-recommends -y git lsb-release build-essential devscripts debhelper cmake xxd xsdcxx libxml-security-c-dev zlib1g-dev doxygen swig openjdk-8-jdk-headless libpython3-dev python3-setuptools libboost-test-dev lintian
+      run: apt update -qq && apt install --no-install-recommends -y git lsb-release build-essential devscripts debhelper cmake xxd xsdcxx libxml-security-c-dev zlib1g-dev doxygen swig openjdk-11-jdk-headless libpython3-dev python3-setuptools libboost-test-dev lintian
     - name: Checkout
       uses: actions/checkout@v4
       with:

diff --git a/.github/workflows/tar.yml b/.github/workflows/tar.yml
diff --git a/build-library.sh b/build-library.sh
@@ -8,8 +8,8 @@ if [ "$#" -eq 0 ]; then
   echo "  target: osx ios iossimulator ioscatalyst androidarm androidarm64 androidx86_64"
   echo "To control iOS, macOS builds set environment variables:"
   echo " minimum deployment target"
-  echo " - MACOSX_DEPLOYMENT_TARGET=11.0"
-  echo " - IPHONEOS_DEPLOYMENT_TARGET=13.0"
+  echo " - MACOSX_DEPLOYMENT_TARGET=12.0"
+  echo " - IPHONEOS_DEPLOYMENT_TARGET=15.0"
   echo " archs to build on macOS/iOS"
   echo " - ARCHS=\"arm64 x86_64\" (macOS)"
   echo " - ARCHS=\"arm64\" (iOS)"
@@ -37,42 +37,40 @@ case "$@" in
   TARGET_PATH=/Library/libdigidocpp.${TARGET}
   CMAKEARGS="
     -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
-    -DANDROID_PLATFORM=28 \
+    -DANDROID_PLATFORM=30 \
     -DANDROID_ABI=${ARCH} \
     -DBoost_INCLUDE_DIR=NOTFOUND \
     -DDOXYGEN_EXECUTABLE=NOTFOUND \
     -DBUILD_TOOLS=NO \
     -DBUILD_SHARED_LIBS=NO"
   ;;
 *ios*)
+  : ${IPHONEOS_DEPLOYMENT_TARGET:="15.0"}
+  export IPHONEOS_DEPLOYMENT_TARGET
   case "$@" in
   *simulator*)
     echo "Building for iOS Simulator"
     TARGET=iphonesimulator
-    SYSROOT=iphonesimulator
+    CMAKEARGS="-DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_SYSTEM_NAME=iOS"
     : ${ARCHS:="arm64 x86_64"}
     ;;
   *catalyst*)
     echo "Building for iOS macOS Catalyst"
     TARGET=iphonecatalyst
-    SYSROOT=macosx
-    export CFLAGS="-target x86_64-apple-ios-macabi"
-    export CXXFLAGS="-target x86_64-apple-ios-macabi"
+    CMAKEARGS="-DCMAKE_OSX_SYSROOT=macosx"
+    export CFLAGS="-target x86_64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET}-macabi"
+    export CXXFLAGS="-target x86_64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET}-macabi"
     : ${ARCHS:="arm64 x86_64"}
     ;;
   *)
     echo "Building for iOS"
     TARGET=iphoneos
-    SYSROOT=iphoneos
+    CMAKEARGS="-DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_SYSTEM_NAME=iOS"
     : ${ARCHS:="arm64"}
     ;;
   esac
   TARGET_PATH=/Library/libdigidocpp.${TARGET}
-  : ${IPHONEOS_DEPLOYMENT_TARGET:="13.0"}
-  export IPHONEOS_DEPLOYMENT_TARGET
-  CMAKEARGS="
-    -DCMAKE_SYSTEM_NAME=iOS \
-    -DCMAKE_OSX_SYSROOT=${SYSROOT} \
+  CMAKEARGS="${CMAKEARGS} \
     -DCMAKE_OSX_DEPLOYMENT_TARGET=${IPHONEOS_DEPLOYMENT_TARGET} \
     -DSWIG_EXECUTABLE=NOTFOUND \
     -DBoost_INCLUDE_DIR=NOTFOUND \
@@ -85,7 +83,7 @@ case "$@" in
   TARGET=macOS
   TARGET_PATH=/Library/libdigidocpp
   : ${ARCHS:="arm64 x86_64"}
-  : ${MACOSX_DEPLOYMENT_TARGET:="11.0"}
+  : ${MACOSX_DEPLOYMENT_TARGET:="12.0"}
   export MACOSX_DEPLOYMENT_TARGET
 esac
 

diff --git a/examples/DigiDocCSharp/DigiDocCSharp.csproj b/examples/DigiDocCSharp/DigiDocCSharp.csproj
@@ -2,8 +2,10 @@
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <OutputType>Exe</OutputType>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AssemblyVersion>0.4.0.0</AssemblyVersion>
+    <FileVersion>0.4.0.0</FileVersion>
+    <Copyright>Copyright ©  2015</Copyright>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <DefineConstants>_WINDOWS</DefineConstants>

diff --git a/examples/DigiDocCSharp/Properties/AssemblyInfo.cs b/examples/DigiDocCSharp/Properties/AssemblyInfo.cs
diff --git a/examples/android/app/build.gradle b/examples/android/app/build.gradle
@@ -6,7 +6,7 @@ android {
     compileSdk 34
     defaultConfig {
         applicationId "ee.ria.libdigidocpp"
-        minSdk 28
+        minSdk 30
         targetSdk 34
         versionCode 1
         versionName "1.0"
@@ -30,16 +30,16 @@ android {
     namespace 'ee.ria.libdigidocpp'
 }
 
-task schemaZip(type:Zip) {
+tasks.register('schemaZip', Zip) {
     println "Create schema zip"
-    from (libsPath + '.androidarm/etc/digidocpp/schema/') {
+    from(libsPath + '.androidarm/etc/digidocpp/schema/') {
         include '*'
     }
     destinationDirectory = file('src/main/res/raw/')
     archiveFileName = 'schema.zip'
 }
 
-task copyLibs {
+tasks.register('copyLibs') {
     println "Copy jniLibs"
     copy {
         from libsPath + '.androidarm/lib/libdigidoc_java.so'

diff --git a/examples/android/app/src/main/res/values/strings.xml b/examples/android/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Libdigidocpp</string>
+    <string name="app_name" translatable="false">Libdigidocpp</string>
     <string name="run">Run</string>
 
 </resources>
diff --git a/examples/android/build.gradle b/examples/android/build.gradle
@@ -5,10 +5,10 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.0'
+        classpath 'com.android.tools.build:gradle:8.4.0'
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register('clean', Delete) {
+    delete layout.buildDirectory
 }
diff --git a/examples/android/gradle/wrapper/gradle-wrapper.properties b/examples/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
diff --git a/examples/ios/libdigidocpp.xcodeproj/project.pbxproj b/examples/ios/libdigidocpp.xcodeproj/project.pbxproj
@@ -260,7 +260,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -312,7 +312,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;

diff --git a/examples/java/gradle/wrapper/gradle-wrapper.properties b/examples/java/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/prepare_osx_build_environment.sh b/prepare_osx_build_environment.sh
@@ -7,7 +7,7 @@ XMLSEC_DIR=xml-security-c-2.0.4
 XSD=xsd-4.0.0-i686-macosx
 OPENSSL_DIR=openssl-3.0.13
 LIBXML2_DIR=libxml2-2.11.5
-ANDROID_NDK=android-ndk-r26b
+ANDROID_NDK=android-ndk-r26d
 FREETYPE_DIR=freetype-2.10.1
 FONTCONFIG_DIR=fontconfig-2.13.1
 PODOFO_DIR=podofo-0.9.4
@@ -44,7 +44,7 @@ case "$@" in
   fi
 
   TARGET_PATH=/Library/libdigidocpp.android${ARCH}
-  API=28
+  API=30
   export ANDROID_NDK_HOME
   export ANDROID_NDK_ROOT=${ANDROID_NDK_HOME}
   export PATH=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/darwin-x86_64/bin:$PATH
@@ -62,7 +62,7 @@ case "$@" in
   CONFIGURE="--host=aarch64-apple-darwin --enable-static --disable-shared --disable-dependency-tracking"
   SYSROOT=$(xcrun -sdk iphonesimulator --show-sdk-path)
   : ${ARCHS:="arm64 x86_64"}
-  : ${IPHONEOS_DEPLOYMENT_TARGET:="13.0"}
+  : ${IPHONEOS_DEPLOYMENT_TARGET:="15.0"}
   export IPHONEOS_DEPLOYMENT_TARGET
   export CFLAGS="-arch ${ARCHS// / -arch } -isysroot ${SYSROOT}"
   ;;
@@ -72,17 +72,17 @@ case "$@" in
   CONFIGURE="--host=aarch64-apple-darwin --enable-static --disable-shared --disable-dependency-tracking"
   SYSROOT=$(xcrun -sdk macosx --show-sdk-path)
   : ${ARCHS:="arm64 x86_64"}
-  : ${IPHONEOS_DEPLOYMENT_TARGET:="13.0"}
+  : ${IPHONEOS_DEPLOYMENT_TARGET:="15.0"}
   export IPHONEOS_DEPLOYMENT_TARGET
-  export CFLAGS="-arch ${ARCHS// / -arch } -target x86_64-apple-ios-macabi -isysroot ${SYSROOT}"
+  export CFLAGS="-arch ${ARCHS// / -arch } -target x86_64-apple-ios${IPHONEOS_DEPLOYMENT_TARGET}-macabi -isysroot ${SYSROOT}"
   ;;
 *ios*)
   echo "Building for iOS"
   TARGET_PATH=/Library/libdigidocpp.iphoneos
   CONFIGURE="--host=aarch64-apple-darwin --enable-static --disable-shared --disable-dependency-tracking"
   SYSROOT=$(xcrun -sdk iphoneos --show-sdk-path)
   : ${ARCHS:="arm64"}
-  : ${IPHONEOS_DEPLOYMENT_TARGET:="13.0"}
+  : ${IPHONEOS_DEPLOYMENT_TARGET:="15.0"}
   export IPHONEOS_DEPLOYMENT_TARGET
   export CFLAGS="-arch ${ARCHS// / -arch } -isysroot ${SYSROOT}"
   ;;
@@ -92,7 +92,7 @@ case "$@" in
   CONFIGURE="--disable-static --enable-shared --disable-dependency-tracking"
   SYSROOT=$(xcrun -sdk macosx --show-sdk-path)
   : ${ARCHS:="arm64 x86_64"}
-  : ${MACOSX_DEPLOYMENT_TARGET:="11.0"}
+  : ${MACOSX_DEPLOYMENT_TARGET:="12.0"}
   export MACOSX_DEPLOYMENT_TARGET
   export CFLAGS="-arch ${ARCHS// / -arch } "
   ;;
@@ -437,8 +437,8 @@ case "$@" in
     echo "  tasks: xerces, xalan, openssl, xmlsec, xsd, all, help"
     echo "To control iOS, macOS builds set environment variables:"
     echo " minimum deployment target"
-    echo " - MACOSX_DEPLOYMENT_TARGET=11.0"
-    echo " - IPHONEOS_DEPLOYMENT_TARGET=13.0"
+    echo " - MACOSX_DEPLOYMENT_TARGET=12.0"
+    echo " - IPHONEOS_DEPLOYMENT_TARGET=15.0"
     echo " archs to build on macOS/iOS"
     echo " - ARCHS=\"arm64 x86_64\" (macOS)"
     echo " - ARCHS=\"arm64\" (iOS)"