Skip to content

Commit aa2a318

Browse files
committed
[Swift 4.2] Update All-Pairs Shortest Paths to Swift 4.2
1 parent deae79c commit aa2a318

File tree

9 files changed

+33
-24
lines changed

9 files changed

+33
-24
lines changed

All-Pairs Shortest Paths/APSP/APSP.playground/Contents.swift

-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
//: Playground - noun: a place where people can play
22

3-
// last checked with Xcode 9.0b4
4-
#if swift(>=4.0)
5-
print("Hello, Swift 4!")
6-
#endif
7-
83
import Graph
94
import APSP
105

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<playground version='5.0' target-platform='osx'>
2+
<playground version='5.0' target-platform='osx' last-migration='1010'>
33
<timeline fileName='timeline.xctimeline'/>
44
</playground>

All-Pairs Shortest Paths/APSP/APSP.xcodeproj/project.pbxproj

+20-6
Original file line numberDiff line numberDiff line change
@@ -187,12 +187,12 @@
187187
isa = PBXProject;
188188
attributes = {
189189
LastSwiftUpdateCheck = 0730;
190-
LastUpgradeCheck = 0820;
190+
LastUpgradeCheck = 1010;
191191
ORGANIZATIONNAME = "Swift Algorithm Club";
192192
TargetAttributes = {
193193
493D8DDF1CDD2A1C0089795A = {
194194
CreatedOnToolsVersion = 7.3;
195-
LastSwiftMigration = 0820;
195+
LastSwiftMigration = 1010;
196196
};
197197
493D8DF01CDD5B960089795A = {
198198
CreatedOnToolsVersion = 7.3;
@@ -302,14 +302,22 @@
302302
CLANG_CXX_LIBRARY = "libc++";
303303
CLANG_ENABLE_MODULES = YES;
304304
CLANG_ENABLE_OBJC_ARC = YES;
305+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
305306
CLANG_WARN_BOOL_CONVERSION = YES;
307+
CLANG_WARN_COMMA = YES;
306308
CLANG_WARN_CONSTANT_CONVERSION = YES;
309+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
307310
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
308311
CLANG_WARN_EMPTY_BODY = YES;
309312
CLANG_WARN_ENUM_CONVERSION = YES;
310313
CLANG_WARN_INFINITE_RECURSION = YES;
311314
CLANG_WARN_INT_CONVERSION = YES;
315+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
316+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
317+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
312318
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
319+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
320+
CLANG_WARN_STRICT_PROTOTYPES = YES;
313321
CLANG_WARN_SUSPICIOUS_MOVE = YES;
314322
CLANG_WARN_UNREACHABLE_CODE = YES;
315323
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -349,14 +357,22 @@
349357
CLANG_CXX_LIBRARY = "libc++";
350358
CLANG_ENABLE_MODULES = YES;
351359
CLANG_ENABLE_OBJC_ARC = YES;
360+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
352361
CLANG_WARN_BOOL_CONVERSION = YES;
362+
CLANG_WARN_COMMA = YES;
353363
CLANG_WARN_CONSTANT_CONVERSION = YES;
364+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
354365
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
355366
CLANG_WARN_EMPTY_BODY = YES;
356367
CLANG_WARN_ENUM_CONVERSION = YES;
357368
CLANG_WARN_INFINITE_RECURSION = YES;
358369
CLANG_WARN_INT_CONVERSION = YES;
370+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
371+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
372+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
359373
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
374+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
375+
CLANG_WARN_STRICT_PROTOTYPES = YES;
360376
CLANG_WARN_SUSPICIOUS_MOVE = YES;
361377
CLANG_WARN_UNREACHABLE_CODE = YES;
362378
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -388,7 +404,7 @@
388404
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
389405
PRODUCT_BUNDLE_IDENTIFIER = "com.swift-algorithm-club.APSPTests";
390406
PRODUCT_NAME = "$(TARGET_NAME)";
391-
SWIFT_VERSION = 4.0;
407+
SWIFT_VERSION = 4.2;
392408
};
393409
name = Debug;
394410
};
@@ -400,7 +416,7 @@
400416
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
401417
PRODUCT_BUNDLE_IDENTIFIER = "com.swift-algorithm-club.APSPTests";
402418
PRODUCT_NAME = "$(TARGET_NAME)";
403-
SWIFT_VERSION = 4.0;
419+
SWIFT_VERSION = 4.2;
404420
};
405421
name = Release;
406422
};
@@ -420,7 +436,6 @@
420436
PRODUCT_BUNDLE_IDENTIFIER = "com.swift-algorithm-club.APSP";
421437
PRODUCT_NAME = "$(TARGET_NAME)";
422438
SKIP_INSTALL = YES;
423-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
424439
SWIFT_VERSION = 4.2;
425440
VERSIONING_SYSTEM = "apple-generic";
426441
VERSION_INFO_PREFIX = "";
@@ -443,7 +458,6 @@
443458
PRODUCT_BUNDLE_IDENTIFIER = "com.swift-algorithm-club.APSP";
444459
PRODUCT_NAME = "$(TARGET_NAME)";
445460
SKIP_INSTALL = YES;
446-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
447461
SWIFT_VERSION = 4.2;
448462
VERSIONING_SYSTEM = "apple-generic";
449463
VERSION_INFO_PREFIX = "";

All-Pairs Shortest Paths/APSP/APSP.xcodeproj/xcshareddata/xcschemes/APSP.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

All-Pairs Shortest Paths/APSP/APSP.xcodeproj/xcshareddata/xcschemes/APSPTests.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
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>

All-Pairs Shortest Paths/APSP/APSPTests/APSPTests.swift

-8
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@ struct TestCase<T> where T: Hashable {
1919
}
2020

2121
class APSPTests: XCTestCase {
22-
23-
func testSwift4() {
24-
// last checked with Xcode 9.0b4
25-
#if swift(>=4.0)
26-
print("Hello, Swift 4!")
27-
#endif
28-
}
29-
3022
/**
3123
See Figure 25.1 of “Introduction to Algorithms” by Cormen et al, 3rd ed., pg 690
3224
*/

Graph/Graph.xcodeproj/xcshareddata/xcschemes/Graph.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1000"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Graph/Graph.xcodeproj/xcshareddata/xcschemes/GraphTests.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1000"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)