Skip to content

Commit 9696233

Browse files
Sri HarishSri Harish
authored andcommitted
Updated to Swift 4
1 parent e102fec commit 9696233

File tree

2 files changed

+23
-8
lines changed

2 files changed

+23
-8
lines changed

Keylogger/Keylogger.xcodeproj/project.pbxproj

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,12 @@
111111
isa = PBXProject;
112112
attributes = {
113113
LastSwiftUpdateCheck = 0820;
114-
LastUpgradeCheck = 0820;
114+
LastUpgradeCheck = 0900;
115115
ORGANIZATIONNAME = "Skrew Everything";
116116
TargetAttributes = {
117117
04D2C4DA1E41EB2500550C68 = {
118118
CreatedOnToolsVersion = 8.2.1;
119-
LastSwiftMigration = 0820;
119+
LastSwiftMigration = 0900;
120120
ProvisioningStyle = Automatic;
121121
};
122122
};
@@ -161,15 +161,21 @@
161161
CLANG_CXX_LIBRARY = "libc++";
162162
CLANG_ENABLE_MODULES = YES;
163163
CLANG_ENABLE_OBJC_ARC = YES;
164+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
164165
CLANG_WARN_BOOL_CONVERSION = YES;
166+
CLANG_WARN_COMMA = YES;
165167
CLANG_WARN_CONSTANT_CONVERSION = YES;
166168
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
167169
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
168170
CLANG_WARN_EMPTY_BODY = YES;
169171
CLANG_WARN_ENUM_CONVERSION = YES;
170172
CLANG_WARN_INFINITE_RECURSION = YES;
171173
CLANG_WARN_INT_CONVERSION = YES;
174+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
175+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
172176
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
177+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
178+
CLANG_WARN_STRICT_PROTOTYPES = YES;
173179
CLANG_WARN_SUSPICIOUS_MOVE = YES;
174180
CLANG_WARN_UNREACHABLE_CODE = YES;
175181
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -209,15 +215,21 @@
209215
CLANG_CXX_LIBRARY = "libc++";
210216
CLANG_ENABLE_MODULES = YES;
211217
CLANG_ENABLE_OBJC_ARC = YES;
218+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
212219
CLANG_WARN_BOOL_CONVERSION = YES;
220+
CLANG_WARN_COMMA = YES;
213221
CLANG_WARN_CONSTANT_CONVERSION = YES;
214222
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
215223
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
216224
CLANG_WARN_EMPTY_BODY = YES;
217225
CLANG_WARN_ENUM_CONVERSION = YES;
218226
CLANG_WARN_INFINITE_RECURSION = YES;
219227
CLANG_WARN_INT_CONVERSION = YES;
228+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
229+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
220230
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
231+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
232+
CLANG_WARN_STRICT_PROTOTYPES = YES;
221233
CLANG_WARN_SUSPICIOUS_MOVE = YES;
222234
CLANG_WARN_UNREACHABLE_CODE = YES;
223235
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -237,6 +249,7 @@
237249
MACOSX_DEPLOYMENT_TARGET = 10.12;
238250
MTL_ENABLE_DEBUG_INFO = NO;
239251
SDKROOT = macosx;
252+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
240253
};
241254
name = Release;
242255
};
@@ -247,7 +260,8 @@
247260
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
248261
PRODUCT_NAME = "$(TARGET_NAME)";
249262
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
250-
SWIFT_VERSION = 3.0;
263+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
264+
SWIFT_VERSION = 4.0;
251265
};
252266
name = Debug;
253267
};
@@ -258,7 +272,8 @@
258272
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
259273
PRODUCT_NAME = "$(TARGET_NAME)";
260274
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
261-
SWIFT_VERSION = 3.0;
275+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
276+
SWIFT_VERSION = 4.0;
262277
};
263278
name = Release;
264279
};

Keylogger/Keylogger/Keylogger.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ class Keylogger
5656
let observer = UnsafeMutableRawPointer(Unmanaged.passUnretained(self).toOpaque())
5757

5858
/* App switching notification*/
59-
NSWorkspace.shared().notificationCenter.addObserver(self,
59+
NSWorkspace.shared.notificationCenter.addObserver(self,
6060
selector: #selector(activatedApp),
61-
name: NSNotification.Name.NSWorkspaceDidActivateApplication,
61+
name: NSWorkspace.didActivateApplicationNotification,
6262
object: nil)
6363
/* Connected and Disconnected Call Backs */
6464
IOHIDManagerRegisterDeviceMatchingCallback(manager, CallBackFunctions.Handle_DeviceMatchingCallback, observer)
@@ -82,10 +82,10 @@ class Keylogger
8282
RunLoop.current.run()
8383
}
8484

85-
dynamic func activatedApp(notification: NSNotification)
85+
@objc dynamic func activatedApp(notification: NSNotification)
8686
{
8787
if let info = notification.userInfo,
88-
let app = info[NSWorkspaceApplicationKey] as? NSRunningApplication,
88+
let app = info[NSWorkspace.applicationUserInfoKey] as? NSRunningApplication,
8989
let name = app.localizedName
9090
{
9191
self.appName = name

0 commit comments

Comments
 (0)