Skip to content

Commit 0465990

Browse files
ninjaproxninjaprox
committed
chore: update project settings and update SwiftLintPlugins 
1 parent ed97ea3 commit 0465990

File tree

5 files changed

+116
-28
lines changed

5 files changed

+116
-28
lines changed

‎NVActivityIndicatorView.xcodeproj/project.pbxproj‎

Lines changed: 96 additions & 21 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 */
@@ -375,6 +375,7 @@
375375
buildRules = (
376376
);
377377
dependencies = (
378+
1F0742D12F6A40C600304500 /* PBXTargetDependency */,
378379
);
379380
name = NVActivityIndicatorView;
380381
productName = NVActivityIndicatorView;
@@ -391,6 +392,7 @@
391392
buildRules = (
392393
);
393394
dependencies = (
395+
1F0742D32F6A40CF00304500 /* PBXTargetDependency */,
394396
OBJ_106 /* PBXTargetDependency */,
395397
);
396398
name = NVActivityIndicatorViewExtended;
@@ -418,9 +420,10 @@
418420
OBJ_1 /* Project object */ = {
419421
isa = PBXProject;
420422
attributes = {
423+
BuildIndependentTargetsInParallel = YES;
421424
LastSwiftMigration = 9999;
422425
LastSwiftUpdateCheck = 1130;
423-
LastUpgradeCheck = 1420;
426+
LastUpgradeCheck = 2630;
424427
TargetAttributes = {
425428
1F1836DC248CEFC200583430 = {
426429
CreatedOnToolsVersion = 11.3.1;
@@ -443,6 +446,9 @@
443446
Base,
444447
);
445448
mainGroup = OBJ_5;
449+
packageReferences = (
450+
1F0742CF2F6A408300304500 /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */,
451+
);
446452
productRefGroup = OBJ_51 /* Products */;
447453
projectDirPath = "";
448454
projectRoot = "";
@@ -562,6 +568,14 @@
562568
/* End PBXSourcesBuildPhase section */
563569

564570
/* Begin PBXTargetDependency section */
571+
1F0742D12F6A40C600304500 /* PBXTargetDependency */ = {
572+
isa = PBXTargetDependency;
573+
productRef = 1F0742D02F6A40C600304500 /* SwiftLintBuildToolPlugin */;
574+
};
575+
1F0742D32F6A40CF00304500 /* PBXTargetDependency */ = {
576+
isa = PBXTargetDependency;
577+
productRef = 1F0742D22F6A40CF00304500 /* SwiftLintBuildToolPlugin */;
578+
};
565579
1F1836F5248CF08B00583430 /* PBXTargetDependency */ = {
566580
isa = PBXTargetDependency;
567581
target = "NVActivityIndicatorView::NVActivityIndicatorViewExtended" /* NVActivityIndicatorViewExtended */;
@@ -649,8 +663,11 @@
649663
GCC_WARN_UNUSED_VARIABLE = YES;
650664
INFOPLIST_FILE = Example/Info.plist;
651665
IPHONEOS_DEPLOYMENT_TARGET = 13.2;
652-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
653-
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
666+
LD_RUNPATH_SEARCH_PATHS = (
667+
"$(inherited)",
668+
"@executable_path/Frameworks",
669+
);
670+
MACOSX_DEPLOYMENT_TARGET = 11.0;
654671
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
655672
MTL_FAST_MATH = YES;
656673
PRODUCT_BUNDLE_IDENTIFIER = me.vinhis.Example;
@@ -707,8 +724,11 @@
707724
GCC_WARN_UNUSED_VARIABLE = YES;
708725
INFOPLIST_FILE = Example/Info.plist;
709726
IPHONEOS_DEPLOYMENT_TARGET = 13.2;
710-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
711-
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
727+
LD_RUNPATH_SEARCH_PATHS = (
728+
"$(inherited)",
729+
"@executable_path/Frameworks",
730+
);
731+
MACOSX_DEPLOYMENT_TARGET = 11.0;
712732
MTL_ENABLE_DEBUG_INFO = NO;
713733
MTL_FAST_MATH = YES;
714734
PRODUCT_BUNDLE_IDENTIFIER = me.vinhis.Example;
@@ -769,8 +789,12 @@
769789
GCC_WARN_UNUSED_VARIABLE = YES;
770790
INFOPLIST_FILE = Tests/Info.plist;
771791
IPHONEOS_DEPLOYMENT_TARGET = 13.2;
772-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
773-
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
792+
LD_RUNPATH_SEARCH_PATHS = (
793+
"$(inherited)",
794+
"@executable_path/Frameworks",
795+
"@loader_path/Frameworks",
796+
);
797+
MACOSX_DEPLOYMENT_TARGET = 11.0;
774798
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
775799
MTL_FAST_MATH = YES;
776800
PRODUCT_BUNDLE_IDENTIFIER = me.vinhis.Tests;
@@ -830,8 +854,12 @@
830854
GCC_WARN_UNUSED_VARIABLE = YES;
831855
INFOPLIST_FILE = Tests/Info.plist;
832856
IPHONEOS_DEPLOYMENT_TARGET = 13.2;
833-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
834-
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
857+
LD_RUNPATH_SEARCH_PATHS = (
858+
"$(inherited)",
859+
"@executable_path/Frameworks",
860+
"@loader_path/Frameworks",
861+
);
862+
MACOSX_DEPLOYMENT_TARGET = 11.0;
835863
MTL_ENABLE_DEBUG_INFO = NO;
836864
MTL_FAST_MATH = YES;
837865
PRODUCT_BUNDLE_IDENTIFIER = me.vinhis.Tests;
@@ -847,6 +875,7 @@
847875
OBJ_100 /* Release */ = {
848876
isa = XCBuildConfiguration;
849877
buildSettings = {
878+
CODE_SIGN_IDENTITY = "";
850879
CURRENT_PROJECT_VERSION = 48;
851880
ENABLE_TESTABILITY = YES;
852881
FRAMEWORK_SEARCH_PATHS = (
@@ -856,8 +885,11 @@
856885
HEADER_SEARCH_PATHS = "$(inherited)";
857886
INFOPLIST_FILE = NVActivityIndicatorView.xcodeproj/NVActivityIndicatorViewExtended_Info.plist;
858887
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
859-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
860-
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
888+
LD_RUNPATH_SEARCH_PATHS = (
889+
"$(inherited)",
890+
"$(TOOLCHAIN_DIR)/usr/lib/swift/macosx",
891+
);
892+
MACOSX_DEPLOYMENT_TARGET = 11.0;
861893
MARKETING_VERSION = 5.1.0;
862894
OTHER_CFLAGS = "$(inherited)";
863895
OTHER_LDFLAGS = "$(inherited)";
@@ -878,8 +910,9 @@
878910
OBJ_109 /* Debug */ = {
879911
isa = XCBuildConfiguration;
880912
buildSettings = {
913+
CODE_SIGN_IDENTITY = "";
881914
LD = /usr/bin/true;
882-
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
915+
MACOSX_DEPLOYMENT_TARGET = 11.0;
883916
OTHER_SWIFT_FLAGS = "-swift-version 5 -I $(TOOLCHAIN_DIR)/usr/lib/swift/pm/4_2 -target x86_64-apple-macosx10.10 -sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -package-description-version 5";
884917
SWIFT_VERSION = 5.0;
885918
TARGETED_DEVICE_FAMILY = "1,2";
@@ -889,8 +922,9 @@
889922
OBJ_110 /* Release */ = {
890923
isa = XCBuildConfiguration;
891924
buildSettings = {
925+
CODE_SIGN_IDENTITY = "";
892926
LD = /usr/bin/true;
893-
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
927+
MACOSX_DEPLOYMENT_TARGET = 11.0;
894928
OTHER_SWIFT_FLAGS = "-swift-version 5 -I $(TOOLCHAIN_DIR)/usr/lib/swift/pm/4_2 -target x86_64-apple-macosx10.10 -sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -package-description-version 5";
895929
SWIFT_VERSION = 5.0;
896930
TARGETED_DEVICE_FAMILY = "1,2";
@@ -926,6 +960,7 @@
926960
ENABLE_NS_ASSERTIONS = YES;
927961
ENABLE_STRICT_OBJC_MSGSEND = YES;
928962
ENABLE_TESTABILITY = YES;
963+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
929964
GCC_NO_COMMON_BLOCKS = YES;
930965
GCC_OPTIMIZATION_LEVEL = 0;
931966
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -945,6 +980,7 @@
945980
OTHER_SWIFT_FLAGS = "$(inherited) -DXcode";
946981
PRODUCT_NAME = "$(TARGET_NAME)";
947982
SDKROOT = iphoneos;
983+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
948984
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
949985
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) SWIFT_PACKAGE DEBUG";
950986
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -980,6 +1016,7 @@
9801016
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
9811017
DYLIB_INSTALL_NAME_BASE = "@rpath";
9821018
ENABLE_STRICT_OBJC_MSGSEND = YES;
1019+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
9831020
GCC_NO_COMMON_BLOCKS = YES;
9841021
GCC_OPTIMIZATION_LEVEL = s;
9851022
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -997,9 +1034,11 @@
9971034
OTHER_SWIFT_FLAGS = "$(inherited) -DXcode";
9981035
PRODUCT_NAME = "$(TARGET_NAME)";
9991036
SDKROOT = iphoneos;
1037+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
10001038
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
10011039
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) SWIFT_PACKAGE";
1002-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1040+
SWIFT_COMPILATION_MODE = wholemodule;
1041+
SWIFT_OPTIMIZATION_LEVEL = "-O";
10031042
SWIFT_VERSION = 5.0;
10041043
USE_HEADERMAP = NO;
10051044
};
@@ -1008,6 +1047,7 @@
10081047
OBJ_56 /* Debug */ = {
10091048
isa = XCBuildConfiguration;
10101049
buildSettings = {
1050+
CODE_SIGN_IDENTITY = "";
10111051
CURRENT_PROJECT_VERSION = 48;
10121052
ENABLE_TESTABILITY = YES;
10131053
FRAMEWORK_SEARCH_PATHS = (
@@ -1017,8 +1057,11 @@
10171057
HEADER_SEARCH_PATHS = "$(inherited)";
10181058
INFOPLIST_FILE = NVActivityIndicatorView.xcodeproj/NVActivityIndicatorView_Info.plist;
10191059
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1020-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
1021-
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
1060+
LD_RUNPATH_SEARCH_PATHS = (
1061+
"$(inherited)",
1062+
"$(TOOLCHAIN_DIR)/usr/lib/swift/macosx",
1063+
);
1064+
MACOSX_DEPLOYMENT_TARGET = 11.0;
10221065
MARKETING_VERSION = 5.1.0;
10231066
OTHER_CFLAGS = "$(inherited)";
10241067
OTHER_LDFLAGS = "$(inherited)";
@@ -1039,6 +1082,7 @@
10391082
OBJ_57 /* Release */ = {
10401083
isa = XCBuildConfiguration;
10411084
buildSettings = {
1085+
CODE_SIGN_IDENTITY = "";
10421086
CURRENT_PROJECT_VERSION = 48;
10431087
ENABLE_TESTABILITY = YES;
10441088
FRAMEWORK_SEARCH_PATHS = (
@@ -1048,8 +1092,11 @@
10481092
HEADER_SEARCH_PATHS = "$(inherited)";
10491093
INFOPLIST_FILE = NVActivityIndicatorView.xcodeproj/NVActivityIndicatorView_Info.plist;
10501094
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1051-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
1052-
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
1095+
LD_RUNPATH_SEARCH_PATHS = (
1096+
"$(inherited)",
1097+
"$(TOOLCHAIN_DIR)/usr/lib/swift/macosx",
1098+
);
1099+
MACOSX_DEPLOYMENT_TARGET = 11.0;
10531100
MARKETING_VERSION = 5.1.0;
10541101
OTHER_CFLAGS = "$(inherited)";
10551102
OTHER_LDFLAGS = "$(inherited)";
@@ -1070,6 +1117,7 @@
10701117
OBJ_99 /* Debug */ = {
10711118
isa = XCBuildConfiguration;
10721119
buildSettings = {
1120+
CODE_SIGN_IDENTITY = "";
10731121
CURRENT_PROJECT_VERSION = 48;
10741122
ENABLE_TESTABILITY = YES;
10751123
FRAMEWORK_SEARCH_PATHS = (
@@ -1079,8 +1127,11 @@
10791127
HEADER_SEARCH_PATHS = "$(inherited)";
10801128
INFOPLIST_FILE = NVActivityIndicatorView.xcodeproj/NVActivityIndicatorViewExtended_Info.plist;
10811129
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1082-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
1083-
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
1130+
LD_RUNPATH_SEARCH_PATHS = (
1131+
"$(inherited)",
1132+
"$(TOOLCHAIN_DIR)/usr/lib/swift/macosx",
1133+
);
1134+
MACOSX_DEPLOYMENT_TARGET = 11.0;
10841135
MARKETING_VERSION = 5.1.0;
10851136
OTHER_CFLAGS = "$(inherited)";
10861137
OTHER_LDFLAGS = "$(inherited)";
@@ -1156,6 +1207,30 @@
11561207
defaultConfigurationName = Release;
11571208
};
11581209
/* End XCConfigurationList section */
1210+
1211+
/* Begin XCRemoteSwiftPackageReference section */
1212+
1F0742CF2F6A408300304500 /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */ = {
1213+
isa = XCRemoteSwiftPackageReference;
1214+
repositoryURL = "https://github.com/SimplyDanny/SwiftLintPlugins";
1215+
requirement = {
1216+
kind = upToNextMajorVersion;
1217+
minimumVersion = 0.63.2;
1218+
};
1219+
};
1220+
/* End XCRemoteSwiftPackageReference section */
1221+
1222+
/* Begin XCSwiftPackageProductDependency section */
1223+
1F0742D02F6A40C600304500 /* SwiftLintBuildToolPlugin */ = {
1224+
isa = XCSwiftPackageProductDependency;
1225+
package = 1F0742CF2F6A408300304500 /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */;
1226+
productName = "plugin:SwiftLintBuildToolPlugin";
1227+
};
1228+
1F0742D22F6A40CF00304500 /* SwiftLintBuildToolPlugin */ = {
1229+
isa = XCSwiftPackageProductDependency;
1230+
package = 1F0742CF2F6A408300304500 /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */;
1231+
productName = "plugin:SwiftLintBuildToolPlugin";
1232+
};
1233+
/* End XCSwiftPackageProductDependency section */
11591234
};
11601235
rootObject = OBJ_1 /* Project object */;
11611236
}

‎NVActivityIndicatorView.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎NVActivityIndicatorView.xcodeproj/xcshareddata/xcschemes/Example.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1420"
3+
LastUpgradeVersion = "2630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎NVActivityIndicatorView.xcodeproj/xcshareddata/xcschemes/NVActivityIndicatorView-Package.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1420"
3+
LastUpgradeVersion = "2630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Sources/Base/NVActivityIndicatorView.swift‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -532,11 +532,9 @@ public final class NVActivityIndicatorView: UIView {
532532

533533
// swiftlint:disable:next identifier_name
534534
func _setTypeName(_ typeName: String) {
535-
for item in NVActivityIndicatorType.allCases {
536-
if String(describing: item).caseInsensitiveCompare(typeName) == ComparisonResult.orderedSame {
537-
type = item
538-
break
539-
}
535+
for item in NVActivityIndicatorType.allCases where String(describing: item).caseInsensitiveCompare(typeName) == .orderedSame {
536+
type = item
537+
break
540538
}
541539
}
542540

0 commit comments

Comments
 (0)