Skip to content

Commit bb96aee

Browse files
committed
Swift 4.2 support
1 parent 9ce1df1 commit bb96aee

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

Sources/Easing+CAMediaTimeFunction.swift

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,30 @@ import QuartzCore
1010
extension Easing {
1111

1212
public static let caEaseIn: Easing = {
13-
return Easing.cubicBezierEasingForMediaFunction(CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseIn))
13+
#if swift(>=4.2)
14+
let f = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeIn)
15+
#else
16+
let f = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseIn)
17+
#endif
18+
return Easing.cubicBezierEasingForMediaFunction(f)
1419
}()
1520

1621
public static let caEaseOut: Easing = {
17-
return Easing.cubicBezierEasingForMediaFunction(CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut))
22+
#if swift(>=4.2)
23+
let f = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)
24+
#else
25+
let f = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
26+
#endif
27+
return Easing.cubicBezierEasingForMediaFunction(f)
1828
}()
1929

2030
public static let caEaseInEaseOut: Easing = {
21-
return Easing.cubicBezierEasingForMediaFunction(CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut))
31+
#if swift(>=4.2)
32+
let f = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)
33+
#else
34+
let f = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
35+
#endif
36+
return Easing.cubicBezierEasingForMediaFunction(f)
2237
}()
2338

2439
private static func cubicBezierEasingForMediaFunction(_ m: CAMediaTimingFunction) -> Easing {

0 commit comments

Comments
 (0)