Skip to content

Commit 4d44723

Browse files
onurgeneschili-ios
authored andcommitted
Swift 4.2 Support (#50)
* Swift 4.2 Support
1 parent 0f227a9 commit 4d44723

File tree

5 files changed

+26
-10
lines changed

5 files changed

+26
-10
lines changed

CHIPageControl.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'CHIPageControl'
3-
s.version = '0.1.6'
3+
s.version = '0.1.7'
44
s.summary = 'CHIPageControl is a set of cool animated page controls written in Swift to replace boring UIPageControl.'
55

66
s.ios.deployment_target = '8.0'

CHIPageControl.xcodeproj/project.pbxproj

+21-5
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
4313A7831E7A831E0015A568 /* Project object */ = {
160160
isa = PBXProject;
161161
attributes = {
162-
LastUpgradeCheck = 0820;
162+
LastUpgradeCheck = 1000;
163163
ORGANIZATIONNAME = chi.lv;
164164
TargetAttributes = {
165165
4313A78B1E7A831E0015A568 = {
@@ -228,15 +228,23 @@
228228
CLANG_CXX_LIBRARY = "libc++";
229229
CLANG_ENABLE_MODULES = YES;
230230
CLANG_ENABLE_OBJC_ARC = YES;
231+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
231232
CLANG_WARN_BOOL_CONVERSION = YES;
233+
CLANG_WARN_COMMA = YES;
232234
CLANG_WARN_CONSTANT_CONVERSION = YES;
235+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
233236
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
234237
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
235238
CLANG_WARN_EMPTY_BODY = YES;
236239
CLANG_WARN_ENUM_CONVERSION = YES;
237240
CLANG_WARN_INFINITE_RECURSION = YES;
238241
CLANG_WARN_INT_CONVERSION = YES;
242+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
243+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
244+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
239245
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
246+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
247+
CLANG_WARN_STRICT_PROTOTYPES = YES;
240248
CLANG_WARN_SUSPICIOUS_MOVE = YES;
241249
CLANG_WARN_UNREACHABLE_CODE = YES;
242250
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -281,15 +289,23 @@
281289
CLANG_CXX_LIBRARY = "libc++";
282290
CLANG_ENABLE_MODULES = YES;
283291
CLANG_ENABLE_OBJC_ARC = YES;
292+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
284293
CLANG_WARN_BOOL_CONVERSION = YES;
294+
CLANG_WARN_COMMA = YES;
285295
CLANG_WARN_CONSTANT_CONVERSION = YES;
296+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
286297
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
287298
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
288299
CLANG_WARN_EMPTY_BODY = YES;
289300
CLANG_WARN_ENUM_CONVERSION = YES;
290301
CLANG_WARN_INFINITE_RECURSION = YES;
291302
CLANG_WARN_INT_CONVERSION = YES;
303+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
304+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
305+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
292306
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
307+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
308+
CLANG_WARN_STRICT_PROTOTYPES = YES;
293309
CLANG_WARN_SUSPICIOUS_MOVE = YES;
294310
CLANG_WARN_UNREACHABLE_CODE = YES;
295311
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -335,8 +351,8 @@
335351
PRODUCT_NAME = "$(TARGET_NAME)";
336352
SKIP_INSTALL = YES;
337353
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
338-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
339-
SWIFT_VERSION = 4.0;
354+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
355+
SWIFT_VERSION = 4.2;
340356
};
341357
name = Debug;
342358
};
@@ -356,8 +372,8 @@
356372
PRODUCT_BUNDLE_IDENTIFIER = lv.chi.CHIPageControl;
357373
PRODUCT_NAME = "$(TARGET_NAME)";
358374
SKIP_INSTALL = YES;
359-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
360-
SWIFT_VERSION = 4.0;
375+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
376+
SWIFT_VERSION = 4.2;
361377
};
362378
name = Release;
363379
};

CHIPageControl.xcodeproj/xcshareddata/xcschemes/CHIPageControl.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"

CHIPageControl/CHIPageControlChimayo.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ open class CHIPageControlChimayo: CHIBasePageControl {
9494

9595
let mask = { (index: Int, layer: CHILayer) in
9696
let mask = CAShapeLayer()
97-
mask.fillRule = kCAFillRuleEvenOdd
97+
mask.fillRule = CAShapeLayerFillRule.evenOdd
9898
let bounds = UIBezierPath(rect: layer.bounds)
9999
switch index {
100100
case page:

CHIPageControl/Core/CHIBasePageControl.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ import UIKit
116116

117117
internal func setupDisplayLink() {
118118
self.displayLink = CADisplayLink(target: WeakProxy(self), selector: #selector(updateFrame))
119-
self.displayLink?.add(to: .current, forMode: .commonModes)
119+
self.displayLink?.add(to: .current, forMode: .common)
120120
}
121121

122122
@objc internal func updateFrame() {
@@ -199,7 +199,7 @@ import UIKit
199199
}
200200

201201
deinit {
202-
self.displayLink?.remove(from: .current, forMode: .commonModes)
202+
self.displayLink?.remove(from: .current, forMode: .common)
203203
self.displayLink?.invalidate()
204204
}
205205
}

0 commit comments

Comments
 (0)