Merge branch 'feature/TravisCI'

Author: colemancda

.gitignore

@@ -1,3 +1,7 @@
 .build
 Packages
-Cacao.xcodeproj
+Cacao.xcodeproj
+
+*.xcuserstate
+*.xcworkspacedata
+*.xcuserdatad

Package.pins

@@ -1,6 +1,12 @@
 {
   "autoPin": true,
   "pins": [
+    {
+      "package": "Cairo",
+      "reason": null,
+      "repositoryURL": "https://github.com/PureSwift/Cairo.git",
+      "version": "1.2.3"
+    },
     {
       "package": "CCairo",
       "reason": null,
@@ -17,7 +23,7 @@
       "package": "CFreeType",
       "reason": null,
       "repositoryURL": "https://github.com/PureSwift/CFreeType.git",
-      "version": "1.0.3"
+      "version": "1.0.4"
     },
     {
       "package": "CLCMS",
@@ -32,22 +38,22 @@
       "version": "1.0.1"
     },
     {
-      "package": "Cairo",
+      "package": "LittleCMS",
       "reason": null,
-      "repositoryURL": "https://github.com/PureSwift/Cairo.git",
-      "version": "1.2.2"
+      "repositoryURL": "https://github.com/PureSwift/LittleCMS.git",
+      "version": "1.0.2"
     },
     {
-      "package": "LittleCMS",
+      "package": "SDL",
       "reason": null,
-      "repositoryURL": "https://github.com/PureSwift/LittleCMS.git",
+      "repositoryURL": "https://github.com/PureSwift/SDL.git",
       "version": "1.0.1"
     },
     {
       "package": "Silica",
       "reason": null,
       "repositoryURL": "https://github.com/PureSwift/Silica.git",
-      "version": "1.2.0"
+      "version": "1.3.1"
     }
   ],
   "version": 1

Package.resolved

@@ -1,39 +1,23 @@
-// swift-tools-version:4.0
+// swift-tools-version:3.0.2
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "Cacao",
-    /*exclude: ["Resources"],*/
-    products: [
-        // Products define the executables and libraries produced by a package, and make them visible to other packages.
-        .library(
-            name: "Cacao",
-            targets: ["Cacao"]
-        ),
-        .executable(
-            name: "CacaoDemo",
-            targets: ["CacaoDemo"]
-        )
-        ],
+    targets: [
+                 Target(
+                    name: "CacaoDemo",
+                    dependencies: [.Target(name: "Cacao")]),
+                 Target(
+                    name: "Cacao"
+					)
+    ],
     dependencies: [
-        .package(url: "https://github.com/PureSwift/CSDL2.git", .branch("master")),
-        .package(url: "https://github.com/PureSwift/SDL.git", .branch("master")),
-        .package(url: "https://github.com/PureSwift/Silica.git", .branch("master")),
-        .package(url: "https://github.com/PureSwift/Cairo.git", .branch("master"))
+        .Package(url: "https://github.com/PureSwift/Silica.git", majorVersion: 1),
+		.Package(url: "https://github.com/PureSwift/Cairo.git", majorVersion: 1),
+		.Package(url: "https://github.com/PureSwift/SDL.git", majorVersion: 1),
+        .Package(url: "https://github.com/PureSwift/CSDL2.git", majorVersion: 1)
     ],
-    targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
-        .target(
-            name: "Cacao",
-            dependencies: ["Cairo", "Silica", "SDL"]),
-        .target(
-            name: "CacaoDemo",
-            dependencies: ["Cacao"]),
-        .testTarget(
-            name: "CacaoTests",
-            dependencies: ["Cacao"])
-        ]
+    exclude: ["iOS", "Resources"]
 )

Package.swift

@@ -0,0 +1,28 @@
+//
+//  CADisplayLink.swift
+//  Cacao
+//
+//  Created by Alsey Coleman Miller on 11/19/17.
+//
+
+import Foundation
+
+/// A timer object that allows your application to synchronize its drawing to the refresh rate of the display.
+public final class CADisplayLink {
+    
+    public typealias Action = (CADisplayLink) -> ()
+    
+    public let action: Action
+    
+    /// A Boolean value that states whether the display link’s notifications to the target are suspended.
+    ///
+    /// The default value is false. If true, the display link does not send notifications to the target.
+    /// `isPaused` is thread safe meaning that it can be set from a thread separate to the one in which
+    /// the display link is running.
+    public var isPaused: Bool = false
+    
+    public init(action: @escaping Action) {
+        
+        self.action = action
+    }
+}

Sources/Cacao/CADisplayLink.swift

@@ -39,7 +39,9 @@ public extension String {
 
         let descender = (CGFloat(font.cgFont.scaledFont.descent) * font.pointSize) / CGFloat(font.cgFont.scaledFont.unitsPerEm)
 
-        textFrame.size.height -= descender
+        
+        textFrame.size.height = textFrame.size.height - descender
+        //textFrame.size.height -= descender // Swift 3 error
 
         return textFrame
     }