Skip to content

Commit 71b20f4

Browse files
Removes Swift 4.0 checks and updates the Swift version to 4.2.
1 parent a31bd41 commit 71b20f4

File tree

4 files changed

+22
-9
lines changed

4 files changed

+22
-9
lines changed

Comb Sort/Comb Sort.playground/Contents.swift

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
// Created by Stephen Rutstein
33
// 7-16-2016
44

5-
import Cocoa
6-
// last checked with Xcode 9.0b4
7-
#if swift(>=4.0)
8-
print("Hello, Swift 4!")
9-
#endif
5+
import Foundation
106

117
// Test Comb Sort with small array of ten values
128
let array = [2, 32, 9, -1, 89, 101, 55, -10, -12, 67]

Comb Sort/Tests/CombSortTests.swift

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ class CombSortTests: XCTestCase {
1717
print("Hello, Swift 4!")
1818
#endif
1919
}
20+
2021
override func setUp() {
2122
super.setUp()
2223
sequence = [2, 32, 9, -1, 89, 101, 55, -10, -12, 67]

Comb Sort/Tests/Tests.xcodeproj/project.pbxproj

+19-3
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
isa = PBXProject;
8383
attributes = {
8484
LastSwiftUpdateCheck = 0820;
85-
LastUpgradeCheck = 0820;
85+
LastUpgradeCheck = 1000;
8686
ORGANIZATIONNAME = "Swift Algorithm Club";
8787
TargetAttributes = {
8888
056E92741E2483D300B30F52 = {
@@ -142,15 +142,23 @@
142142
CLANG_CXX_LIBRARY = "libc++";
143143
CLANG_ENABLE_MODULES = YES;
144144
CLANG_ENABLE_OBJC_ARC = YES;
145+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
145146
CLANG_WARN_BOOL_CONVERSION = YES;
147+
CLANG_WARN_COMMA = YES;
146148
CLANG_WARN_CONSTANT_CONVERSION = YES;
149+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
147150
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
148151
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
149152
CLANG_WARN_EMPTY_BODY = YES;
150153
CLANG_WARN_ENUM_CONVERSION = YES;
151154
CLANG_WARN_INFINITE_RECURSION = YES;
152155
CLANG_WARN_INT_CONVERSION = YES;
156+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
157+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
158+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
153159
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
160+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
161+
CLANG_WARN_STRICT_PROTOTYPES = YES;
154162
CLANG_WARN_SUSPICIOUS_MOVE = YES;
155163
CLANG_WARN_UNREACHABLE_CODE = YES;
156164
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -192,15 +200,23 @@
192200
CLANG_CXX_LIBRARY = "libc++";
193201
CLANG_ENABLE_MODULES = YES;
194202
CLANG_ENABLE_OBJC_ARC = YES;
203+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
195204
CLANG_WARN_BOOL_CONVERSION = YES;
205+
CLANG_WARN_COMMA = YES;
196206
CLANG_WARN_CONSTANT_CONVERSION = YES;
207+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
197208
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
198209
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
199210
CLANG_WARN_EMPTY_BODY = YES;
200211
CLANG_WARN_ENUM_CONVERSION = YES;
201212
CLANG_WARN_INFINITE_RECURSION = YES;
202213
CLANG_WARN_INT_CONVERSION = YES;
214+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
215+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
216+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
203217
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
218+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
219+
CLANG_WARN_STRICT_PROTOTYPES = YES;
204220
CLANG_WARN_SUSPICIOUS_MOVE = YES;
205221
CLANG_WARN_UNREACHABLE_CODE = YES;
206222
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -235,7 +251,7 @@
235251
PRODUCT_BUNDLE_IDENTIFIER = "Swift-Algorithm-Club.Tests";
236252
PRODUCT_NAME = "$(TARGET_NAME)";
237253
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
238-
SWIFT_VERSION = 4.0;
254+
SWIFT_VERSION = 4.2;
239255
};
240256
name = Debug;
241257
};
@@ -248,7 +264,7 @@
248264
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
249265
PRODUCT_BUNDLE_IDENTIFIER = "Swift-Algorithm-Club.Tests";
250266
PRODUCT_NAME = "$(TARGET_NAME)";
251-
SWIFT_VERSION = 4.0;
267+
SWIFT_VERSION = 4.2;
252268
};
253269
name = Release;
254270
};

Comb Sort/Tests/Tests.xcodeproj/xcshareddata/xcschemes/Tests.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 = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)