Merge pull request #10 from kevinvandenbreemen/forPullRequests

Updates for build issues with Swift 5.1

Author: colemancda

Package.resolved

@@ -1,14 +1,19 @@
-// swift-tools-version:3.0.2
+// swift-tools-version:5.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "Silica",
-    targets: [
-        Target(name: "Silica")
+    products: [
+        .library(name: "Silica", targets: ["Silica"])
     ],
     dependencies: [
-        .Package(url: "https://github.com/PureSwift/Cairo.git", majorVersion: 1)
+        .package(url: "https://github.com/PureSwift/Cairo.git", .branch("master"))
+    ],
+    targets: [
+        .target(name: "Silica", dependencies: ["Cairo"]),
+        .testTarget(name: "SilicaTests", dependencies: ["Silica"])
     ]
+
 )

Package.swift

@@ -47,7 +47,7 @@ public struct CGFont: Equatable, Hashable {
             let face = FontFace(fontConfigPattern: fontConfigPattern)
 
             let options = FontOptions()
-            options.hintMetrics = CAIRO_HINT_METRICS_OFF
+            options.hintMetrics = .off
             options.hintStyle = CAIRO_HINT_STYLE_NONE
 
             self.name = name

Sources/Silica/CGFont.swift

@@ -13,7 +13,7 @@ import struct Foundation.Data
 public protocol CGImageSource: class, RandomAccessCollection {
 
     associatedtype Index = Int
-    associatedtype Indices = DefaultRandomAccessIndices<Self>
+    associatedtype Indices = DefaultIndices<Self>
     associatedtype Iterator = IndexingIterator<Self>
 
     static var typeIdentifier: String { get }
@@ -35,9 +35,9 @@ public extension CGImageSource {
         return image
     }
 
-    public subscript(bounds: Range<Self.Index>) -> RandomAccessSlice<Self> {
+    public subscript(bounds: Range<Self.Index>) -> Slice<Self> {
 
-        return RandomAccessSlice<Self>(base: self, bounds: bounds)
+        return Slice<Self>(base: self, bounds: bounds)
     }
 
     /// The start `Index`.

Sources/Silica/CGImageSource.swift

@@ -15,10 +15,18 @@ final class FontTests: XCTestCase {
 
     func testCreateFont() {
 
+        #if os(Linux)
+        var fontNames = [
+            ("LiberationSerif", "Liberation Serif"),
+            ("LiberationSerif-Bold", "Liberation Serif")
+        ]
+
+        #else
         var fontNames = [
             ("TimesNewRoman", "Times New Roman"),
             ("TimesNewRoman-Bold", "Times New Roman")
         ]
+        #endif
 
         #if os(macOS)
         fontNames += [("MicrosoftSansSerif", "Microsoft Sans Serif"),

Sources/Silica/CGRect.swift

@@ -7,8 +7,21 @@
 //
 
 import Foundation
+
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
+
 import Dispatch
 
+#if canImport(FoundationNetworking)
+typealias FoundationURLRequest = FoundationNetworking.URLRequest
+typealias FoundationURLResponse = FoundationNetworking.URLResponse
+#else
+typealias FoundationURLRequest = Foundation.URLRequest
+typealias FoundationURLResponse = Foundation.URLResponse
+#endif
+
 // Dot notation syntax for class
 public extension HTTP {
 
@@ -45,7 +58,7 @@ public extension HTTP {
 
             // build request... 
 
-            guard let urlRequest = Foundation.URLRequest(request: request)
+            guard let urlRequest = FoundationURLRequest(request: request)
                 else { throw Error.BadRequest }
 
             // execute request
@@ -58,11 +71,11 @@ public extension HTTP {
 
             var urlResponse: HTTPURLResponse?
 
-            dataTask = self.session.dataTask(with: urlRequest) { (data: Foundation.Data?, response: Foundation.URLResponse?, responseError: Swift.Error?) -> () in
+            dataTask = self.session.dataTask(with: urlRequest) { (data: Foundation.Data?, response: FoundationURLResponse?, responseError: Swift.Error?) -> () in
 
                 responseData = data
 
-                urlResponse = response as? Foundation.HTTPURLResponse
+                urlResponse = response as? HTTPURLResponse
 
                 error = responseError
 
@@ -105,7 +118,7 @@ public extension HTTP.Client {
     }
 }
 
-public extension Foundation.URLRequest {
+public extension FoundationURLRequest {
 
     init?(request: HTTP.Request) {