Skip to content

Commit 7515b3b

Browse files
committed
updated tests to Swift 4.2
1 parent fd02263 commit 7515b3b

File tree

4 files changed

+33
-9
lines changed

4 files changed

+33
-9
lines changed

SwiftyTimerTests/SwiftyTimerTests.xcodeproj/project.pbxproj

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
isa = PBXProject;
9191
attributes = {
9292
LastSwiftUpdateCheck = 0700;
93-
LastUpgradeCheck = 0800;
93+
LastUpgradeCheck = 1000;
9494
TargetAttributes = {
9595
6EE9C1521B00BB5B00D6B91C = {
9696
CreatedOnToolsVersion = 6.4;
@@ -147,14 +147,22 @@
147147
CLANG_CXX_LIBRARY = "libc++";
148148
CLANG_ENABLE_MODULES = YES;
149149
CLANG_ENABLE_OBJC_ARC = YES;
150+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
150151
CLANG_WARN_BOOL_CONVERSION = YES;
152+
CLANG_WARN_COMMA = YES;
151153
CLANG_WARN_CONSTANT_CONVERSION = YES;
154+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
152155
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
153156
CLANG_WARN_EMPTY_BODY = YES;
154157
CLANG_WARN_ENUM_CONVERSION = YES;
155158
CLANG_WARN_INFINITE_RECURSION = YES;
156159
CLANG_WARN_INT_CONVERSION = YES;
160+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
161+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
162+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
157163
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
164+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
165+
CLANG_WARN_STRICT_PROTOTYPES = YES;
158166
CLANG_WARN_SUSPICIOUS_MOVE = YES;
159167
CLANG_WARN_UNREACHABLE_CODE = YES;
160168
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -183,7 +191,7 @@
183191
ONLY_ACTIVE_ARCH = YES;
184192
SDKROOT = macosx;
185193
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
186-
SWIFT_VERSION = 3.0;
194+
SWIFT_VERSION = 4.2;
187195
};
188196
name = Debug;
189197
};
@@ -195,14 +203,22 @@
195203
CLANG_CXX_LIBRARY = "libc++";
196204
CLANG_ENABLE_MODULES = YES;
197205
CLANG_ENABLE_OBJC_ARC = YES;
206+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
198207
CLANG_WARN_BOOL_CONVERSION = YES;
208+
CLANG_WARN_COMMA = YES;
199209
CLANG_WARN_CONSTANT_CONVERSION = YES;
210+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
200211
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
201212
CLANG_WARN_EMPTY_BODY = YES;
202213
CLANG_WARN_ENUM_CONVERSION = YES;
203214
CLANG_WARN_INFINITE_RECURSION = YES;
204215
CLANG_WARN_INT_CONVERSION = YES;
216+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
217+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
218+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
205219
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
220+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
221+
CLANG_WARN_STRICT_PROTOTYPES = YES;
206222
CLANG_WARN_SUSPICIOUS_MOVE = YES;
207223
CLANG_WARN_UNREACHABLE_CODE = YES;
208224
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -222,7 +238,7 @@
222238
MACOSX_DEPLOYMENT_TARGET = 10.10;
223239
MTL_ENABLE_DEBUG_INFO = NO;
224240
SDKROOT = macosx;
225-
SWIFT_VERSION = 3.0;
241+
SWIFT_VERSION = 4.2;
226242
};
227243
name = Release;
228244
};
@@ -235,7 +251,7 @@
235251
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
236252
PRODUCT_BUNDLE_IDENTIFIER = "radex.$(PRODUCT_NAME:rfc1034identifier)";
237253
PRODUCT_NAME = "$(TARGET_NAME)";
238-
SWIFT_VERSION = 3.0;
254+
SWIFT_VERSION = 4.2;
239255
};
240256
name = Debug;
241257
};
@@ -249,7 +265,7 @@
249265
PRODUCT_BUNDLE_IDENTIFIER = "radex.$(PRODUCT_NAME:rfc1034identifier)";
250266
PRODUCT_NAME = "$(TARGET_NAME)";
251267
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
252-
SWIFT_VERSION = 3.0;
268+
SWIFT_VERSION = 4.2;
253269
};
254270
name = Release;
255271
};
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>

SwiftyTimerTests/SwiftyTimerTests.xcodeproj/xcshareddata/xcschemes/SwiftyTimerTests.xcscheme

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

SwiftyTimerTests/SwiftyTimerTests/main.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Cocoa
22

3-
let app = NSApplication.shared()
3+
let app = NSApplication.shared
44

55
class AppDelegate: NSObject, NSApplicationDelegate {
66
func applicationDidFinishLaunching(_ aNotification: Notification) {
@@ -51,7 +51,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
5151
let timer = Timer.new(after: 0.1.seconds) {
5252
self.test5()
5353
}
54-
RunLoop.current.add(timer, forMode: .defaultRunLoopMode)
54+
RunLoop.current.add(timer, forMode: .default)
5555
}
5656

5757
var timer4: Timer!
@@ -74,7 +74,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
7474
self.test7()
7575
}
7676

77-
timer.start(runLoop: .current, modes: .defaultRunLoopMode, .eventTrackingRunLoopMode)
77+
timer.start(runLoop: .current, modes: .default, .eventTracking)
7878
}
7979

8080
func test7() {

0 commit comments

Comments
 (0)