Merge branch 'release/2.2.2'

Author: colemancda

.gitignore

@@ -13,3 +13,5 @@ SwiftFoundation/build
 Xcode/SwiftFoundation.xcodeproj/xcuserdata
 
 Xcode/SwiftFoundation.xcodeproj/project.xcworkspace/xcuserdata
+
+.DS_Store

.travis.yml

@@ -2,7 +2,6 @@ language: generic
 osx_image: xcode8
 os:
   - linux
-  - osx
 sudo: required
 dist: trusty
 before_install:
@@ -13,9 +12,9 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install clang uuid-dev libjson-c-dev ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir $SWIFT_DIR ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl https://swift.org/builds/swift-3.0-preview-1/ubuntu1404/$SWIFT_VERSION/$SWIFT_VERSION-ubuntu14.04.tar.gz -s | tar xz -C $SWIFT_DIR &> /dev/null ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl https://swift.org/builds/development/ubuntu1404/$SWIFT_VERSION/$SWIFT_VERSION-ubuntu14.04.tar.gz -s | tar xz -C $SWIFT_DIR &> /dev/null ; fi
 env:
-  - SWIFT_VERSION=swift-3.0-PREVIEW-1
+  - SWIFT_VERSION=swift-DEVELOPMENT-SNAPSHOT-2016-08-04-a
 script:
   - uname
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then xctool test -project Xcode/SwiftFoundation.xcodeproj -scheme "SwiftFoundation OS X" -sdk macosx ONLY_ACTIVE_ARCH=NO ; fi

Cartfile.resolved

@@ -1 +1 @@
-github "PureSwift/JSON-C" "098c5ad91d262de5ad695a6162b6d0d4b384741d"
+github "PureSwift/JSON-C" "0b49467d3f881523c9a74994f6e460a757bdb84f"

Package.swift

@@ -2,13 +2,6 @@ import PackageDescription
 
 let package = Package(
     name: "SwiftFoundation",
-    targets: [
-        Target(
-            name: "UnitTests",
-            dependencies: [.Target(name: "SwiftFoundation")]),
-        Target(
-            name: "SwiftFoundation")
-    ],
     dependencies: [
         .Package(url: "https://github.com/PureSwift/CStatfs.git", majorVersion: 1),
         .Package(url: "https://github.com/PureSwift/CJSONC.git", majorVersion: 1)

Sources/SwiftFoundation/Base64.swift

@@ -29,7 +29,7 @@
 
         /* Create an NSData from a Base-64 encoded NSString using the given options. By default, returns nil when the input is not recognized as valid Base-64.
          */
-        public init?(base64Encoded base64String: String, options: Base64DecodingOptions) {
+        public init?(base64Encoded base64String: String, options: Base64DecodingOptions = []) {
             let encodedBytes = Array(base64String.utf8)
             guard let decodedBytes = Data.base64DecodeBytes(encodedBytes, options: options) else {
                 return nil
@@ -47,7 +47,7 @@
 
         /* Create an NSData from a Base-64, UTF-8 encoded NSData. By default, returns nil when the input is not recognized as valid Base-64.
          */
-        public init?(base64Encoded base64Data: Data, options: Base64DecodingOptions) {
+        public init?(base64Encoded base64Data: Data, options: Base64DecodingOptions = []) {
             guard let decodedBytes = Data.base64DecodeBytes(base64Data.bytes, options: options) else {
                 return nil
             }
@@ -232,7 +232,7 @@
             let appendByteToResult : (UInt8) -> () = {
                 result.append($0)
                 currentLineCount += 1
-                if let options = lineOptions where currentLineCount == options.lineLength {
+                if let options = lineOptions, currentLineCount == options.lineLength {
                     result.append(contentsOf: options.separator)
                     currentLineCount = 0
                 }

Sources/SwiftFoundation/BitMaskOption.swift

@@ -14,7 +14,7 @@ public protocol BitMaskOption: RawRepresentable {
 
 public extension BitMaskOption where Self.RawValue: Integer {
 
-    static func bitmask<S: Sequence where S.Iterator.Element == Self>(options: S) -> Self.RawValue {
+    static func bitmask<S: Sequence>(options: S) -> Self.RawValue where S.Iterator.Element == Self {
         return options.reduce(0) { mask, option in
             mask | option.rawValue
         }

Sources/SwiftFoundation/ByteValue.swift

@@ -22,7 +22,7 @@ public protocol ByteValue: Equatable {
 
 // MARK: - Equatable
 
-public func == <T: ByteValue where T.ByteValue: Equatable> (lhs: T, rhs: T) -> Bool {
+public func == <T: ByteValue> (lhs: T, rhs: T) -> Bool where T.ByteValue: Equatable {
 
     return lhs.bytes == rhs.bytes
 }

Sources/SwiftFoundation/Data.swift

@@ -24,7 +24,7 @@
 
         // MARK: - Properties
 
-        private var _bytes: ContiguousArray<Byte>
+        fileprivate var _bytes: ContiguousArray<Byte>
 
         public var bytes: [Byte] {
 
@@ -70,7 +70,7 @@
         /// - parameter bytes: A pointer to the memory. It will be copied.
         /// - parameter count: The number of bytes to copy.
         @inline(__always)
-        public init(bytes pointer: UnsafePointer<Void>, count: Int) {
+        public init(bytes pointer: UnsafeRawPointer, count: Int) {
 
             _bytes = ContiguousArray<UInt8>(repeating: 0, count: count)
 
@@ -85,7 +85,7 @@
             guard let pointer = buffer.baseAddress
                 else { self.init(); return }
 
-            self.init(bytes: pointer, count: sizeof(SourceType) * buffer.count)
+            self.init(bytes: pointer, count: MemoryLayout<SourceType>.size * buffer.count)
         }
 
         // MARK: - Accessors
@@ -100,7 +100,7 @@
 
         public var description: String {
 
-            let hexString = bytes.map({ $0.toHexadecimal() }).reduce("", combine: { $0.0 + $0.1 })
+            let hexString = bytes.map({ $0.toHexadecimal() }).reduce("", { $0.0 + $0.1 })
 
             return "<" + hexString + ">"
         }

Sources/SwiftFoundation/FileManager.swift

@@ -75,9 +75,9 @@ public struct FileManager {
 
         let stringBufferSize = Int(PATH_MAX)
 
-        let path = UnsafeMutablePointer<CChar>(allocatingCapacity: stringBufferSize)
+        let path = UnsafeMutablePointer<CChar>.allocate(capacity: stringBufferSize)
 
-        defer { path.deallocateCapacity(stringBufferSize) }
+        defer { path.deallocate(capacity: stringBufferSize) }
 
         getcwd(path, stringBufferSize - 1)
 
@@ -193,9 +193,9 @@ public struct FileManager {
 
         #endif
 
-        let memoryPointer = UnsafeMutablePointer<Byte>(allocatingCapacity: fileSize)
+        let memoryPointer = UnsafeMutablePointer<Byte>.allocate(capacity: fileSize)
 
-        defer { memoryPointer.deallocateCapacity(fileSize) }
+        defer { memoryPointer.deallocate(capacity: fileSize) }
 
         let readBytes = read(file, memoryPointer, fileSize)
 
@@ -212,7 +212,7 @@ public struct FileManager {
     public static func set(contents data: Data, at path: String) throws {
 
         // get file descriptor for path (open file)
-        let file = open(path, O_WRONLY)
+        let file = open(path, O_TRUNC | O_WRONLY)
 
         guard file != -1 else { throw POSIXError.fromErrno! }
 

Sources/SwiftFoundation/Hash.swift

@@ -10,5 +10,5 @@
 public func Hash(_ data: Data) -> Int {
 
     // more expensive than casting but that's not safe for large values.
-    return data.bytes.map({ Int($0) }).reduce(0, combine: { $0.0 ^ $0.1 })
+    return data.bytes.map({ Int($0) }).reduce(0) { $0.0 ^ $0.1 }
 }