Port code to Swift 4.2.

Author: objecthub

Cartfile

@@ -1,2 +1,2 @@
-github "objecthub/swift-numberkit" ~> 2.2.1
-github "objecthub/swift-commandlinekit" ~> 0.2.3
+github "objecthub/swift-numberkit" ~> 2.2.4
+github "objecthub/swift-commandlinekit" ~> 0.2.5

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "objecthub/swift-commandlinekit" "0.2.3"
-github "objecthub/swift-numberkit" "2.2.1"
+github "objecthub/swift-commandlinekit" "0.2.5"
+github "objecthub/swift-numberkit" "2.2.4"

LispKit.xcodeproj/project.pbxproj

@@ -1424,7 +1424,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = Sources/LispKitRepl/LispKitReplBridgingHeader.h;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1444,7 +1444,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = Sources/LispKitRepl/LispKitReplBridgingHeader.h;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1501,7 +1501,7 @@
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -1554,7 +1554,7 @@
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -1584,7 +1584,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1610,7 +1610,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1627,7 +1627,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = net.objecthub.LispKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1644,7 +1644,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = net.objecthub.LispKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.1
+// swift-tools-version:4.2
 //
 //  Package.swift
 //  LispKit
@@ -37,7 +37,7 @@ let package = Package(
     .executable(name: "LispKitRepl", targets: ["LispKitRepl"])
   ],
   dependencies: [
-    .package(url: "https://github.com/objecthub/swift-numberkit.git", from: "2.2.1"),
+    .package(url: "https://github.com/objecthub/swift-numberkit.git", from: "2.2.2"),
     .package(url: "https://github.com/objecthub/swift-commandlinekit.git", from: "0.2.3")
   ],
   targets: [
@@ -48,5 +48,6 @@ let package = Package(
             exclude: ["BuildMetadata.m", "BuildMetadata.h"]),
     .testTarget(name: "LispKitTests",
                 dependencies: ["LispKit"])
-  ]
+  ],
+  swiftLanguageVersions: [.v4_2]
 )

README.md

@@ -2,8 +2,8 @@
 ========================
 
 [![Platform: macOS](https://img.shields.io/badge/Platform-macOS-blue.svg?style=flat)](https://developer.apple.com/osx/)
-[![Language: Swift 4.1](https://img.shields.io/badge/Language-Swift%204.1-green.svg?style=flat)](https://developer.apple.com/swift/)
-[![IDE: Xcode 9.4](https://img.shields.io/badge/IDE-Xcode%209.4-orange.svg?style=flat)](https://developer.apple.com/xcode/)
+[![Language: Swift 4.2](https://img.shields.io/badge/Language-Swift%204.2-green.svg?style=flat)](https://developer.apple.com/swift/)
+[![IDE: Xcode 10.0](https://img.shields.io/badge/IDE-Xcode%2010.0-orange.svg?style=flat)](https://developer.apple.com/xcode/)
 [![Carthage: compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![License: Apache](http://img.shields.io/badge/License-Apache-lightgrey.svg?style=flat)](https://raw.githubusercontent.com/objecthub/swift-lispkit/master/LICENSE)
 

Sources/LispKit/Base/ObjectPool.swift

@@ -60,7 +60,7 @@ public final class ObjectPool<T: AnyObject>: Sequence, CustomStringConvertible {
   }
 
   /// Returns true if the object pool is empty.
-  open var isEmpty: Bool {
+  public var isEmpty: Bool {
     return self.count == 0
   }
 

Sources/LispKit/Data/Port.swift

@@ -29,7 +29,7 @@ open class Port: Reference, CustomStringConvertible {
     case binaryOutputPort(BinaryOutput)
   }
 
-  open let kind: Kind
+  public let kind: Kind
   open var isOpen: Bool = true
 
   public init(input: TextInput) {

Sources/LispKit/Graphics/Drawing.swift

@@ -385,7 +385,7 @@ public enum DrawingInstruction {
           .font: font ?? NSFont.systemFont(ofSize: NSFont.systemFontSize),
           .foregroundColor: (color ?? Color.black).nsColor,
           .paragraphStyle: pstyle,
-        ] as [NSAttributedStringKey: Any]
+          ] as [NSAttributedString.Key: Any]
         let textRect: NSRect
         switch location {
           case .position(let point):

Sources/LispKit/Graphics/Shape.swift

@@ -320,7 +320,7 @@ public enum ShapePrototype {
       case .glyphs(let str, let rect, let font, let flipped):
         let bezierPath = NSBezierPath()
         bezierPath.move(to: rect.origin)
-        let storage = NSTextStorage(string: str, attributes: [NSAttributedStringKey.font : font])
+        let storage = NSTextStorage(string: str, attributes: [NSAttributedString.Key.font : font])
         let manager = NSLayoutManager()
         let container = NSTextContainer(size: rect.size)
         storage.addLayoutManager(manager)
@@ -442,7 +442,7 @@ public enum InterpolationMethod {
       let d2 = pointLength(pointSub(p2, p1))
       let d3 = pointLength(pointSub(p3, p2))
       var b1: NSPoint
-      if fabs(d1) < InterpolationMethod.epsilon {
+      if abs(d1) < InterpolationMethod.epsilon {
         b1 = p1
       } else {
         b1 = pointMult(p2, pow(d1, 2.0 * alpha))
@@ -453,7 +453,7 @@ public enum InterpolationMethod {
         b1 = pointMult(b1, 1.0 / (3.0 * pow(d1, alpha) * (pow(d1, alpha) + pow(d2, alpha))))
       }
       var b2: NSPoint
-      if fabs(d3) < InterpolationMethod.epsilon {
+      if abs(d3) < InterpolationMethod.epsilon {
         b2 = p2
       } else {
         b2 = pointMult(p1, pow(d3, 2.0 * alpha))

Sources/LispKit/IO/BinaryOutput.swift

@@ -37,7 +37,7 @@ open class BinaryOutput {
   private var output: OutputStream?
 
   /// The URL for the output stream. `url` is nil whenever `output` is nil.
-  open let url: URL?
+  public let url: URL?
 
   /// Relative paths are relative to the documents folder
   private static let documentsUrl =