update project to use Swift5

.travis.yml

@@ -1,6 +1,6 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode11.3
 
 script:
-  - xcodebuild clean build test -project C4.xcodeproj -scheme C4-iOS -destination 'platform=iOS Simulator,name=iPhone 6s,OS=9.3'
+  - xcodebuild clean build test -project C4.xcodeproj -scheme C4-iOS -destination 'platform=iOS Simulator,name=iPhone 6s,OS=10.3.1'
   - xcodebuild clean build test -project C4.xcodeproj -scheme C4-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K'

C4.xcodeproj/project.pbxproj

@@ -681,6 +681,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -1016,7 +1017,7 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1047,7 +1048,7 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1071,7 +1072,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1096,7 +1097,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1155,7 +1156,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1206,7 +1207,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1229,6 +1230,7 @@
 				PRODUCT_NAME = C4;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1247,6 +1249,7 @@
 				PRODUCT_NAME = C4;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -1293,6 +1296,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.c4ios.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1308,6 +1312,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.c4ios.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

C4/Core/Color.swift

@@ -337,15 +337,15 @@ public class Color {
 public extension UIColor {
     /// Initializes a UIColor object from a Color object.
     /// - parameter color: The C4 color object.
-    public convenience init?(_ color: Color) {
+    convenience init?(_ color: Color) {
         self.init(cgColor: color.cgColor)
     }
 }
 
 public extension CIColor {
     /// Initializes a CIColor object from a Color object.
     /// - parameter color: The C4 color object.
-    public convenience init(_ color: Color) {
+    convenience init(_ color: Color) {
         self.init(cgColor: color.cgColor)
     }
 }

C4/Core/Point.swift

@@ -187,7 +187,7 @@ public func lerp(_ a: Point, _ b: Point, at: Double) -> Point {
 
 public extension CGPoint {
     ///Initializes a CGPoint from a Point
-    public init(_ point: Point) {
+    init(_ point: Point) {
         self.init(x: CGFloat(point.x), y: CGFloat(point.y))
     }
 }

C4/Core/Rect.swift

@@ -301,7 +301,7 @@ public func inset(_ r: Rect, dx: Double, dy: Double) -> Rect {
 // MARK: - Casting to CGRect
 public extension CGRect {
     /// Initializes a CGRect from a Rect
-    public init(_ rect: Rect) {
+    init(_ rect: Rect) {
         self.init(origin: CGPoint(rect.origin), size: CGSize(rect.size))
     }
 }

C4/Core/Size.swift

@@ -169,7 +169,7 @@ public func <= (lhs: Size, rhs: Size) -> Bool {
 // MARK: - Casting to CGSize
 public extension CGSize {
     /// Initializes a new CGSize from a Size
-    public init(_ size: Size) {
+    init(_ size: Size) {
         self.init(width: CGFloat(size.width), height: CGFloat(size.height))
     }
 }

C4/UI/AudioPlayer.swift

@@ -48,7 +48,7 @@ public class AudioPlayer: NSObject, AVAudioPlayerDelegate {
     /// ````
     public init?(_ name: String) {
         do {
-            try AVAudioSession.sharedInstance().setCategory(AVAudioSessionCategoryPlayback)
+            try AVAudioSession.sharedInstance().setCategory(.playback)
             try AVAudioSession.sharedInstance().setActive(true)
         } catch {
             print("Couldn't set up AVAudioSession")

C4/UI/Camera.swift

@@ -66,7 +66,7 @@ public class Camera: View {
         previewLayer.backgroundColor = clear.cgColor
         previewLayer.videoGravity = AVLayerVideoGravity.resizeAspectFill
 
-        orientationObserver = on(event: NSNotification.Name.UIDeviceOrientationDidChange) { [unowned self] in
+        orientationObserver = on(event: UIDevice.orientationDidChangeNotification) { [unowned self] in
             self.updateOrientation()
         }
     }
@@ -191,7 +191,7 @@ public class Camera: View {
             return image
         }
 
-        var orientation: UIImageOrientation
+        var orientation: UIImage.Orientation
         let shouldFlip = position == .front
 
         switch videoOrientation {
@@ -203,6 +203,8 @@ public class Camera: View {
             orientation = shouldFlip ? .leftMirrored : .right
         case .portraitUpsideDown:
             orientation = shouldFlip ? .rightMirrored : .left
+        @unknown default:
+            orientation = shouldFlip ? .leftMirrored : .right
         }
         return UIImage(cgImage: cgimg, scale: image.scale, orientation: orientation)
     }

C4/UI/Image+ColorAt.swift

@@ -50,7 +50,7 @@ public extension Image {
     ///  let color = img.color(at: Point())
     ///  ````
     /// - parameter at: a Point.
-    public func color(at point: Point) -> Color {
+    func color(at point: Point) -> Color {
 
         guard bounds.contains(point) else {
             print("Point is outside the image bounds")

C4/UI/Movie.swift

@@ -142,7 +142,7 @@ public class Movie: View {
     /// - parameter filename:	The name of the movie file included in your project.
     public convenience init?(_ filename: String) {
         do {
-            try AVAudioSession.sharedInstance().setCategory(AVAudioSessionCategoryPlayback)
+            try AVAudioSession.sharedInstance().setCategory(.playback)
             try AVAudioSession.sharedInstance().setActive(true)
         } catch {
             print("Couldn't set up AVAudioSession")
@@ -225,7 +225,7 @@ public class Movie: View {
             print("The current movie's player is not properly initialized")
             return
         }
-        p.seek(to: CMTimeMake(0, 1))
+        p.seek(to: CMTimeMake(value: 0, timescale: 1))
         p.pause()
     }
 

C4/UI/Shape.swift

@@ -41,7 +41,7 @@ open class Shape: View {
                 return nil
             }
 
-            let fillRule = shapeLayer.fillRule == kCAFillRuleNonZero ? CGPathFillRule.evenOdd : CGPathFillRule.winding
+            let fillRule: CGPathFillRule = shapeLayer.fillRule == CAShapeLayerFillRule.nonZero ? .evenOdd : .winding
 
             if path.contains(point, using: fillRule, transform: CGAffineTransform.identity) {
                 return self
@@ -216,9 +216,9 @@ open class Shape: View {
     public var fillRule: FillRule {
         get {
             switch shapeLayer.fillRule {
-            case kCAFillRuleNonZero:
+            case .nonZero:
                 return .nonZero
-            case kCAFillRuleEvenOdd:
+            case .evenOdd:
                 return .evenOdd
             default:
                 return .nonZero
@@ -227,9 +227,9 @@ open class Shape: View {
         set(fillRule) {
             switch fillRule {
             case .nonZero:
-                shapeLayer.fillRule = kCAFillRuleNonZero
+                shapeLayer.fillRule = .nonZero
             case .evenOdd:
-                shapeLayer.fillRule = kCAFillRuleEvenOdd
+                shapeLayer.fillRule = .evenOdd
             }
         }
     }
@@ -275,9 +275,9 @@ open class Shape: View {
     public var lineCap: LineCap {
         get {
             switch shapeLayer.lineCap {
-            case kCALineCapRound:
+            case .round:
                 return .round
-            case kCALineCapSquare:
+            case .square:
                 return .square
             default:
                 return .butt
@@ -286,11 +286,11 @@ open class Shape: View {
         set(lineCap) {
             switch lineCap {
             case .butt:
-                shapeLayer.lineCap = kCALineCapButt
+                shapeLayer.lineCap = .butt
             case .round:
-                shapeLayer.lineCap = kCALineCapRound
+                shapeLayer.lineCap = .round
             case .square:
-                shapeLayer.lineCap = kCALineCapSquare
+                shapeLayer.lineCap = .square
             }
         }
     }
@@ -299,9 +299,9 @@ open class Shape: View {
     public var lineJoin: LineJoin {
         get {
             switch shapeLayer.lineJoin {
-            case kCALineJoinRound:
+            case .round:
                 return .round
-            case kCALineJoinBevel:
+            case .bevel:
                 return .bevel
             default:
                 return .miter
@@ -310,11 +310,11 @@ open class Shape: View {
         set(lineJoin) {
             switch lineJoin {
             case .miter:
-                shapeLayer.lineJoin = kCALineJoinMiter
+                shapeLayer.lineJoin = .miter
             case .round:
-                shapeLayer.lineJoin = kCALineJoinRound
+                shapeLayer.lineJoin = .round
             case .bevel:
-                shapeLayer.lineJoin = kCALineJoinBevel
+                shapeLayer.lineJoin = .bevel
             }
         }
     }

C4/UI/ShapeLayer.swift

@@ -132,7 +132,7 @@ extension CABasicAnimation {
             self.autoreverses = animation.autoreverses
             self.repeatCount = Float(animation.repeatCount)
         }
-        self.fillMode = kCAFillModeBoth
+        self.fillMode = .both
         self.isRemovedOnCompletion = false
     }
 }

C4/UI/StoredAnimation.swift

@@ -34,21 +34,21 @@ public class StoredAnimation: Animation {
         let disable = ShapeLayer.disableActions
         ShapeLayer.disableActions = false
         var timing: CAMediaTimingFunction
-        var options: UIViewAnimationOptions = [UIViewAnimationOptions.beginFromCurrentState]
+        var options: UIView.AnimationOptions = [.beginFromCurrentState]
 
         switch curve {
         case .linear:
             options = [options, .curveLinear]
-            timing = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear)
+            timing = CAMediaTimingFunction(name: .linear)
         case .easeOut:
             options = [options, .curveEaseOut]
-            timing = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)
+            timing = CAMediaTimingFunction(name: .easeOut)
         case .easeIn:
             options = [options, .curveEaseIn]
-            timing = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseIn)
+            timing = CAMediaTimingFunction(name: .easeIn)
         case .easeInOut:
             options = [options, .curveEaseIn, .curveEaseOut]
-            timing = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
+            timing = CAMediaTimingFunction(name: .easeInEaseOut)
         }
 
         autoreverses == true ? options.formUnion(.autoreverse) : options.subtract(.autoreverse)

C4/UI/Timer.swift

@@ -64,7 +64,7 @@ public final class Timer: NSObject {
         }
 
         let t = Foundation.Timer(timeInterval: TimeInterval(interval), target: self, selector: #selector(Timer.fire), userInfo: nil, repeats: true)
-        RunLoop.main.add(t, forMode: RunLoopMode.defaultRunLoopMode)
+        RunLoop.main.add(t, forMode: .default)
         timer = t
     }