Skip to content

Commit 0f72faa

Browse files
kkebokkebo
authored
Merge pull request #132 from kkebo/update-project-file
chore: update Xcode project to the latest settings
2 parents b0715bc + 8dd0f2d commit 0f72faa

File tree

7 files changed

+115
-166
lines changed

7 files changed

+115
-166
lines changed

‎DNSecure.xcodeproj/project.pbxproj‎

Lines changed: 77 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 70;
6+
objectVersion = 77;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -36,21 +36,7 @@
3636
/* End PBXFileReference section */
3737

3838
/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
39-
8968A7542E68669300DBEFD1 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
40-
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
41-
membershipExceptions = (
42-
Info.plist,
43-
);
44-
target = 8940024824ACBD2800EBE74B /* DNSecureTests */;
45-
};
46-
8968A7552E68669300DBEFD1 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
47-
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
48-
membershipExceptions = (
49-
Info.plist,
50-
);
51-
target = 8940025324ACBD2800EBE74B /* DNSecureUITests */;
52-
};
53-
899AD03F2E66100500449710 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
39+
899AD03F2E66100500449710 /* Exceptions for "DNSecure" folder in "DNSecure" target */ = {
5440
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
5541
membershipExceptions = (
5642
Info.plist,
@@ -60,9 +46,24 @@
6046
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
6147

6248
/* Begin PBXFileSystemSynchronizedRootGroup section */
63-
899AD0232E66100500449710 /* DNSecure */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (899AD03F2E66100500449710 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = DNSecure; sourceTree = "<group>"; };
64-
899AD0422E66100E00449710 /* DNSecureTests */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (8968A7542E68669300DBEFD1 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = DNSecureTests; sourceTree = "<group>"; };
65-
899AD0472E66101100449710 /* DNSecureUITests */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (8968A7552E68669300DBEFD1 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = DNSecureUITests; sourceTree = "<group>"; };
49+
899AD0232E66100500449710 /* DNSecure */ = {
50+
isa = PBXFileSystemSynchronizedRootGroup;
51+
exceptions = (
52+
899AD03F2E66100500449710 /* Exceptions for "DNSecure" folder in "DNSecure" target */,
53+
);
54+
path = DNSecure;
55+
sourceTree = "<group>";
56+
};
57+
899AD0422E66100E00449710 /* DNSecureTests */ = {
58+
isa = PBXFileSystemSynchronizedRootGroup;
59+
path = DNSecureTests;
60+
sourceTree = "<group>";
61+
};
62+
899AD0472E66101100449710 /* DNSecureUITests */ = {
63+
isa = PBXFileSystemSynchronizedRootGroup;
64+
path = DNSecureUITests;
65+
sourceTree = "<group>";
66+
};
6667
/* End PBXFileSystemSynchronizedRootGroup section */
6768

6869
/* Begin PBXFrameworksBuildPhase section */
@@ -210,14 +211,15 @@
210211
};
211212
};
212213
buildConfigurationList = 8940023324ACBD2700EBE74B /* Build configuration list for PBXProject "DNSecure" */;
213-
compatibilityVersion = "Xcode 9.3";
214214
developmentRegion = en;
215215
hasScannedForEncodings = 0;
216216
knownRegions = (
217217
en,
218218
Base,
219219
);
220220
mainGroup = 8940022F24ACBD2700EBE74B;
221+
minimizedProjectReferenceProxies = 1;
222+
preferredProjectObjectVersion = 77;
221223
productRefGroup = 8940023924ACBD2700EBE74B /* Products */;
222224
projectDirPath = "";
223225
projectRoot = "";
@@ -298,8 +300,7 @@
298300
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
299301
CLANG_ANALYZER_NONNULL = YES;
300302
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
301-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
302-
CLANG_CXX_LIBRARY = "libc++";
303+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
303304
CLANG_ENABLE_MODULES = YES;
304305
CLANG_ENABLE_OBJC_ARC = YES;
305306
CLANG_ENABLE_OBJC_WEAK = YES;
@@ -331,7 +332,7 @@
331332
ENABLE_STRICT_OBJC_MSGSEND = YES;
332333
ENABLE_TESTABILITY = YES;
333334
ENABLE_USER_SCRIPT_SANDBOXING = YES;
334-
GCC_C_LANGUAGE_STANDARD = gnu11;
335+
GCC_C_LANGUAGE_STANDARD = gnu17;
335336
GCC_DYNAMIC_NO_PIC = NO;
336337
GCC_NO_COMMON_BLOCKS = YES;
337338
GCC_OPTIMIZATION_LEVEL = 0;
@@ -346,13 +347,14 @@
346347
GCC_WARN_UNUSED_FUNCTION = YES;
347348
GCC_WARN_UNUSED_VARIABLE = YES;
348349
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
350+
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
349351
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
350352
MTL_FAST_MATH = YES;
351353
ONLY_ACTIVE_ARCH = YES;
352354
SDKROOT = iphoneos;
353-
STRING_CATALOG_GENERATE_SYMBOLS = YES;
354-
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
355+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
355356
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
357+
SWIFT_VERSION = 6.0;
356358
};
357359
name = Debug;
358360
};
@@ -363,8 +365,7 @@
363365
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
364366
CLANG_ANALYZER_NONNULL = YES;
365367
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
366-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
367-
CLANG_CXX_LIBRARY = "libc++";
368+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
368369
CLANG_ENABLE_MODULES = YES;
369370
CLANG_ENABLE_OBJC_ARC = YES;
370371
CLANG_ENABLE_OBJC_WEAK = YES;
@@ -396,7 +397,7 @@
396397
ENABLE_NS_ASSERTIONS = NO;
397398
ENABLE_STRICT_OBJC_MSGSEND = YES;
398399
ENABLE_USER_SCRIPT_SANDBOXING = YES;
399-
GCC_C_LANGUAGE_STANDARD = gnu11;
400+
GCC_C_LANGUAGE_STANDARD = gnu17;
400401
GCC_NO_COMMON_BLOCKS = YES;
401402
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
402403
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -405,12 +406,12 @@
405406
GCC_WARN_UNUSED_FUNCTION = YES;
406407
GCC_WARN_UNUSED_VARIABLE = YES;
407408
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
409+
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
408410
MTL_ENABLE_DEBUG_INFO = NO;
409411
MTL_FAST_MATH = YES;
410412
SDKROOT = iphoneos;
411-
STRING_CATALOG_GENERATE_SYMBOLS = YES;
412413
SWIFT_COMPILATION_MODE = wholemodule;
413-
SWIFT_OPTIMIZATION_LEVEL = "-O";
414+
SWIFT_VERSION = 6.0;
414415
VALIDATE_PRODUCT = YES;
415416
};
416417
name = Release;
@@ -423,22 +424,31 @@
423424
CODE_SIGN_ENTITLEMENTS = DNSecure/DNSecure.entitlements;
424425
CODE_SIGN_STYLE = Automatic;
425426
CURRENT_PROJECT_VERSION = 1;
426-
DEVELOPMENT_ASSET_PATHS = "\"DNSecure/Preview Content\"";
427+
DEVELOPMENT_TEAM = X4678G5DL2;
427428
ENABLE_APP_SANDBOX = YES;
428429
ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
429430
ENABLE_PREVIEWS = YES;
431+
GENERATE_INFOPLIST_FILE = YES;
430432
INFOPLIST_FILE = DNSecure/Info.plist;
433+
INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO;
434+
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
435+
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
436+
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
437+
INFOPLIST_KEY_UIRequiredDeviceCapabilities = armv7;
438+
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
439+
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
431440
LD_RUNPATH_SEARCH_PATHS = (
432441
"$(inherited)",
433442
"@executable_path/Frameworks",
434443
);
435444
MARKETING_VERSION = 1.5.1;
436445
PRODUCT_BUNDLE_IDENTIFIER = xyz.kebo.DNSecure;
437446
PRODUCT_NAME = "$(TARGET_NAME)";
438-
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
447+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
439448
SUPPORTS_MACCATALYST = YES;
440449
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
441-
SWIFT_VERSION = 6.0;
450+
SWIFT_APPROACHABLE_CONCURRENCY = YES;
451+
SWIFT_EMIT_LOC_STRINGS = YES;
442452
TARGETED_DEVICE_FAMILY = "1,2";
443453
};
444454
name = Debug;
@@ -451,22 +461,31 @@
451461
CODE_SIGN_ENTITLEMENTS = DNSecure/DNSecure.entitlements;
452462
CODE_SIGN_STYLE = Automatic;
453463
CURRENT_PROJECT_VERSION = 1;
454-
DEVELOPMENT_ASSET_PATHS = "\"DNSecure/Preview Content\"";
464+
DEVELOPMENT_TEAM = X4678G5DL2;
455465
ENABLE_APP_SANDBOX = YES;
456466
ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
457467
ENABLE_PREVIEWS = YES;
468+
GENERATE_INFOPLIST_FILE = YES;
458469
INFOPLIST_FILE = DNSecure/Info.plist;
470+
INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO;
471+
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
472+
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
473+
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
474+
INFOPLIST_KEY_UIRequiredDeviceCapabilities = armv7;
475+
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
476+
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
459477
LD_RUNPATH_SEARCH_PATHS = (
460478
"$(inherited)",
461479
"@executable_path/Frameworks",
462480
);
463481
MARKETING_VERSION = 1.5.1;
464482
PRODUCT_BUNDLE_IDENTIFIER = xyz.kebo.DNSecure;
465483
PRODUCT_NAME = "$(TARGET_NAME)";
466-
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
484+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
467485
SUPPORTS_MACCATALYST = YES;
468486
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
469-
SWIFT_VERSION = 6.0;
487+
SWIFT_APPROACHABLE_CONCURRENCY = YES;
488+
SWIFT_EMIT_LOC_STRINGS = YES;
470489
TARGETED_DEVICE_FAMILY = "1,2";
471490
};
472491
name = Release;
@@ -476,17 +495,15 @@
476495
buildSettings = {
477496
BUNDLE_LOADER = "$(TEST_HOST)";
478497
CODE_SIGN_STYLE = Automatic;
479-
INFOPLIST_FILE = DNSecureTests/Info.plist;
480-
LD_RUNPATH_SEARCH_PATHS = (
481-
"$(inherited)",
482-
"@executable_path/Frameworks",
483-
"@loader_path/Frameworks",
484-
);
498+
CURRENT_PROJECT_VERSION = 1;
499+
DEVELOPMENT_TEAM = X4678G5DL2;
500+
GENERATE_INFOPLIST_FILE = YES;
501+
MARKETING_VERSION = 1.0;
485502
PRODUCT_BUNDLE_IDENTIFIER = xyz.kebo.DNSecureTests;
486503
PRODUCT_NAME = "$(TARGET_NAME)";
487-
SWIFT_VERSION = 6.0;
504+
SWIFT_APPROACHABLE_CONCURRENCY = YES;
488505
TARGETED_DEVICE_FAMILY = "1,2";
489-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DNSecure.app/DNSecure";
506+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DNSecure.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/DNSecure";
490507
};
491508
name = Debug;
492509
};
@@ -495,33 +512,29 @@
495512
buildSettings = {
496513
BUNDLE_LOADER = "$(TEST_HOST)";
497514
CODE_SIGN_STYLE = Automatic;
498-
INFOPLIST_FILE = DNSecureTests/Info.plist;
499-
LD_RUNPATH_SEARCH_PATHS = (
500-
"$(inherited)",
501-
"@executable_path/Frameworks",
502-
"@loader_path/Frameworks",
503-
);
515+
CURRENT_PROJECT_VERSION = 1;
516+
DEVELOPMENT_TEAM = X4678G5DL2;
517+
GENERATE_INFOPLIST_FILE = YES;
518+
MARKETING_VERSION = 1.0;
504519
PRODUCT_BUNDLE_IDENTIFIER = xyz.kebo.DNSecureTests;
505520
PRODUCT_NAME = "$(TARGET_NAME)";
506-
SWIFT_VERSION = 6.0;
521+
SWIFT_APPROACHABLE_CONCURRENCY = YES;
507522
TARGETED_DEVICE_FAMILY = "1,2";
508-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DNSecure.app/DNSecure";
523+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DNSecure.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/DNSecure";
509524
};
510525
name = Release;
511526
};
512527
8940026424ACBD2800EBE74B /* Debug */ = {
513528
isa = XCBuildConfiguration;
514529
buildSettings = {
515530
CODE_SIGN_STYLE = Automatic;
516-
INFOPLIST_FILE = DNSecureUITests/Info.plist;
517-
LD_RUNPATH_SEARCH_PATHS = (
518-
"$(inherited)",
519-
"@executable_path/Frameworks",
520-
"@loader_path/Frameworks",
521-
);
531+
CURRENT_PROJECT_VERSION = 1;
532+
DEVELOPMENT_TEAM = X4678G5DL2;
533+
GENERATE_INFOPLIST_FILE = YES;
534+
MARKETING_VERSION = 1.0;
522535
PRODUCT_BUNDLE_IDENTIFIER = xyz.kebo.DNSecureUITests;
523536
PRODUCT_NAME = "$(TARGET_NAME)";
524-
SWIFT_VERSION = 6.0;
537+
SWIFT_APPROACHABLE_CONCURRENCY = YES;
525538
TARGETED_DEVICE_FAMILY = "1,2";
526539
TEST_TARGET_NAME = DNSecure;
527540
};
@@ -531,15 +544,13 @@
531544
isa = XCBuildConfiguration;
532545
buildSettings = {
533546
CODE_SIGN_STYLE = Automatic;
534-
INFOPLIST_FILE = DNSecureUITests/Info.plist;
535-
LD_RUNPATH_SEARCH_PATHS = (
536-
"$(inherited)",
537-
"@executable_path/Frameworks",
538-
"@loader_path/Frameworks",
539-
);
547+
CURRENT_PROJECT_VERSION = 1;
548+
DEVELOPMENT_TEAM = X4678G5DL2;
549+
GENERATE_INFOPLIST_FILE = YES;
550+
MARKETING_VERSION = 1.0;
540551
PRODUCT_BUNDLE_IDENTIFIER = xyz.kebo.DNSecureUITests;
541552
PRODUCT_NAME = "$(TARGET_NAME)";
542-
SWIFT_VERSION = 6.0;
553+
SWIFT_APPROACHABLE_CONCURRENCY = YES;
543554
TARGETED_DEVICE_FAMILY = "1,2";
544555
TEST_TARGET_NAME = DNSecure;
545556
};

‎DNSecure/Info.plist‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,53 +2,10 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>CFBundleDevelopmentRegion</key>
6-
<string>$(DEVELOPMENT_LANGUAGE)</string>
7-
<key>CFBundleExecutable</key>
8-
<string>$(EXECUTABLE_NAME)</string>
9-
<key>CFBundleIdentifier</key>
10-
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11-
<key>CFBundleInfoDictionaryVersion</key>
12-
<string>6.0</string>
13-
<key>CFBundleName</key>
14-
<string>$(PRODUCT_NAME)</string>
15-
<key>CFBundlePackageType</key>
16-
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
17-
<key>CFBundleShortVersionString</key>
18-
<string>$(MARKETING_VERSION)</string>
19-
<key>CFBundleVersion</key>
20-
<string>$(CURRENT_PROJECT_VERSION)</string>
21-
<key>LSApplicationCategoryType</key>
22-
<string>public.app-category.utilities</string>
23-
<key>LSRequiresIPhoneOS</key>
24-
<true/>
255
<key>UIApplicationSceneManifest</key>
266
<dict>
277
<key>UIApplicationSupportsMultipleScenes</key>
288
<false/>
299
</dict>
30-
<key>UIApplicationSupportsIndirectInputEvents</key>
31-
<true/>
32-
<key>UILaunchScreen</key>
33-
<dict/>
34-
<key>UIRequiredDeviceCapabilities</key>
35-
<array>
36-
<string>armv7</string>
37-
</array>
38-
<key>UISupportedInterfaceOrientations</key>
39-
<array>
40-
<string>UIInterfaceOrientationPortrait</string>
41-
<string>UIInterfaceOrientationLandscapeLeft</string>
42-
<string>UIInterfaceOrientationLandscapeRight</string>
43-
</array>
44-
<key>UISupportedInterfaceOrientations~ipad</key>
45-
<array>
46-
<string>UIInterfaceOrientationPortrait</string>
47-
<string>UIInterfaceOrientationPortraitUpsideDown</string>
48-
<string>UIInterfaceOrientationLandscapeLeft</string>
49-
<string>UIInterfaceOrientationLandscapeRight</string>
50-
</array>
51-
<key>ITSAppUsesNonExemptEncryption</key>
52-
<false/>
5310
</dict>
5411
</plist>

‎DNSecure/Preview Content/Preview Assets.xcassets/Contents.json‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎DNSecureTests/Info.plist‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)