Skip to content

Commit 69ea859

Browse files
NirmaNirma
authored
Merge branch 'master' into fix/code-cleanup
2 parents d79284d + f8c3584 commit 69ea859

16 files changed

+60
-1348
lines changed

‎CryptoSwift.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
@@ -207,20 +207,15 @@
207207
75211F94207249D8004E41F8 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
208208
75211FA0207249D8004E41F8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
209209
75211FA520724A0F004E41F8 /* CryptoSwift-TestHostApp-Test.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "CryptoSwift-TestHostApp-Test.xcconfig"; sourceTree = "<group>"; };
210-
75211FA620724A0F004E41F8 /* Project-Test.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Project-Test.xcconfig"; sourceTree = "<group>"; };
211-
75211FA720724A0F004E41F8 /* Tests-Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Tests-Debug.xcconfig"; sourceTree = "<group>"; };
212210
75211FA820724A0F004E41F8 /* CryptoSwift-Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "CryptoSwift-Shared.xcconfig"; sourceTree = "<group>"; };
213211
75211FA920724A0F004E41F8 /* CryptoSwift-TestHostApp-Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "CryptoSwift-TestHostApp-Shared.xcconfig"; sourceTree = "<group>"; };
214212
75211FAA20724A0F004E41F8 /* Project-Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Project-Release.xcconfig"; sourceTree = "<group>"; };
215-
75211FAB20724A0F004E41F8 /* CryptoSwift-TestHostApp-Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "CryptoSwift-TestHostApp-Debug.xcconfig"; sourceTree = "<group>"; };
216213
75211FAC20724A0F004E41F8 /* CryptoSwift-Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "CryptoSwift-Release.xcconfig"; sourceTree = "<group>"; };
217-
75211FAD20724A0F004E41F8 /* Tests-Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Tests-Release.xcconfig"; sourceTree = "<group>"; };
218214
75211FAE20724A10004E41F8 /* Tests-Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Tests-Shared.xcconfig"; sourceTree = "<group>"; };
219215
75211FAF20724A10004E41F8 /* CryptoSwift-Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "CryptoSwift-Debug.xcconfig"; sourceTree = "<group>"; };
220216
75211FB020724A10004E41F8 /* Project-Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Project-Debug.xcconfig"; sourceTree = "<group>"; };
221217
75211FB120724A10004E41F8 /* Tests-Test.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Tests-Test.xcconfig"; sourceTree = "<group>"; };
222218
75211FB220724A10004E41F8 /* Project-Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Project-Shared.xcconfig"; sourceTree = "<group>"; };
223-
75211FB320724A10004E41F8 /* CryptoSwift-TestHostApp-Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "CryptoSwift-TestHostApp-Release.xcconfig"; sourceTree = "<group>"; };
224219
75211FB420724A10004E41F8 /* CryptoSwift-Test.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "CryptoSwift-Test.xcconfig"; sourceTree = "<group>"; };
225220
7523742C2083C61C0016D662 /* GCM.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GCM.swift; sourceTree = "<group>"; };
226221
7529366920683DFC00195874 /* AEADChaCha20Poly1305.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AEADChaCha20Poly1305.swift; sourceTree = "<group>"; };
@@ -477,16 +472,11 @@
477472
75211FAC20724A0F004E41F8 /* CryptoSwift-Release.xcconfig */,
478473
75211FA820724A0F004E41F8 /* CryptoSwift-Shared.xcconfig */,
479474
75211FB420724A10004E41F8 /* CryptoSwift-Test.xcconfig */,
480-
75211FAB20724A0F004E41F8 /* CryptoSwift-TestHostApp-Debug.xcconfig */,
481-
75211FB320724A10004E41F8 /* CryptoSwift-TestHostApp-Release.xcconfig */,
482475
75211FA520724A0F004E41F8 /* CryptoSwift-TestHostApp-Test.xcconfig */,
483476
75211FA920724A0F004E41F8 /* CryptoSwift-TestHostApp-Shared.xcconfig */,
484477
75211FB020724A10004E41F8 /* Project-Debug.xcconfig */,
485478
75211FAA20724A0F004E41F8 /* Project-Release.xcconfig */,
486479
75211FB220724A10004E41F8 /* Project-Shared.xcconfig */,
487-
75211FA620724A0F004E41F8 /* Project-Test.xcconfig */,
488-
75211FA720724A0F004E41F8 /* Tests-Debug.xcconfig */,
489-
75211FAD20724A0F004E41F8 /* Tests-Release.xcconfig */,
490480
75211FAE20724A10004E41F8 /* Tests-Shared.xcconfig */,
491481
75211FB120724A10004E41F8 /* Tests-Test.xcconfig */,
492482
);
@@ -739,7 +729,7 @@
739729
75211F91207249D8004E41F8 = {
740730
CreatedOnToolsVersion = 9.3;
741731
LastSwiftMigration = 1020;
742-
ProvisioningStyle = Automatic;
732+
ProvisioningStyle = Manual;
743733
};
744734
754BE45419693E190098E6F3 = {
745735
CreatedOnToolsVersion = 6.0;
@@ -978,6 +968,7 @@
978968
};
979969
7564F0622072EB5D00CA5A96 /* PBXTargetDependency */ = {
980970
isa = PBXTargetDependency;
971+
platformFilter = ios;
981972
target = 75211F91207249D8004E41F8 /* CryptoSwift-TestHostApp */;
982973
targetProxy = 7564F0612072EB5D00CA5A96 /* PBXContainerItemProxy */;
983974
};
@@ -998,6 +989,7 @@
998989
};
999990
75F9482220BDDF9900956311 /* PBXTargetDependency */ = {
1000991
isa = PBXTargetDependency;
992+
platformFilter = ios;
1001993
target = 75211F91207249D8004E41F8 /* CryptoSwift-TestHostApp */;
1002994
targetProxy = 75F9482120BDDF9900956311 /* PBXContainerItemProxy */;
1003995
};
@@ -1006,25 +998,20 @@
1006998
/* Begin XCBuildConfiguration section */
1007999
75211FA1207249D8004E41F8 /* Debug */ = {
10081000
isa = XCBuildConfiguration;
1009-
baseConfigurationReference = 75211FAB20724A0F004E41F8 /* CryptoSwift-TestHostApp-Debug.xcconfig */;
10101001
buildSettings = {
1011-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
10121002
};
10131003
name = Debug;
10141004
};
10151005
75211FA2207249D8004E41F8 /* Release */ = {
10161006
isa = XCBuildConfiguration;
1017-
baseConfigurationReference = 75211FB320724A10004E41F8 /* CryptoSwift-TestHostApp-Release.xcconfig */;
10181007
buildSettings = {
1019-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
10201008
};
10211009
name = Release;
10221010
};
10231011
75211FA3207249D8004E41F8 /* Test */ = {
10241012
isa = XCBuildConfiguration;
10251013
baseConfigurationReference = 75211FA520724A0F004E41F8 /* CryptoSwift-TestHostApp-Test.xcconfig */;
10261014
buildSettings = {
1027-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
10281015
};
10291016
name = Test;
10301017
};
@@ -1058,37 +1045,29 @@
10581045
};
10591046
754BE46F19693E190098E6F3 /* Debug */ = {
10601047
isa = XCBuildConfiguration;
1061-
baseConfigurationReference = 75211FA720724A0F004E41F8 /* Tests-Debug.xcconfig */;
10621048
buildSettings = {
10631049
};
10641050
name = Debug;
10651051
};
10661052
754BE47019693E190098E6F3 /* Release */ = {
10671053
isa = XCBuildConfiguration;
1068-
baseConfigurationReference = 75211FAD20724A0F004E41F8 /* Tests-Release.xcconfig */;
10691054
buildSettings = {
10701055
};
10711056
name = Release;
10721057
};
10731058
7564F05D2072EAEB00CA5A96 /* Debug */ = {
10741059
isa = XCBuildConfiguration;
1075-
baseConfigurationReference = 75211FA720724A0F004E41F8 /* Tests-Debug.xcconfig */;
10761060
buildSettings = {
10771061
INFOPLIST_FILE = Tests/TestsPerformance/Info.plist;
10781062
SDKROOT = iphoneos;
1079-
SWIFT_OBJC_BRIDGING_HEADER = Tests/TestsPerformance/Bridging.h;
1080-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CryptoSwift-TestHostApp.app/CryptoSwift-TestHostApp";
10811063
};
10821064
name = Debug;
10831065
};
10841066
7564F05E2072EAEB00CA5A96 /* Release */ = {
10851067
isa = XCBuildConfiguration;
1086-
baseConfigurationReference = 75211FAD20724A0F004E41F8 /* Tests-Release.xcconfig */;
10871068
buildSettings = {
10881069
INFOPLIST_FILE = Tests/TestsPerformance/Info.plist;
10891070
SDKROOT = iphoneos;
1090-
SWIFT_OBJC_BRIDGING_HEADER = Tests/TestsPerformance/Bridging.h;
1091-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CryptoSwift-TestHostApp.app/CryptoSwift-TestHostApp";
10921071
};
10931072
name = Release;
10941073
};
@@ -1098,14 +1077,12 @@
10981077
buildSettings = {
10991078
INFOPLIST_FILE = Tests/TestsPerformance/Info.plist;
11001079
SDKROOT = iphoneos;
1101-
SWIFT_OBJC_BRIDGING_HEADER = Tests/TestsPerformance/Bridging.h;
1102-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CryptoSwift-TestHostApp.app/CryptoSwift-TestHostApp";
11031080
};
11041081
name = Test;
11051082
};
11061083
756B66AA1F6AAFDB00DEC41C /* Test */ = {
11071084
isa = XCBuildConfiguration;
1108-
baseConfigurationReference = 75211FA620724A0F004E41F8 /* Project-Test.xcconfig */;
1085+
baseConfigurationReference = 75211FB220724A10004E41F8 /* Project-Shared.xcconfig */;
11091086
buildSettings = {
11101087
};
11111088
name = Test;
@@ -1126,31 +1103,23 @@
11261103
};
11271104
7595C14F2072E48C00EA1A5F /* Debug */ = {
11281105
isa = XCBuildConfiguration;
1129-
baseConfigurationReference = 75211FA720724A0F004E41F8 /* Tests-Debug.xcconfig */;
11301106
buildSettings = {
1131-
DEVELOPMENT_TEAM = "";
11321107
INFOPLIST_FILE = Tests/TestsPerformance/Info.plist;
1133-
SWIFT_OBJC_BRIDGING_HEADER = Tests/TestsPerformance/Bridging.h;
11341108
};
11351109
name = Debug;
11361110
};
11371111
7595C1502072E48C00EA1A5F /* Release */ = {
11381112
isa = XCBuildConfiguration;
1139-
baseConfigurationReference = 75211FAD20724A0F004E41F8 /* Tests-Release.xcconfig */;
11401113
buildSettings = {
1141-
DEVELOPMENT_TEAM = "";
11421114
INFOPLIST_FILE = Tests/TestsPerformance/Info.plist;
1143-
SWIFT_OBJC_BRIDGING_HEADER = Tests/TestsPerformance/Bridging.h;
11441115
};
11451116
name = Release;
11461117
};
11471118
7595C1512072E48C00EA1A5F /* Test */ = {
11481119
isa = XCBuildConfiguration;
11491120
baseConfigurationReference = 75211FB120724A10004E41F8 /* Tests-Test.xcconfig */;
11501121
buildSettings = {
1151-
DEVELOPMENT_TEAM = "";
11521122
INFOPLIST_FILE = Tests/TestsPerformance/Info.plist;
1153-
SWIFT_OBJC_BRIDGING_HEADER = Tests/TestsPerformance/Bridging.h;
11541123
};
11551124
name = Test;
11561125
};

‎CryptoSwift.xcodeproj/xcshareddata/xcschemes/CryptoSwift-TestHostApp.xcscheme‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
3836
ReferencedContainer = "container:CryptoSwift.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4341
</TestAction>
4442
<LaunchAction
4543
buildConfiguration = "Test"
@@ -61,8 +59,6 @@
6159
ReferencedContainer = "container:CryptoSwift.xcodeproj">
6260
</BuildableReference>
6361
</BuildableProductRunnable>
64-
<AdditionalOptions>
65-
</AdditionalOptions>
6662
</LaunchAction>
6763
<ProfileAction
6864
buildConfiguration = "Release"

‎CryptoSwift.xcodeproj/xcshareddata/xcschemes/CryptoSwift.xcscheme‎

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,34 @@
3434
ReferencedContainer = "container:CryptoSwift.xcodeproj">
3535
</BuildableReference>
3636
</BuildActionEntry>
37+
<BuildActionEntry
38+
buildForTesting = "YES"
39+
buildForRunning = "NO"
40+
buildForProfiling = "NO"
41+
buildForArchiving = "NO"
42+
buildForAnalyzing = "NO">
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "7595C1492072E48C00EA1A5F"
46+
BuildableName = "TestsPerformance-Mac.xctest"
47+
BlueprintName = "TestsPerformance-Mac"
48+
ReferencedContainer = "container:CryptoSwift.xcodeproj">
49+
</BuildableReference>
50+
</BuildActionEntry>
51+
<BuildActionEntry
52+
buildForTesting = "YES"
53+
buildForRunning = "NO"
54+
buildForProfiling = "NO"
55+
buildForArchiving = "NO"
56+
buildForAnalyzing = "NO">
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "7564F04E2072EAEB00CA5A96"
60+
BuildableName = "TestsPerformance-iOS.xctest"
61+
BlueprintName = "TestsPerformance-iOS"
62+
ReferencedContainer = "container:CryptoSwift.xcodeproj">
63+
</BuildableReference>
64+
</BuildActionEntry>
3765
</BuildActionEntries>
3866
</BuildAction>
3967
<TestAction
@@ -64,26 +92,6 @@
6492
ReferencedContainer = "container:CryptoSwift.xcodeproj">
6593
</BuildableReference>
6694
</TestableReference>
67-
<TestableReference
68-
skipped = "YES">
69-
<BuildableReference
70-
BuildableIdentifier = "primary"
71-
BlueprintIdentifier = "7595C1492072E48C00EA1A5F"
72-
BuildableName = "TestsPerformance-Mac.xctest"
73-
BlueprintName = "TestsPerformance-Mac"
74-
ReferencedContainer = "container:CryptoSwift.xcodeproj">
75-
</BuildableReference>
76-
</TestableReference>
77-
<TestableReference
78-
skipped = "YES">
79-
<BuildableReference
80-
BuildableIdentifier = "primary"
81-
BlueprintIdentifier = "7564F04E2072EAEB00CA5A96"
82-
BuildableName = "TestsPerformance-iOS.xctest"
83-
BlueprintName = "TestsPerformance-iOS"
84-
ReferencedContainer = "container:CryptoSwift.xcodeproj">
85-
</BuildableReference>
86-
</TestableReference>
8795
</Testables>
8896
</TestAction>
8997
<LaunchAction

‎config/CryptoSwift-Release.xcconfig‎

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -9,74 +9,10 @@
99

1010

1111
BITCODE_GENERATION_MODE = bitcode
12-
13-
14-
15-
// Use Optimization Profile
16-
//
17-
// When this setting is enabled, `clang` will use the optimization profile collected for
18-
// a target when building it.
19-
2012
CLANG_USE_OPTIMIZATION_PROFILE = NO
21-
22-
23-
24-
// Generate Debug Symbols
25-
//
26-
// Enables or disables generation of debug symbols. When debug symbols are enabled, the
27-
// level of detail can be controlled by the `DEBUG_INFORMATION_FORMAT` setting.
28-
2913
GCC_GENERATE_DEBUGGING_SYMBOLS = NO
30-
31-
32-
33-
// Unroll Loops
34-
//
35-
// Unrolls loops. Unrolling makes the code larger, but may make it faster by reducing the
36-
// number of branches executed.
37-
3814
GCC_UNROLL_LOOPS = YES
39-
40-
41-
42-
// Link-Time Optimization
43-
//
44-
// Enabling this setting allows optimization across file boundaries during linking.
45-
//
46-
// * *No:* Disabled. Do not use link-time optimization.
47-
// * *Monolithic Link-Time Optimization:* This mode performs monolithic link-time
48-
// optimization of binaries, combining all executable code into a single unit and running
49-
// aggressive compiler optimizations.
50-
// * *Incremental Link-Time Optimization:* This mode performs partitioned link-time
51-
// optimization of binaries, inlining between compilation units and running aggressive
52-
// compiler optimizations on each unit in parallel. This enables fast incremental builds
53-
// and uses less memory than Monolithic LTO.
54-
5515
LLVM_LTO = YES
56-
57-
58-
59-
// Disable Safety Checks
60-
//
61-
// Disable runtime safety checks when optimizing.
62-
6316
SWIFT_DISABLE_SAFETY_CHECKS = YES
64-
65-
66-
67-
// Exclusive Access to Memory
68-
//
69-
// Enforce exclusive access to memory
70-
7117
SWIFT_ENFORCE_EXCLUSIVE_ACCESS = compile-time
72-
73-
74-
75-
// Swift Optimization Level
76-
//
77-
// * *None:* Compile without any optimization. [-Onone]
78-
// * *Optimize for Speed:* [-O]
79-
// * *Optimize for Size:* [-Osize]
80-
// * *Whole Module Optimization:* [-O -whole-module-optimization]
81-
8218
SWIFT_OPTIMIZATION_LEVEL = -O

0 commit comments

Comments
 (0)