8000 Merge pull request #842 from KelCodesStuff/Swift-4.2-Heap · jerrytdev/swift-algorithm-club@55b6907 · GitHub
[go: up one dir, main page]
Skip to content

Commit 55b6907

Browse files
richard-ashrichard-ash
authored
Merge pull request kodecocodes#842 from KelCodesStuff/Swift-4.2-Heap
[Swift 4.2] Updated Heap
2 parents 5b2a3b0 + 0a2793f commit 55b6907

File tree

4 files changed

+31
-19
lines changed

4 files changed

+31
-19
lines changed

‎Heap/Tests/HeapTests.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@ import XCTest
77

88
class HeapTests: XCTestCase {
99

10-
func testSwift4() {
11-
// last checked with Xcode 9.0b4
12-
#if swift(>=4.0)
13-
print("Hello, Swift 4!")
14-
#endif
15-
}
16-
1710
fileprivate func verifyMaxHeap(_ h: Heap<Int>) -> Bool {
1811
for i in 0..<h.count {
1912
let left = h.leftChildIndex(ofIndex: i)

‎Heap/Tests/Tests.xcodeproj/project.pbxproj

< 10000 button data-component="IconButton" type="button" class="prc-Button-ButtonBase-c50BI ml-1 flex-shrink-0 prc-Button-IconButton-szpyj" data-loading="false" data-no-visuals="true" data-size="medium" data-variant="invisible" aria-describedby=":Rejddlab:-loading-announcement" aria-labelledby=":Rjddlab:">
Lines changed: 22 additions & 9 deletions
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 */
@@ -83,17 +83,17 @@
8383
isa = PBXProject;
8484
attributes = {
8585
LastSwiftUpdateCheck = 0720;
86-
LastUpgradeCheck = 0920;
86+
LastUpgradeCheck = 1010;
8787
ORGANIZATIONNAME = "Swift Algorithm Club";
8888
TargetAttributes = {
8989
7B2BBC7F1C779D720067B71D = {
9090
CreatedOnToolsVersion = 7.2;
91-
LastSwiftMigration = 0820;
91+
LastSwiftMigration = 1010;
9292
};
9393
};
9494
};
9595
buildConfigurationList = 7B2BBC6C1C779D710067B71D /* Build configuration list for PBXProject "Tests" */;
96-
compatibilityVersion = "Xcode 3.2";
96+
compatibilityVersion = "Xcode 10.0";
9797
developmentRegion = English;
9898
hasScannedForEncodings = 0;
9999
knownRegions = (
@@ -145,12 +145,14 @@
145145
CLANG_WARN_BOOL_CONVERSION = YES;
146146
CLANG_WARN_COMMA = YES;
147147
CLANG_WARN_CONSTANT_CONVERSION = YES;
148+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
148149
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
149150
CLANG_WARN_EMPTY_BODY = YES;
150151
CLANG_WARN_ENUM_CONVERSION = YES;
151152
CLANG_WARN_INFINITE_RECURSION = YES;
152153
CLANG_WARN_INT_CONVERSION = YES;
153154
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
155+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
154156
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
155157
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
< 10000 code>156158
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -197,12 +199,14 @@
197199
CLANG_WARN_BOOL_CONVERSION = YES;
198200
CLANG_WARN_COMMA = YES;
199201
CLANG_WARN_CONSTANT_CONVERSION = YES;
202+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
200203
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
201204
CLANG_WARN_EMPTY_BODY = YES;
202205
CLANG_WARN_ENUM_CONVERSION = YES;
203206
CLANG_WARN_INFINITE_RECURSION = YES;
204207
CLANG_WARN_INT_CONVERSION = YES;
205208
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
209+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
206210
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
207211
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
208212
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -226,7 +230,8 @@
226230
MACOSX_DEPLOYMENT_TARGET = 10.11;
227231
MTL_ENABLE_DEBUG_INFO = NO;
228232
SDKROOT = macosx;
229-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
233+
SWIFT_COMPILATION_MODE = wholemodule;
234+
SWIFT_OPTIMIZATION_LEVEL = "-O";
230235
};
231236
name = Release;
232237
};
@@ -235,10 +240,14 @@
235240
buildSettings = {
236241
COMBINE_HIDPI_IMAGES = YES;
237242
INFOPLIST_FILE = Info.plist;
238-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
243+
LD_RUNPATH_SEARCH_PATHS = (
244+
"$(inherited)",
245+
"@executable_path/../Frameworks",
246+
"@loader_path/../Frameworks",
247+
);
239248
PRODUCT_BUNDLE_IDENTIFIER = swift.algorithm.club.Tests;
240249
PRODUCT_NAME = "$(TARGET_NAME)";
241-
SWIFT_VERSION = 4.0;
250+
SWIFT_VERSION = 4.2;
242251
};
243252
name = Debug;
244253
};
@@ -247,10 +256,14 @@
247256
buildSettings = {
248257
COMBINE_HIDPI_IMAGES = YES;
249258
INFOPLIST_FILE = Info.plist;
250-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
259+
LD_RUNPATH_SEARCH_PATHS = (
260+
"$(inherited)",
261+
"@executable_path/../Frameworks",
262+
"@loader_path/../Frameworks",
263+
);
251264
PRODUCT_BUNDLE_IDENTIFIER = swift.algorithm.club.Tests;
252265
PRODUCT_NAME = "$(TARGET_NAME)";
253-
SWIFT_VERSION = 4.0;
266+
SWIFT_VERSION = 4.2;
254267
};
255268
name = Release;
256269
};

‎Heap/Tests/Tests.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 8 additions & 0 deletions
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/Tests/Tests.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0920"
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)
0