Skip to content

Commit 15d3142

Browse files
metsmametsma
authored
Increase minimum iOS and macOS supported versions (#553)
- use more std::filesystem IB-7483 Signed-off-by: Raul Metsma <[email protected]>
1 parent 9183e9d commit 15d3142

File tree

13 files changed

+144
-254
lines changed

13 files changed

+144
-254
lines changed

‎build-library.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ if [ "$#" -eq 0 ]; then
88
echo " target: osx ios iossimulator ioscatalyst androidarm androidarm64 androidx86_64"
99
echo "To control iOS, macOS builds set environment variables:"
1010
echo " minimum deployment target"
11-
echo " - MACOSX_DEPLOYMENT_TARGET=10.15"
12-
echo " - IPHONEOS_DEPLOYMENT_TARGET=12.0"
11+
echo " - MACOSX_DEPLOYMENT_TARGET=11.0"
12+
echo " - IPHONEOS_DEPLOYMENT_TARGET=13.0"
1313
echo " archs to build on macOS/iOS"
1414
echo " - ARCHS=\"arm64 x86_64\" (macOS)"
1515
echo " - ARCHS=\"arm64\" (iOS)"
@@ -69,7 +69,7 @@ case "$@" in
6969
;;
7070
esac
7171
TARGET_PATH=/Library/libdigidocpp.${TARGET}
72-
: ${IPHONEOS_DEPLOYMENT_TARGET:="12.0"}
72+
: ${IPHONEOS_DEPLOYMENT_TARGET:="13.0"}
7373
export IPHONEOS_DEPLOYMENT_TARGET
7474
CMAKEARGS="
7575
-DCMAKE_OSX_SYSROOT=${SYSROOT} \
@@ -85,7 +85,7 @@ case "$@" in
8585
TARGET=macOS
8686
TARGET_PATH=/Library/libdigidocpp
8787
: ${ARCHS:="arm64 x86_64"}
88-
: ${MACOSX_DEPLOYMENT_TARGET:="10.15"}
88+
: ${MACOSX_DEPLOYMENT_TARGET:="11.0"}
8989
export MACOSX_DEPLOYMENT_TARGET
9090
esac
9191

‎examples/ios/libdigidocpp.xcodeproj/project.pbxproj

Lines changed: 37 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
/* Begin PBXBuildFile section */
1010
4E25CC401B5D1D85005E0B79 /* test.bdoc in Resources */ = {isa = PBXBuildFile; fileRef = 4E25CC3F1B5D1D85005E0B79 /* test.bdoc */; };
1111
4E25CC421B5D1EDA005E0B79 /* schema in Resources */ = {isa = PBXBuildFile; fileRef = 4E25CC411B5D1EDA005E0B79 /* schema */; };
12+
4E26A2292AB4E38600E2B732 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4E26A2282AB4E38600E2B732 /* LaunchScreen.storyboard */; };
1213
4E76639E1B5A37AC00672ACF /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4E76639D1B5A37AC00672ACF /* main.mm */; };
1314
4E7663A11B5A37AC00672ACF /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4E7663A01B5A37AC00672ACF /* AppDelegate.mm */; };
1415
4E7663A41B5A37AC00672ACF /* MasterViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4E7663A31B5A37AC00672ACF /* MasterViewController.mm */; };
1516
4E7663AA1B5A37AC00672ACF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4E7663A81B5A37AC00672ACF /* Main.storyboard */; };
1617
4E7663AC1B5A37AC00672ACF /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4E7663AB1B5A37AC00672ACF /* Images.xcassets */; };
17-
4E7663AF1B5A37AC00672ACF /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4E7663AD1B5A37AC00672ACF /* LaunchScreen.xib */; };
1818
4E85E5F7285364BF00A65763 /* libdigidocpp_util.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E85E5F6285364BF00A65763 /* libdigidocpp_util.a */; };
1919
4ECD5FAA2010A15A00BCC616 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4ECD5FA92010A15A00BCC616 /* libcrypto.a */; };
2020
4ECD5FB02010A1B700BCC616 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4ECD5FAB2010A1B700BCC616 /* libssl.a */; };
@@ -32,6 +32,7 @@
3232
/* Begin PBXFileReference section */
3333
4E25CC3F1B5D1D85005E0B79 /* test.bdoc */ = {isa = PBXFileReference; lastKnownFileType = file; path = test.bdoc; sourceTree = "<group>"; };
3434
4E25CC411B5D1EDA005E0B79 /* schema */ = {isa = PBXFileReference; lastKnownFileType = folder; name = schema; path = "$(SDKPATH)/etc/digidocpp/schema"; sourceTree = "<absolute>"; };
35+
4E26A2282AB4E38600E2B732 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
3536
4E7663981B5A37AC00672ACF /* libdigidocpp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = libdigidocpp.app; sourceTree = BUILT_PRODUCTS_DIR; };
3637
4E76639C1B5A37AC00672ACF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3738
4E76639D1B5A37AC00672ACF /* main.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
@@ -40,7 +41,6 @@
4041
4E7663A31B5A37AC00672ACF /* MasterViewController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MasterViewController.mm; sourceTree = "<group>"; };
4142
4E7663A91B5A37AC00672ACF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
4243
4E7663AB1B5A37AC00672ACF /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
43-
4E7663AE1B5A37AC00672ACF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
4444
4E85E5F6285364BF00A65763 /* libdigidocpp_util.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdigidocpp_util.a; path = "$(SDKPATH)/lib/libdigidocpp_util.a"; sourceTree = "<absolute>"; };
4545
4EAC9AA729125D5200A39880 /* libdigidocpp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = libdigidocpp.entitlements; sourceTree = "<group>"; };
4646
4ECD5FA92010A15A00BCC616 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "$(SDKPATH)/lib/libcrypto.a"; sourceTree = "<absolute>"; };
@@ -106,22 +106,14 @@
106106
4E7663A01B5A37AC00672ACF /* AppDelegate.mm */,
107107
4E7663A31B5A37AC00672ACF /* MasterViewController.mm */,
108108
4E7663A81B5A37AC00672ACF /* Main.storyboard */,
109+
4E26A2282AB4E38600E2B732 /* LaunchScreen.storyboard */,
109110
4E7663AB1B5A37AC00672ACF /* Images.xcassets */,
110-
4E7663AD1B5A37AC00672ACF /* LaunchScreen.xib */,
111-
4E76639B1B5A37AC00672ACF /* Supporting Files */,
112-
);
113-
path = libdigidocpp;
114-
sourceTree = "<group>";
115-
};
116-
4E76639B1B5A37AC00672ACF /* Supporting Files */ = {
117-
isa = PBXGroup;
118-
children = (
119-
4E25CC411B5D1EDA005E0B79 /* schema */,
120-
4E25CC3F1B5D1D85005E0B79 /* test.bdoc */,
121111
4E76639C1B5A37AC00672ACF /* Info.plist */,
122112
4E76639D1B5A37AC00672ACF /* main.mm */,
113+
4E25CC3F1B5D1D85005E0B79 /* test.bdoc */,
114+
4E25CC411B5D1EDA005E0B79 /* schema */,
123115
);
124-
name = "Supporting Files";
116+
path = libdigidocpp;
125117
sourceTree = "<group>";
126118
};
127119
4ECD5FA82010A15A00BCC616 /* Frameworks */ = {
@@ -170,13 +162,11 @@
170162
isa = PBXProject;
171163
attributes = {
172164
BuildIndependentTargetsInParallel = YES;
173-
LastUpgradeCheck = 1430;
165+
LastUpgradeCheck = 1500;
174166
ORGANIZATIONNAME = RIA;
175167
TargetAttributes = {
176168
4E7663971B5A37AC00672ACF = {
177169
CreatedOnToolsVersion = 6.4;
178-
DevelopmentTeam = ET847QJV9F;
179-
ProvisioningStyle = Automatic;
180170
};
181171
};
182172
};
@@ -205,8 +195,8 @@
205195
files = (
206196
4E25CC421B5D1EDA005E0B79 /* schema in Resources */,
207197
4E7663AA1B5A37AC00672ACF /* Main.storyboard in Resources */,
208-
4E7663AF1B5A37AC00672ACF /* LaunchScreen.xib in Resources */,
209198
4E7663AC1B5A37AC00672ACF /* Images.xcassets in Resources */,
199+
4E26A2292AB4E38600E2B732 /* LaunchScreen.storyboard in Resources */,
210200
4E25CC401B5D1D85005E0B79 /* test.bdoc in Resources */,
211201
);
212202
runOnlyForDeploymentPostprocessing = 0;
@@ -235,31 +225,26 @@
235225
name = Main.storyboard;
236226
sourceTree = "<group>";
237227
};
238-
4E7663AD1B5A37AC00672ACF /* LaunchScreen.xib */ = {
239-
isa = PBXVariantGroup;
240-
children = (
241-
4E7663AE1B5A37AC00672ACF /* Base */,
242-
);
243-
name = LaunchScreen.xib;
244-
sourceTree = "<group>";
245-
};
246228
/* End PBXVariantGroup section */
247229

248230
/* Begin XCBuildConfiguration section */
249231
4E7663BC1B5A37AC00672ACF /* Debug */ = {
250232
isa = XCBuildConfiguration;
251233
buildSettings = {
252234
ALWAYS_SEARCH_USER_PATHS = NO;
253-
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
235+
CLANG_ANALYZER_NONNULL = YES;
236+
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
254237
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
255238
CLANG_ENABLE_MODULES = YES;
256239
CLANG_ENABLE_OBJC_ARC = YES;
240+
CLANG_ENABLE_OBJC_WEAK = YES;
257241
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
258242
CLANG_WARN_BOOL_CONVERSION = YES;
259243
CLANG_WARN_COMMA = YES;
260244
CLANG_WARN_CONSTANT_CONVERSION = YES;
261245
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
262246
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
247+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
263248
CLANG_WARN_EMPTY_BODY = YES;
264249
CLANG_WARN_ENUM_CONVERSION = YES;
265250
CLANG_WARN_INFINITE_RECURSION = YES;
@@ -272,14 +257,14 @@
272257
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
273258
CLANG_WARN_STRICT_PROTOTYPES = YES;
274259
CLANG_WARN_SUSPICIOUS_MOVE = YES;
260+
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
275261
CLANG_WARN_UNREACHABLE_CODE = YES;
276262
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
277-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
278263
COPY_PHASE_STRIP = NO;
279-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
280-
ENABLE_BITCODE = NO;
264+
DEBUG_INFORMATION_FORMAT = dwarf;
281265
ENABLE_STRICT_OBJC_MSGSEND = YES;
282266
ENABLE_TESTABILITY = YES;
267+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
283268
GCC_C_LANGUAGE_STANDARD = gnu11;
284269
GCC_DYNAMIC_NO_PIC = NO;
285270
GCC_NO_COMMON_BLOCKS = YES;
@@ -288,14 +273,13 @@
288273
"DEBUG=1",
289274
"$(inherited)",
290275
);
291-
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
292276
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
293277
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
294278
GCC_WARN_UNDECLARED_SELECTOR = YES;
295279
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
296280
GCC_WARN_UNUSED_FUNCTION = YES;
297281
GCC_WARN_UNUSED_VARIABLE = YES;
298-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
282+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
299283
ONLY_ACTIVE_ARCH = YES;
300284
SDKROOT = iphoneos;
301285
TARGETED_DEVICE_FAMILY = "1,2";
@@ -306,16 +290,19 @@
306290
isa = XCBuildConfiguration;
307291
buildSettings = {
308292
ALWAYS_SEARCH_USER_PATHS = NO;
309-
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
293+
CLANG_ANALYZER_NONNULL = YES;
294+
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
310295
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
311296
CLANG_ENABLE_MODULES = YES;
312297
CLANG_ENABLE_OBJC_ARC = YES;
298+
CLANG_ENABLE_OBJC_WEAK = YES;
313299
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
314300
CLANG_WARN_BOOL_CONVERSION = YES;
315301
CLANG_WARN_COMMA = YES;
316302
CLANG_WARN_CONSTANT_CONVERSION = YES;
317303
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
318304
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
305+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
319306
CLANG_WARN_EMPTY_BODY = YES;
320307
CLANG_WARN_ENUM_CONVERSION = YES;
321308
CLANG_WARN_INFINITE_RECURSION = YES;
@@ -328,14 +315,13 @@
328315
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
329316
CLANG_WARN_STRICT_PROTOTYPES = YES;
330317
CLANG_WARN_SUSPICIOUS_MOVE = YES;
318+
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
331319
CLANG_WARN_UNREACHABLE_CODE = YES;
332320
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
333-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
334321
COPY_PHASE_STRIP = NO;
335-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
336-
ENABLE_BITCODE = NO;
337322
ENABLE_NS_ASSERTIONS = NO;
338323
ENABLE_STRICT_OBJC_MSGSEND = YES;
324+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
339325
GCC_C_LANGUAGE_STANDARD = gnu11;
340326
GCC_NO_COMMON_BLOCKS = YES;
341327
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -344,7 +330,7 @@
344330
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
345331
GCC_WARN_UNUSED_FUNCTION = YES;
346332
GCC_WARN_UNUSED_VARIABLE = YES;
347-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
333+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
348334
SDKROOT = iphoneos;
349335
TARGETED_DEVICE_FAMILY = "1,2";
350336
VALIDATE_PRODUCT = YES;
@@ -357,13 +343,11 @@
357343
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
358344
BUILD_NUMBER = 0;
359345
CODE_SIGN_ENTITLEMENTS = libdigidocpp/libdigidocpp.entitlements;
360-
CODE_SIGN_IDENTITY = "iPhone Developer";
346+
CODE_SIGN_IDENTITY = "Apple Development";
361347
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
348+
CODE_SIGN_STYLE = Automatic;
362349
CURRENT_PROJECT_VERSION = "$(BUILD_NUMBER)";
363-
FRAMEWORK_SEARCH_PATHS = (
364-
"$(inherited)",
365-
"$(PROJECT_DIR)/libdigidocpp",
366-
);
350+
DEVELOPMENT_TEAM = ET847QJV9F;
367351
GCC_PREPROCESSOR_DEFINITIONS = (
368352
"$(inherited)",
369353
"TESTING=$(TESTING)",
@@ -374,30 +358,22 @@
374358
"$(MINIZIP)",
375359
);
376360
INFOPLIST_FILE = libdigidocpp/Info.plist;
377-
INFOPLIST_KEY_CFBundleDisplayName = Libdigidocpp;
378361
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
379-
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.xib;
362+
INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES;
363+
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
364+
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
380365
INFOPLIST_KEY_UIMainStoryboardFile = Main;
381366
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
382-
LD_RUNPATH_SEARCH_PATHS = (
383-
"$(inherited)",
384-
"@executable_path/Frameworks",
385-
);
386-
LIBRARY_SEARCH_PATHS = (
387-
"$(SDKPATH)/lib",
388-
"$(PROJECT_DIR)",
389-
);
367+
LIBRARY_SEARCH_PATHS = "$(SDKPATH)/lib";
390368
MARKETING_VERSION = 1.0;
391369
MINIZIP = "$(PROJECT_DIR)/../../src/minizip";
392370
PRODUCT_BUNDLE_IDENTIFIER = "ee.ria.$(PRODUCT_NAME:rfc1034identifier)";
393371
PRODUCT_NAME = "$(TARGET_NAME)";
394372
SDKPATH = /Library/libdigidocpp.iphoneos;
395373
"SDKPATH[sdk=iphonesimulator*]" = /Library/libdigidocpp.iphonesimulator;
396374
"SDKPATH[sdk=macosx*]" = /Library/libdigidocpp.iphonecatalyst;
397-
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
398375
SUPPORTS_MACCATALYST = YES;
399376
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
400-
TARGETED_DEVICE_FAMILY = "1,2";
401377
TESTING = 0;
402378
};
403379
name = Debug;
@@ -408,13 +384,11 @@
408384
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
409385
BUILD_NUMBER = 0;
410386
CODE_SIGN_ENTITLEMENTS = libdigidocpp/libdigidocpp.entitlements;
411-
CODE_SIGN_IDENTITY = "iPhone Developer";
387+
CODE_SIGN_IDENTITY = "Apple Development";
412388
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
389+
CODE_SIGN_STYLE = Automatic;
413390
CURRENT_PROJECT_VERSION = "$(BUILD_NUMBER)";
414-
FRAMEWORK_SEARCH_PATHS = (
415-
"$(inherited)",
416-
"$(PROJECT_DIR)/libdigidocpp",
417-
);
391+
DEVELOPMENT_TEAM = ET847QJV9F;
418392
GCC_PREPROCESSOR_DEFINITIONS = (
419393
"$(inherited)",
420394
"TESTING=$(TESTING)",
@@ -425,30 +399,22 @@
425399
"$(MINIZIP)",
426400
);
427401
INFOPLIST_FILE = libdigidocpp/Info.plist;
428-
INFOPLIST_KEY_CFBundleDisplayName = Libdigidocpp;
429402
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
430-
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.xib;
403+
INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES;
404+
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
405+
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
431406
INFOPLIST_KEY_UIMainStoryboardFile = Main;
432407
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
433-
LD_RUNPATH_SEARCH_PATHS = (
434-
"$(inherited)",
435-
"@executable_path/Frameworks",
436-
);
437-
LIBRARY_SEARCH_PATHS = (
438-
"$(SDKPATH)/lib",
439-
"$(PROJECT_DIR)",
440-
);
408+
LIBRARY_SEARCH_PATHS = "$(SDKPATH)/lib";
441409
MARKETING_VERSION = 1.0;
442410
MINIZIP = "$(PROJECT_DIR)/../../src/minizip";
443411
PRODUCT_BUNDLE_IDENTIFIER = "ee.ria.$(PRODUCT_NAME:rfc1034identifier)";
444412
PRODUCT_NAME = "$(TARGET_NAME)";
445413
SDKPATH = /Library/libdigidocpp.iphoneos;
446414
"SDKPATH[sdk=iphonesimulator*]" = /Library/libdigidocpp.iphonesimulator;
447415
"SDKPATH[sdk=macosx*]" = /Library/libdigidocpp.iphonecatalyst;
448-
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
449416
SUPPORTS_MACCATALYST = YES;
450417
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
451-
TARGETED_DEVICE_FAMILY = "1,2";
452418
TESTING = 0;
453419
};
454420
name = Release;

‎examples/ios/libdigidocpp/AppDelegate.mm

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
4848
digidoc::initialize("libdigidocpp iOS");
4949
// Skip URL will be opened in application: openURL:
5050
if (launchOptions[UIApplicationLaunchOptionsURLKey] == nil) {
51-
[self openFile:[NSBundle.mainBundle pathForResource:@"test" ofType:@"bdoc"] copy:YES];
51+
[self openFile:[NSBundle.mainBundle pathForResource:@"test" ofType:@"bdoc"]];
5252
}
5353
} catch(const digidoc::Exception &e) {
5454
NSLog(@"%s", e.msg().c_str());
@@ -59,30 +59,14 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
5959
- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options {
6060
delete self.doc;
6161
self.doc = nullptr;
62-
BOOL result = [self openFile:url.path copy:YES];
62+
BOOL result = [self openFile:url.path];
6363
UITableViewController *master = (UITableViewController*)self.window.rootViewController;
6464
[master.tableView reloadData];
6565
return result;
6666
}
6767

68-
- (BOOL)openFile:(NSString*)from copy:(BOOL)copy {
68+
- (BOOL)openFile:(NSString*)path {
6969
try {
70-
NSArray *documentPath = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
71-
NSString *path = [NSString stringWithFormat:@"%@/%@", documentPath.firstObject, from.lastPathComponent];
72-
NSError *error;
73-
[NSFileManager.defaultManager removeItemAtPath:path error:&error];
74-
if (error) {
75-
NSLog(@"Failed to remove file %@", error);
76-
error = nil;
77-
}
78-
if (copy)
79-
[NSFileManager.defaultManager copyItemAtPath:from toPath:path error:&error];
80-
else
81-
[NSFileManager.defaultManager moveItemAtPath:from toPath:path error:&error];
82-
if (error) {
83-
NSLog(@"Failed to copy/move file %@", error);
84-
return NO;
85-
}
8670
self.doc = digidoc::Container::openPtr(path.UTF8String).release();
8771
return YES;
8872
} catch(const digidoc::Exception &e) {

0 commit comments

Comments
 (0)