Skip to content

Commit 70d26fc

Browse files
committed
[Swift 4.2] Updated Heap Sort
1 parent f08d5fc commit 70d26fc

File tree

4 files changed

+31
-18
lines changed

4 files changed

+31
-18
lines changed

Heap Sort/Tests/HeapSortTests.swift

-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
import XCTest
22

33
class HeapSortTests: XCTestCase {
4-
func testSwift4() {
5-
// last checked with Xcode 9.0b4
6-
#if swift(>=4.0)
7-
print("Hello, Swift 4!")
8-
#endif
9-
}
104

115
func testSort() {
126
var h1 = Heap(array: [5, 13, 2, 25, 7, 17, 20, 8, 4], sort: >)

Heap Sort/Tests/Tests.xcodeproj/project.pbxproj

+22-9
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 51;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -86,17 +86,17 @@
8686
isa = PBXProject;
8787
attributes = {
8888
LastSwiftUpdateCheck = 0720;
89-
LastUpgradeCheck = 0900;
89+
LastUpgradeCheck = 1010;
9090
ORGANIZATIONNAME = "Swift Algorithm Club";
9191
TargetAttributes = {
9292
7B2BBC7F1C779D720067B71D = {
9393
CreatedOnToolsVersion = 7.2;
94-
LastSwiftMigration = 0820;
94+
LastSwiftMigration = 1010;
9595
};
9696
};
9797
};
9898
buildConfigurationList = 7B2BBC6C1C779D710067B71D /* Build configuration list for PBXProject "Tests" */;
99-
compatibilityVersion = "Xcode 3.2";
99+
compatibilityVersion = "Xcode 10.0";
100100
developmentRegion = English;
101101
hasScannedForEncodings = 0;
102102
knownRegions = (
@@ -149,12 +149,14 @@
149149
CLANG_WARN_BOOL_CONVERSION = YES;
150150
CLANG_WARN_COMMA = YES;
151151
CLANG_WARN_CONSTANT_CONVERSION = YES;
152+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
152153
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
153154
CLANG_WARN_EMPTY_BODY = YES;
154155
CLANG_WARN_ENUM_CONVERSION = YES;
155156
CLANG_WARN_INFINITE_RECURSION = YES;
156157
CLANG_WARN_INT_CONVERSION = YES;
157158
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
159+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
158160
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
159161
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
160162
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -201,12 +203,14 @@
201203
CLANG_WARN_BOOL_CONVERSION = YES;
202204
CLANG_WARN_COMMA = YES;
203205
CLANG_WARN_CONSTANT_CONVERSION = YES;
206+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
204207
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
205208
CLANG_WARN_EMPTY_BODY = YES;
206209
CLANG_WARN_ENUM_CONVERSION = YES;
207210
CLANG_WARN_INFINITE_RECURSION = YES;
208211
CLANG_WARN_INT_CONVERSION = YES;
209212
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
213+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
210214
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
211215
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
212216
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -230,7 +234,8 @@
230234
MACOSX_DEPLOYMENT_TARGET = 10.11;
231235
MTL_ENABLE_DEBUG_INFO = NO;
232236
SDKROOT = macosx;
233-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
237+
SWIFT_COMPILATION_MODE = wholemodule;
238+
SWIFT_OPTIMIZATION_LEVEL = "-O";
234239
};
235240
name = Release;
236241
};
@@ -239,10 +244,14 @@
239244
buildSettings = {
240245
COMBINE_HIDPI_IMAGES = YES;
241246
INFOPLIST_FILE = Info.plist;
242-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
247+
LD_RUNPATH_SEARCH_PATHS = (
248+
"$(inherited)",
249+
"@executable_path/../Frameworks",
250+
"@loader_path/../Frameworks",
251+
);
243252
PRODUCT_BUNDLE_IDENTIFIER = swift.algorithm.club.Tests;
244253
PRODUCT_NAME = "$(TARGET_NAME)";
245-
SWIFT_VERSION = 4.0;
254+
SWIFT_VERSION = 4.2;
246255
};
247256
name = Debug;
248257
};
@@ -251,10 +260,14 @@
251260
buildSettings = {
252261
COMBINE_HIDPI_IMAGES = YES;
253262
INFOPLIST_FILE = Info.plist;
254-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
263+
LD_RUNPATH_SEARCH_PATHS = (
264+
"$(inherited)",
265+
"@executable_path/../Frameworks",
266+
"@loader_path/../Frameworks",
267+
);
255268
PRODUCT_BUNDLE_IDENTIFIER = swift.algorithm.club.Tests;
256269
PRODUCT_NAME = "$(TARGET_NAME)";
257-
SWIFT_VERSION = 4.0;
270+
SWIFT_VERSION = 4.2;
258271
};
259272
name = Release;
260273
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

Heap Sort/Tests/Tests.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -47,7 +46,6 @@
4746
buildConfiguration = "Debug"
4847
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4948
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
50-
language = ""
5149
launchStyle = "0"
5250
useCustomWorkingDirectory = "NO"
5351
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)