Increase minimum android NDK to 28

build-library.sh

@@ -42,7 +42,7 @@ case "$@" in
   CMAKEARGS="
     -DCMAKE_FIND_ROOT_PATH=${TARGET_PATH};/usr/local \
     -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
-    -DANDROID_PLATFORM=21 \
+    -DANDROID_PLATFORM=28 \
     -DANDROID_ABI=${ARCH} \
     -DBoost_INCLUDE_DIR=NOTFOUND \
     -DDOXYGEN_EXECUTABLE=NOTFOUND \
@@ -63,7 +63,7 @@ case "$@" in
     SYSROOT=macosx
     export CFLAGS="-target x86_64-apple-ios-macabi"
     export CXXFLAGS="-target x86_64-apple-ios-macabi"
-    : ${ARCHS:="x86_64"}
+    : ${ARCHS:="x86_64 arm64"}
     ;;
   *)
     echo "Building for iOS"
@@ -76,8 +76,6 @@ case "$@" in
   : ${IPHONEOS_DEPLOYMENT_TARGET:="12.0"}
   export IPHONEOS_DEPLOYMENT_TARGET
   CMAKEARGS="
-    -DCMAKE_C_COMPILER_WORKS=yes \
-    -DCMAKE_CXX_COMPILER_WORKS=yes \
     -DCMAKE_OSX_SYSROOT=${SYSROOT} \
     -DFRAMEWORK=off \
     -DUSE_KEYCHAIN=off \
@@ -97,7 +95,7 @@ case "$@" in
 esac
 
 cmake --fresh -B ${TARGET} -S . \
-    -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     -DCMAKE_INSTALL_PREFIX=${TARGET_PATH} \
     -DCMAKE_OSX_ARCHITECTURES="${ARCHS// /;}" \
     -DOPENSSL_ROOT_DIR=${TARGET_PATH} \

examples/android/app/build.gradle

@@ -6,7 +6,7 @@ android {
     compileSdk 33
     defaultConfig {
         applicationId "ee.ria.libdigidocpp"
-        minSdk 21
+        minSdk 28
         targetSdk 33
         versionCode 1
         versionName "1.0"

examples/android/build.gradle

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

examples/android/gradle.properties

@@ -16,4 +16,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=false
+org.gradle.unsafe.configuration-cache=true

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-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

examples/ios/libdigidocpp.xcodeproj/project.pbxproj

@@ -372,6 +372,8 @@
 					"$(MINIZIP)",
 				);
 				INFOPLIST_FILE = libdigidocpp/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = Libdigidocpp;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.xib;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
@@ -420,6 +422,8 @@
 					"$(MINIZIP)",
 				);
 				INFOPLIST_FILE = libdigidocpp/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = Libdigidocpp;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.xib;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";

patches/README.md

@@ -1,5 +1,4 @@
 # Android patches
-* android-iconv - arm64
 * MsgCreator - macOS prebuild binary for Xalan-C cross compiling
 
 # iOS patches