Skip to content
This repository was archived by the owner on May 23, 2022. It is now read-only.

Commit 61eb236

Browse files
morizottermorizotter
authored
Merge pull request #78 from morizotter/morizotter/swift4
Swift4
2 parents 0af67f2 + 4f97af0 commit 61eb236

File tree

10 files changed

+56
-20
lines changed

10 files changed

+56
-20
lines changed

‎.swift-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
4.0

‎Example/Example.xcodeproj/project.pbxproj‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,18 +188,18 @@
188188
attributes = {
189189
LastSwiftMigration = 0710;
190190
LastSwiftUpdateCheck = 0710;
191-
LastUpgradeCheck = 0800;
191+
LastUpgradeCheck = 0900;
192192
ORGANIZATIONNAME = molabo;
193193
TargetAttributes = {
194194
FF828F141A74E52500DC12EF = {
195195
CreatedOnToolsVersion = 6.1.1;
196196
DevelopmentTeam = 8Y439RUF7P;
197-
LastSwiftMigration = 0800;
197+
LastSwiftMigration = 0900;
198198
};
199199
FF828F291A74E52500DC12EF = {
200200
CreatedOnToolsVersion = 6.1.1;
201201
DevelopmentTeam = 8Y439RUF7P;
202-
LastSwiftMigration = 0800;
202+
LastSwiftMigration = 0900;
203203
ProvisioningStyle = Automatic;
204204
TestTargetID = FF828F141A74E52500DC12EF;
205205
};
@@ -307,14 +307,20 @@
307307
CLANG_CXX_LIBRARY = "libc++";
308308
CLANG_ENABLE_MODULES = YES;
309309
CLANG_ENABLE_OBJC_ARC = YES;
310+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
310311
CLANG_WARN_BOOL_CONVERSION = YES;
312+
CLANG_WARN_COMMA = YES;
311313
CLANG_WARN_CONSTANT_CONVERSION = YES;
312314
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
313315
CLANG_WARN_EMPTY_BODY = YES;
314316
CLANG_WARN_ENUM_CONVERSION = YES;
315317
CLANG_WARN_INFINITE_RECURSION = YES;
316318
CLANG_WARN_INT_CONVERSION = YES;
319+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
320+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
317321
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
322+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
323+
CLANG_WARN_STRICT_PROTOTYPES = YES;
318324
CLANG_WARN_SUSPICIOUS_MOVE = YES;
319325
CLANG_WARN_UNREACHABLE_CODE = YES;
320326
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -354,14 +360,20 @@
354360
CLANG_CXX_LIBRARY = "libc++";
355361
CLANG_ENABLE_MODULES = YES;
356362
CLANG_ENABLE_OBJC_ARC = YES;
363+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
357364
CLANG_WARN_BOOL_CONVERSION = YES;
365+
CLANG_WARN_COMMA = YES;
358366
CLANG_WARN_CONSTANT_CONVERSION = YES;
359367
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
360368
CLANG_WARN_EMPTY_BODY = YES;
361369
CLANG_WARN_ENUM_CONVERSION = YES;
362370
CLANG_WARN_INFINITE_RECURSION = YES;
363371
CLANG_WARN_INT_CONVERSION = YES;
372+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
373+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
364374
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
375+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
376+
CLANG_WARN_STRICT_PROTOTYPES = YES;
365377
CLANG_WARN_SUSPICIOUS_MOVE = YES;
366378
CLANG_WARN_UNREACHABLE_CODE = YES;
367379
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -400,7 +412,8 @@
400412
PRODUCT_BUNDLE_IDENTIFIER = "com.molabo.$(PRODUCT_NAME:rfc1034identifier)";
401413
PRODUCT_NAME = "$(TARGET_NAME)";
402414
PROVISIONING_PROFILE = "";
403-
SWIFT_VERSION = 3.0;
415+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
416+
SWIFT_VERSION = 4.0;
404417
TARGETED_DEVICE_FAMILY = "1,2";
405418
};
406419
name = Debug;
@@ -419,7 +432,8 @@
419432
PRODUCT_BUNDLE_IDENTIFIER = "com.molabo.$(PRODUCT_NAME:rfc1034identifier)";
420433
PRODUCT_NAME = "$(TARGET_NAME)";
421434
PROVISIONING_PROFILE = "";
422-
SWIFT_VERSION = 3.0;
435+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
436+
SWIFT_VERSION = 4.0;
423437
TARGETED_DEVICE_FAMILY = "1,2";
424438
};
425439
name = Release;
@@ -442,7 +456,8 @@
442456
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
443457
PRODUCT_BUNDLE_IDENTIFIER = "com.molabo.$(PRODUCT_NAME:rfc1034identifier)";
444458
PRODUCT_NAME = "$(TARGET_NAME)";
445-
SWIFT_VERSION = 3.0;
459+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
460+
SWIFT_VERSION = 4.0;
446461
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
447462
};
448463
name = Debug;
@@ -461,7 +476,8 @@
461476
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
462477
PRODUCT_BUNDLE_IDENTIFIER = "com.molabo.$(PRODUCT_NAME:rfc1034identifier)";
463478
PRODUCT_NAME = "$(TARGET_NAME)";
464-
SWIFT_VERSION = 3.0;
479+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
480+
SWIFT_VERSION = 4.0;
465481
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
466482
};
467483
name = Release;

‎Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme‎

Lines changed: 3 additions & 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 = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
language = ""
4344
shouldUseLaunchSchemeArgsEnv = "YES">
4445
<Testables>
4546
<TestableReference
@@ -69,6 +70,7 @@
6970
buildConfiguration = "Debug"
7071
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7172
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
73+
language = ""
7274
launchStyle = "0"
7375
useCustomWorkingDirectory = "NO"
7476
ignoresPersistentStateOnLaunch = "NO"

‎Example/Example.xcodeproj/xcshareddata/xcschemes/ExampleTests.xcscheme‎

Lines changed: 3 additions & 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 = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

‎Example/Example/DetailViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class DetailViewController: UIViewController {
4141
// it WAS `moved` at the time emmited.
4242
// So use `getTouches` func for limited debug purpose.
4343
// If you want to know the exact value, please override `handleEvent:` in UIWindow+Swizzle.swift.
44-
func logTouches(timer: Timer) {
44+
@objc func logTouches(timer: Timer) {
4545
for (idx, touch) in Visualizer.getTouches().enumerated() {
4646
print("[\(idx)] location: \(touch.location(in: self.view))")
4747
}

‎TouchVisualizer.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@
112112
attributes = {
113113
LastSwiftMigration = 0710;
114114
LastSwiftUpdateCheck = 0730;
115-
LastUpgradeCheck = 0800;
115+
LastUpgradeCheck = 0900;
116116
ORGANIZATIONNAME = molabo;
117117
TargetAttributes = {
118118
FF1A1A9E1AFF6C2200267156 = {
119119
CreatedOnToolsVersion = 6.4;
120-
LastSwiftMigration = 0800;
120+
LastSwiftMigration = 0900;
121121
};
122122
};
123123
};
@@ -171,14 +171,20 @@
171171
CLANG_CXX_LIBRARY = "libc++";
172172
CLANG_ENABLE_MODULES = YES;
173173
CLANG_ENABLE_OBJC_ARC = YES;
174+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
174175
CLANG_WARN_BOOL_CONVERSION = YES;
176+
CLANG_WARN_COMMA = YES;
175177
CLANG_WARN_CONSTANT_CONVERSION = YES;
176178
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
177179
CLANG_WARN_EMPTY_BODY = YES;
178180
CLANG_WARN_ENUM_CONVERSION = YES;
179181
CLANG_WARN_INFINITE_RECURSION = YES;
180182
CLANG_WARN_INT_CONVERSION = YES;
183+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
184+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
181185
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
186+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
187+
CLANG_WARN_STRICT_PROTOTYPES = YES;
182188
CLANG_WARN_SUSPICIOUS_MOVE = YES;
183189
CLANG_WARN_UNREACHABLE_CODE = YES;
184190
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -222,14 +228,20 @@
222228
CLANG_CXX_LIBRARY = "libc++";
223229
CLANG_ENABLE_MODULES = YES;
224230
CLANG_ENABLE_OBJC_ARC = YES;
231+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
225232
CLANG_WARN_BOOL_CONVERSION = YES;
233+
CLANG_WARN_COMMA = YES;
226234
CLANG_WARN_CONSTANT_CONVERSION = YES;
227235
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
228236
CLANG_WARN_EMPTY_BODY = YES;
229237
CLANG_WARN_ENUM_CONVERSION = YES;
230238
CLANG_WARN_INFINITE_RECURSION = YES;
231239
CLANG_WARN_INT_CONVERSION = YES;
240+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
241+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
232242
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
243+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
244+
CLANG_WARN_STRICT_PROTOTYPES = YES;
233245
CLANG_WARN_SUSPICIOUS_MOVE = YES;
234246
CLANG_WARN_UNREACHABLE_CODE = YES;
235247
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -274,7 +286,8 @@
274286
PRODUCT_NAME = "$(TARGET_NAME)";
275287
SKIP_INSTALL = YES;
276288
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
277-
SWIFT_VERSION = 3.0;
289+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
290+
SWIFT_VERSION = 4.0;
278291
};
279292
name = Debug;
280293
};
@@ -293,7 +306,8 @@
293306
PRODUCT_BUNDLE_IDENTIFIER = "com.molabo.$(PRODUCT_NAME:rfc1034identifier)";
294307
PRODUCT_NAME = "$(TARGET_NAME)";
295308
SKIP_INSTALL = YES;
296-
SWIFT_VERSION = 3.0;
309+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
310+
SWIFT_VERSION = 4.0;
297311
};
298312
name = Release;
299313
};

‎TouchVisualizer.xcodeproj/xcshareddata/xcschemes/TouchVisualizer.xcscheme‎

Lines changed: 3 additions & 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 = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
language = ""
4344
shouldUseLaunchSchemeArgsEnv = "YES">
4445
<Testables>
4546
<TestableReference
@@ -69,6 +70,7 @@
6970
buildConfiguration = "Debug"
7071
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7172
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
73+
language = ""
7274
launchStyle = "0"
7375
useCustomWorkingDirectory = "NO"
7476
ignoresPersistentStateOnLaunch = "NO"

‎TouchVisualizer/TouchView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ final public class TouchView: UIImageView {
9090
}
9191

9292
// MARK: - Update Functions
93-
internal func update(_ timer: Timer) {
93+
@objc internal func update(_ timer: Timer) {
9494
guard let startDate = startDate else { return }
9595

9696
let interval = Date().timeIntervalSince(startDate)

‎TouchVisualizer/UIWindow+Swizzle.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ extension UIWindow {
1717

1818
let sendEvent = class_getInstanceMethod(object_getClass(self), #selector(UIApplication.sendEvent(_:)))
1919
let swizzledSendEvent = class_getInstanceMethod(object_getClass(self), #selector(UIWindow.swizzledSendEvent(_:)))
20-
method_exchangeImplementations(sendEvent, swizzledSendEvent)
20+
method_exchangeImplementations(sendEvent!, swizzledSendEvent!)
2121

2222
isSwizzled = true
2323
}
2424

25-
public func swizzledSendEvent(_ event: UIEvent) {
25+
@objc public func swizzledSendEvent(_ event: UIEvent) {
2626
Visualizer.sharedInstance.handleEvent(event)
2727
swizzledSendEvent(event)
2828
}

‎circle.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ machine:
77
environment:
88
XCODE_SCHEME: ExampleTexts
99
xcode:
10-
version: "8.0"
10+
version: "9.0"
1111
test:
1212
override:
1313
- xcodebuild test -scheme ExampleTests -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.0'

0 commit comments

Comments
 (0)