Skip to content

Commit 095eb7b

Browse files
jyunderwoodjyunderwood
authored
Merge pull request #8 from NicolasLourenco/swift4
Swift4 Compatibility
2 parents 21d71b1 + 5c6344e commit 095eb7b

File tree

5 files changed

+43
-6
lines changed

5 files changed

+43
-6
lines changed

‎Example-iOS/Example-iOS.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
isa = PBXProject;
112112
attributes = {
113113
LastSwiftUpdateCheck = 0800;
114-
LastUpgradeCheck = 0800;
114+
LastUpgradeCheck = 0900;
115115
ORGANIZATIONNAME = "Jonathan Underwood";
116116
TargetAttributes = {
117117
AB2F07F11D7C77EB004B2154 = {
@@ -192,15 +192,22 @@
192192
CLANG_CXX_LIBRARY = "libc++";
193193
CLANG_ENABLE_MODULES = YES;
194194
CLANG_ENABLE_OBJC_ARC = YES;
195+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
195196
CLANG_WARN_BOOL_CONVERSION = YES;
197+
CLANG_WARN_COMMA = YES;
196198
CLANG_WARN_CONSTANT_CONVERSION = YES;
197199
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
198200
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
199201
CLANG_WARN_EMPTY_BODY = YES;
200202
CLANG_WARN_ENUM_CONVERSION = YES;
201203
CLANG_WARN_INFINITE_RECURSION = YES;
202204
CLANG_WARN_INT_CONVERSION = YES;
205+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
206+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
203207
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
208+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
209+
CLANG_WARN_STRICT_PROTOTYPES = YES;
210+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
204211
CLANG_WARN_SUSPICIOUS_MOVES = YES;
205212
CLANG_WARN_UNREACHABLE_CODE = YES;
206213
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -242,15 +249,22 @@
242249
CLANG_CXX_LIBRARY = "libc++";
243250
CLANG_ENABLE_MODULES = YES;
244251
CLANG_ENABLE_OBJC_ARC = YES;
252+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
245253
CLANG_WARN_BOOL_CONVERSION = YES;
254+
CLANG_WARN_COMMA = YES;
246255
CLANG_WARN_CONSTANT_CONVERSION = YES;
247256
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
248257
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
249258
CLANG_WARN_EMPTY_BODY = YES;
250259
CLANG_WARN_ENUM_CONVERSION = YES;
251260
CLANG_WARN_INFINITE_RECURSION = YES;
252261
CLANG_WARN_INT_CONVERSION = YES;
262+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
263+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
253264
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
265+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
266+
CLANG_WARN_STRICT_PROTOTYPES = YES;
267+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
254268
CLANG_WARN_SUSPICIOUS_MOVES = YES;
255269
CLANG_WARN_UNREACHABLE_CODE = YES;
256270
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ Then follow the [iOS building instructions](https://github.com/Carthage/Carthage
2727

2828
## Change Log
2929

30+
- __2.0.4__
31+
- Swift 4 compatibility
3032
- __2.0.3__
3133
- Remove 10.0 as the deployment target
3234
- __2.0.2__

‎WaveformView/WaveformView.xcodeproj/project.pbxproj‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,12 @@
9393
AB0CB0C11D7C78E200C74A8B /* Project object */ = {
9494
isa = PBXProject;
9595
attributes = {
96-
LastUpgradeCheck = 0800;
96+
LastUpgradeCheck = 0900;
9797
ORGANIZATIONNAME = "Jonathan Underwood";
9898
TargetAttributes = {
9999
AB0CB0C91D7C78E200C74A8B = {
100100
CreatedOnToolsVersion = 8.0;
101+
LastSwiftMigration = 0900;
101102
ProvisioningStyle = Automatic;
102103
};
103104
};
@@ -150,15 +151,22 @@
150151
CLANG_CXX_LIBRARY = "libc++";
151152
CLANG_ENABLE_MODULES = YES;
152153
CLANG_ENABLE_OBJC_ARC = YES;
154+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
153155
CLANG_WARN_BOOL_CONVERSION = YES;
156+
CLANG_WARN_COMMA = YES;
154157
CLANG_WARN_CONSTANT_CONVERSION = YES;
155158
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
156159
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
157160
CLANG_WARN_EMPTY_BODY = YES;
158161
CLANG_WARN_ENUM_CONVERSION = YES;
159162
CLANG_WARN_INFINITE_RECURSION = YES;
160163
CLANG_WARN_INT_CONVERSION = YES;
164+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
165+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
161166
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
167+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
168+
CLANG_WARN_STRICT_PROTOTYPES = YES;
169+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
162170
CLANG_WARN_SUSPICIOUS_MOVES = YES;
163171
CLANG_WARN_UNREACHABLE_CODE = YES;
164172
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -202,15 +210,22 @@
202210
CLANG_CXX_LIBRARY = "libc++";
203211
CLANG_ENABLE_MODULES = YES;
204212
CLANG_ENABLE_OBJC_ARC = YES;
213+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
205214
CLANG_WARN_BOOL_CONVERSION = YES;
215+
CLANG_WARN_COMMA = YES;
206216
CLANG_WARN_CONSTANT_CONVERSION = YES;
207217
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
208218
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
209219
CLANG_WARN_EMPTY_BODY = YES;
210220
CLANG_WARN_ENUM_CONVERSION = YES;
211221
CLANG_WARN_INFINITE_RECURSION = YES;
212222
CLANG_WARN_INT_CONVERSION = YES;
223+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
224+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
213225
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
226+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
227+
CLANG_WARN_STRICT_PROTOTYPES = YES;
228+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
214229
CLANG_WARN_SUSPICIOUS_MOVES = YES;
215230
CLANG_WARN_UNREACHABLE_CODE = YES;
216231
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -248,11 +263,13 @@
248263
DYLIB_INSTALL_NAME_BASE = "@rpath";
249264
INFOPLIST_FILE = WaveformView/Info.plist;
250265
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
266+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
251267
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
252268
PRODUCT_BUNDLE_IDENTIFIER = com.jyunderwood.WaveformView;
253269
PRODUCT_NAME = "$(TARGET_NAME)";
254270
SKIP_INSTALL = YES;
255-
SWIFT_VERSION = 3.0;
271+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
272+
SWIFT_VERSION = 4.0;
256273
};
257274
name = Debug;
258275
};
@@ -266,11 +283,13 @@
266283
DYLIB_INSTALL_NAME_BASE = "@rpath";
267284
INFOPLIST_FILE = WaveformView/Info.plist;
268285
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
286+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
269287
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
270288
PRODUCT_BUNDLE_IDENTIFIER = com.jyunderwood.WaveformView;
271289
PRODUCT_NAME = "$(TARGET_NAME)";
272290
SKIP_INSTALL = YES;
273-
SWIFT_VERSION = 3.0;
291+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
292+
SWIFT_VERSION = 4.0;
274293
};
275294
name = Release;
276295
};

‎WaveformView/WaveformView.xcodeproj/xcshareddata/xcschemes/WaveformView.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
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

‎WaveformView/WaveformView/WaveformView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import UIKit
1010
import Darwin
1111

12-
let pi = M_PI
12+
let pi = Double.pi
1313

1414
@IBDesignable
1515
public class WaveformView: UIView {

0 commit comments

Comments
 (0)