Skip to content

Commit 9006d28

Browse files
phimagee-marchand
phimage
authored and
e-marchand
committed
Fix warning and update project with Xcode 14.2
1 parent 6937ec3 commit 9006d28

File tree

11 files changed

+141
-106
lines changed

11 files changed

+141
-106
lines changed

‎.swiftlint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ included:
44
# rule identifiers to exclude from running
55
disabled_rules:
66
- cyclomatic_complexity
7-
- variable_name
7+
- identifier_name
88
- type_name
99
- todo
1010

‎FileKit.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
@@ -495,7 +495,7 @@
495495
isa = PBXProject;
496496
attributes = {
497497
LastSwiftUpdateCheck = 0700;
498-
LastUpgradeCheck = 1020;
498+
LastUpgradeCheck = 1420;
499499
ORGANIZATIONNAME = "Nikolai Vazquez";
500500
TargetAttributes = {
501501
5204B84A1B96B83800AA473F = {
@@ -581,6 +581,7 @@
581581
/* Begin PBXShellScriptBuildPhase section */
582582
52995ACA1C0D967100A1AD23 /* SwiftLint */ = {
583583
isa = PBXShellScriptBuildPhase;
584+
alwaysOutOfDate = 1;
584585
buildActionMask = 2147483647;
585586
files = (
586587
);
@@ -591,10 +592,11 @@
591592
);
592593
runOnlyForDeploymentPostprocessing = 0;
593594
shellPath = /bin/sh;
594-
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi";
595+
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi\n";
595596
};
596597
52995ACB1C0D967700A1AD23 /* SwiftLint */ = {
597598
isa = PBXShellScriptBuildPhase;
599+
alwaysOutOfDate = 1;
598600
buildActionMask = 2147483647;
599601
files = (
600602
);
@@ -605,10 +607,11 @@
605607
);
606608
runOnlyForDeploymentPostprocessing = 0;
607609
shellPath = /bin/sh;
608-
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi";
610+
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi\n";
609611
};
610612
52995ACC1C0D967D00A1AD23 /* SwiftLint */ = {
611613
isa = PBXShellScriptBuildPhase;
614+
alwaysOutOfDate = 1;
612615
buildActionMask = 2147483647;
613616
files = (
614617
);
@@ -619,10 +622,11 @@
619622
);
620623
runOnlyForDeploymentPostprocessing = 0;
621624
shellPath = /bin/sh;
622-
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi";
625+
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi\n";
623626
};
624627
52995ACD1C0D968400A1AD23 /* SwiftLint */ = {
625628
isa = PBXShellScriptBuildPhase;
629+
alwaysOutOfDate = 1;
626630
buildActionMask = 2147483647;
627631
files = (
628632
);
@@ -633,7 +637,7 @@
633637
);
634638
runOnlyForDeploymentPostprocessing = 0;
635639
shellPath = /bin/sh;
636-
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi";
640+
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi\n";
637641
};
638642
/* End PBXShellScriptBuildPhase section */
639643

@@ -837,6 +841,7 @@
837841
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
838842
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
839843
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
844+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
840845
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
841846
CLANG_WARN_STRICT_PROTOTYPES = YES;
842847
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -846,6 +851,7 @@
846851
CURRENT_PROJECT_VERSION = 1;
847852
CURRENT_RELEASE_NUMBER = 12;
848853
CURRENT_RELEASE_VERSION = 4.0.1;
854+
DEAD_CODE_STRIPPING = YES;
849855
DEBUG_INFORMATION_FORMAT = dwarf;
850856
ENABLE_STRICT_OBJC_MSGSEND = YES;
851857
ENABLE_TESTABILITY = YES;
@@ -863,7 +869,7 @@
863869
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
864870
GCC_WARN_UNUSED_FUNCTION = YES;
865871
GCC_WARN_UNUSED_VARIABLE = YES;
866-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
872+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
867873
MACOSX_DEPLOYMENT_TARGET = 10.9;
868874
MTL_ENABLE_DEBUG_INFO = YES;
869875
ONLY_ACTIVE_ARCH = YES;
@@ -897,6 +903,7 @@
897903
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
898904
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
899905
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
906+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
900907
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
901908
CLANG_WARN_STRICT_PROTOTYPES = YES;
902909
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -906,6 +913,7 @@
906913
CURRENT_PROJECT_VERSION = 1;
907914
CURRENT_RELEASE_NUMBER = 12;
908915
CURRENT_RELEASE_VERSION = 4.0.1;
916+
DEAD_CODE_STRIPPING = YES;
909917
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
910918
ENABLE_NS_ASSERTIONS = NO;
911919
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -917,7 +925,7 @@
917925
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
918926
GCC_WARN_UNUSED_FUNCTION = YES;
919927
GCC_WARN_UNUSED_VARIABLE = YES;
920-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
928+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
921929
MACOSX_DEPLOYMENT_TARGET = 10.9;
922930
MTL_ENABLE_DEBUG_INFO = NO;
923931
SDKROOT = macosx;
@@ -931,14 +939,20 @@
931939
isa = XCBuildConfiguration;
932940
buildSettings = {
933941
COMBINE_HIDPI_IMAGES = YES;
942+
DEAD_CODE_STRIPPING = YES;
934943
DEFINES_MODULE = YES;
935944
DYLIB_COMPATIBILITY_VERSION = 1;
936945
DYLIB_CURRENT_VERSION = 1;
937946
DYLIB_INSTALL_NAME_BASE = "@rpath";
938947
FRAMEWORK_VERSION = A;
939948
INFOPLIST_FILE = "$(SRCROOT)/Support/Info.plist";
940949
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
941-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
950+
LD_RUNPATH_SEARCH_PATHS = (
951+
"$(inherited)",
952+
"@executable_path/../Frameworks",
953+
"@loader_path/Frameworks",
954+
);
955+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
942956
PRODUCT_BUNDLE_IDENTIFIER = "com.nikolaivazquez.$(PROJECT_NAME)";
943957
PRODUCT_NAME = "$(PROJECT_NAME)";
944958
SKIP_INSTALL = YES;
@@ -950,18 +964,25 @@
950964
isa = XCBuildConfiguration;
951965
buildSettings = {
952966
COMBINE_HIDPI_IMAGES = YES;
967+
DEAD_CODE_STRIPPING = YES;
953968
DEFINES_MODULE = YES;
954969
DYLIB_COMPATIBILITY_VERSION = 1;
955970
DYLIB_CURRENT_VERSION = 1;
956971
DYLIB_INSTALL_NAME_BASE = "@rpath";
957972
FRAMEWORK_VERSION = A;
958973
INFOPLIST_FILE = "$(SRCROOT)/Support/Info.plist";
959974
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
960-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
975+
LD_RUNPATH_SEARCH_PATHS = (
976+
"$(inherited)",
977+
"@executable_path/../Frameworks",
978+
"@loader_path/Frameworks",
979+
);
980+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
961981
PRODUCT_BUNDLE_IDENTIFIER = "com.nikolaivazquez.$(PROJECT_NAME)";
962982
PRODUCT_NAME = "$(PROJECT_NAME)";
963983
SKIP_INSTALL = YES;
964-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
984+
SWIFT_COMPILATION_MODE = wholemodule;
985+
SWIFT_OPTIMIZATION_LEVEL = "-O";
965986
SWIFT_VERSION = 5.0;
966987
};
967988
name = Release;
@@ -976,7 +997,13 @@
976997
DYLIB_INSTALL_NAME_BASE = "@rpath";
977998
INFOPLIST_FILE = "$(SRCROOT)/Support/Info.plist";
978999
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
979-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1000+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1001+
LD_RUNPATH_SEARCH_PATHS = (
1002+
"$(inherited)",
1003+
"@executable_path/Frameworks",
1004+
"@loader_path/Frameworks",
1005+
);
1006+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
9801007
PRODUCT_BUNDLE_IDENTIFIER = "com.nikolaivazquez.$(PROJECT_NAME)";
9811008
PRODUCT_NAME = "$(PROJECT_NAME)";
9821009
SDKROOT = iphoneos;
@@ -996,12 +1023,19 @@
9961023
DYLIB_INSTALL_NAME_BASE = "@rpath";
9971024
INFOPLIST_FILE = "$(SRCROOT)/Support/Info.plist";
9981025
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
999-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1026+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1027+
LD_RUNPATH_SEARCH_PATHS = (
1028+
"$(inherited)",
1029+
"@executable_path/Frameworks",
1030+
"@loader_path/Frameworks",
1031+
);
1032+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
10001033
PRODUCT_BUNDLE_IDENTIFIER = "com.nikolaivazquez.$(PROJECT_NAME)";
10011034
PRODUCT_NAME = "$(PROJECT_NAME)";
10021035
SDKROOT = iphoneos;
10031036
SKIP_INSTALL = YES;
1004-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1037+
SWIFT_COMPILATION_MODE = wholemodule;
1038+
SWIFT_OPTIMIZATION_LEVEL = "-O";
10051039
SWIFT_VERSION = 5.0;
10061040
TARGETED_DEVICE_FAMILY = "1,2";
10071041
VALIDATE_PRODUCT = YES;
@@ -1012,8 +1046,14 @@
10121046
isa = XCBuildConfiguration;
10131047
buildSettings = {
10141048
COMBINE_HIDPI_IMAGES = YES;
1049+
DEAD_CODE_STRIPPING = YES;
10151050
INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist";
1016-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1051+
LD_RUNPATH_SEARCH_PATHS = (
1052+
"$(inherited)",
1053+
"@executable_path/../Frameworks",
1054+
"@loader_path/../Frameworks",
1055+
);
1056+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
10171057
PRODUCT_BUNDLE_IDENTIFIER = com.nikolaivazquez.FileKitTests;
10181058
PRODUCT_NAME = "$(TARGET_NAME)";
10191059
SWIFT_VERSION = 5.0;
@@ -1024,11 +1064,18 @@
10241064
isa = XCBuildConfiguration;
10251065
buildSettings = {
10261066
COMBINE_HIDPI_IMAGES = YES;
1067+
DEAD_CODE_STRIPPING = YES;
10271068
INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist";
1028-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1069+
LD_RUNPATH_SEARCH_PATHS = (
1070+
"$(inherited)",
1071+
"@executable_path/../Frameworks",
1072+
"@loader_path/../Frameworks",
1073+
);
1074+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
10291075
PRODUCT_BUNDLE_IDENTIFIER = com.nikolaivazquez.FileKitTests;
10301076
PRODUCT_NAME = "$(TARGET_NAME)";
1031-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1077+
SWIFT_COMPILATION_MODE = wholemodule;
1078+
SWIFT_OPTIMIZATION_LEVEL = "-O";
10321079
SWIFT_VERSION = 5.0;
10331080
};
10341081
name = Release;
@@ -1043,14 +1090,19 @@
10431090
DYLIB_INSTALL_NAME_BASE = "@rpath";
10441091
INFOPLIST_FILE = "$(SRCROOT)/Support/Info.plist";
10451092
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1046-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1093+
LD_RUNPATH_SEARCH_PATHS = (
1094+
"$(inherited)",
1095+
"@executable_path/Frameworks",
1096+
"@loader_path/Frameworks",
1097+
);
1098+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
10471099
PRODUCT_BUNDLE_IDENTIFIER = "com.nikolaivazquez.$(PROJECT_NAME)";
10481100
PRODUCT_NAME = "$(PROJECT_NAME)";
10491101
SDKROOT = watchos;
10501102
SKIP_INSTALL = YES;
10511103
SWIFT_VERSION = 5.0;
10521104
TARGETED_DEVICE_FAMILY = 4;
1053-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
1105+
WATCHOS_DEPLOYMENT_TARGET = 4.0;
10541106
};
10551107
name = Debug;
10561108
};
@@ -1064,16 +1116,22 @@
10641116
DYLIB_INSTALL_NAME_BASE = "@rpath";
10651117
INFOPLIST_FILE = "$(SRCROOT)/Support/Info.plist";
10661118
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1067-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1119+
LD_RUNPATH_SEARCH_PATHS = (
1120+
"$(inherited)",
1121+
"@executable_path/Frameworks",
1122+
"@loader_path/Frameworks",
1123+
);
1124+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
10681125
PRODUCT_BUNDLE_IDENTIFIER = "com.nikolaivazquez.$(PROJECT_NAME)";
10691126
PRODUCT_NAME = "$(PROJECT_NAME)";
10701127
SDKROOT = watchos;
10711128
SKIP_INSTALL = YES;
1072-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1129+
SWIFT_COMPILATION_MODE = wholemodule;
1130+
SWIFT_OPTIMIZATION_LEVEL = "-O";
10731131
SWIFT_VERSION = 5.0;
10741132
TARGETED_DEVICE_FAMILY = 4;
10751133
VALIDATE_PRODUCT = YES;
1076-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
1134+
WATCHOS_DEPLOYMENT_TARGET = 4.0;
10771135
};
10781136
name = Release;
10791137
};
@@ -1087,14 +1145,19 @@
10871145
DYLIB_INSTALL_NAME_BASE = "@rpath";
10881146
INFOPLIST_FILE = "$(SRCROOT)/Support/Info.plist";
10891147
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1090-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1148+
LD_RUNPATH_SEARCH_PATHS = (
1149+
"$(inherited)",
1150+
"@executable_path/Frameworks",
1151+
"@loader_path/Frameworks",
1152+
);
1153+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
10911154
PRODUCT_BUNDLE_IDENTIFIER = "com.nikolaivazquez.$(PROJECT_NAME)";
10921155
PRODUCT_NAME = "$(PROJECT_NAME)";
10931156
SDKROOT = appletvos;
10941157
SKIP_INSTALL = YES;
10951158
SWIFT_VERSION = 5.0;
10961159
TARGETED_DEVICE_FAMILY = 3;
1097-
TVOS_DEPLOYMENT_TARGET = 9.0;
1160+
TVOS_DEPLOYMENT_TARGET = 12.0;
10981161
};
10991162
name = Debug;
11001163
};
@@ -1108,15 +1171,21 @@
11081171
DYLIB_INSTALL_NAME_BASE = "@rpath";
11091172
INFOPLIST_FILE = "$(SRCROOT)/Support/Info.plist";
11101173
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1111-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1174+
LD_RUNPATH_SEARCH_PATHS = (
1175+
"$(inherited)",
1176+
"@executable_path/Frameworks",
1177+
"@loader_path/Frameworks",
1178+
);
1179+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
11121180
PRODUCT_BUNDLE_IDENTIFIER = "com.nikolaivazquez.$(PROJECT_NAME)";
11131181
PRODUCT_NAME = "$(PROJECT_NAME)";
11141182
SDKROOT = appletvos;
11151183
SKIP_INSTALL = YES;
1116-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1184+
SWIFT_COMPILATION_MODE = wholemodule;
1185+
SWIFT_OPTIMIZATION_LEVEL = "-O";
11171186
SWIFT_VERSION = 5.0;
11181187
TARGETED_DEVICE_FAMILY = 3;
1119-
TVOS_DEPLOYMENT_TARGET = 9.0;
1188+
TVOS_DEPLOYMENT_TARGET = 12.0;
11201189
VALIDATE_PRODUCT = YES;
11211190
};
11221191
name = Release;

0 commit comments

Comments
 (0)