Merge branch 'develop'

Markdown.xcodeproj/project.pbxproj

@@ -287,6 +287,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -328,6 +329,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
+				SWIFT_VERSION = 3.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};

Markdown.xcodeproj/xcshareddata/xcschemes/Markdown.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Markdown/Errors.swift

@@ -19,9 +19,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
-
-public enum Error : ErrorType {
+public enum Error : ErrorProtocol {
     case Compile(code:Int32)
     case Produce(code:Int32)
-}
+}

Markdown/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1</string>
+	<string>1.0.0-alpha.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Markdown/Markdown.swift

@@ -22,7 +22,7 @@
 import CDiscount
 
 private typealias PMMIOT = UnsafeMutablePointer<Void>
-private typealias MKDFUN = (PMMIOT, UnsafeMutablePointer<UnsafeMutablePointer<Int8>>) -> Int32
+private typealias MKDFUN = (PMMIOT, UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>) -> Int32
 
 public class Markdown {
     private let _markdown:PMMIOT
@@ -43,8 +43,8 @@ public class Markdown {
         try self.init(markdown: mkd_string(string, Int32(string.characters.count), 0), options: options)
     }
 
-    private func data(fun:MKDFUN, deallocator:UnsafeMutablePointer<Int8>->Void) throws -> String {
-        var dest = [UnsafeMutablePointer<Int8>](count: 1, repeatedValue: UnsafeMutablePointer<Int8>.alloc(1))
+    private func data(with fun:MKDFUN, deallocator:(UnsafeMutablePointer<Int8>?)->Void) throws -> String {
+        var dest = [UnsafeMutablePointer<Int8>?](repeating: UnsafeMutablePointer<Int8>(allocatingCapacity: 1), count: 1)
 
         let result = fun(_markdown, &dest)
         defer {
@@ -56,43 +56,43 @@ public class Markdown {
             throw Error.Produce(code: result)
         }
 
-        guard let string = String.fromCString(dest[0]) else {
+        guard let data = dest[0] else {
             return ""
         }
 
-        return string
+        return String(cString: data)
     }
 
     public func document() throws -> String {
-        return try data(mkd_document) { pointer in
+        return try data(with: mkd_document) { pointer in
         }
     }
 
     public func css() throws -> String {
-        return try data(mkd_css) { pointer in
+        return try data(with: mkd_css) { pointer in
         }
     }
 
     public func tableOfContents() throws -> String {
-        return try data(mkd_toc) { pointer in
+        return try data(with: mkd_toc) { pointer in
         }
     }
 
     public var title:String? {
         get {
-            return String.fromCString(mkd_doc_title(_markdown))
+            return String(cString: mkd_doc_title(_markdown))
         }
     }
 
     public var author:String? {
         get {
-            return String.fromCString(mkd_doc_author(_markdown))
+            return String(cString: mkd_doc_author(_markdown))
         }
     }
 
     public var date:String? {
         get {
-            return String.fromCString(mkd_doc_date(_markdown))
+            return String(cString: mkd_doc_date(_markdown))
         }
     }
-}
+}

Markdown/Options.swift

@@ -22,7 +22,7 @@
 import Foundation
 import CDiscount
 
-public struct Options : OptionSetType {
+public struct Options : OptionSet {
     public let rawValue: UInt32
 
     public init(rawValue: UInt32) {
@@ -64,4 +64,4 @@ public struct Options : OptionSetType {
     //    public static let UrlEncodedAnchor       = Options(rawValue: UInt32(MKD_URLENCODEDANCHOR))
 
     public static let Embed:Options            = [.NoLinks, .NoImage, .TagText]
-}
+}

Package.swift

@@ -28,5 +28,6 @@ let package = Package(
             name: "Markdown"
         ),
     ],
-    dependencies: [.Package(url: "https://github.com/crossroadlabs/CDiscount.git", majorVersion: 0)]
+    dependencies: [.Package(url: "https://github.com/crossroadlabs/CDiscount.git", majorVersion: 0)],
+    exclude: ["Carthage"]
 )

Tests/Markdown/MarkdownTests.swift

@@ -20,6 +20,8 @@
 //===----------------------------------------------------------------------===//
 
 import XCTest
+import Foundation
+
 @testable import Markdown
 
 #if !os(Linux) || dispatch
@@ -85,12 +87,12 @@ class MarkdownTests: XCTestCase {
     #if !os(Linux) || dispatch
     // no dispatch
     func testStress() {
-        let id = NSUUID().UUIDString
-        let queue = dispatch_queue_create(id, DISPATCH_QUEUE_CONCURRENT)
+        let id = UUID().uuidString
+        let queue = DispatchQueue(label: id, attributes: DispatchQueueAttributes.concurrent)
 
         for i in 0...10000 {
-            let expectation = self.expectationWithDescription("OK " + String(i))
-            dispatch_async(queue) {
+            let expectation = self.expectation(description: "OK " + String(i))
+            queue.async {
                 do {
                     let markdown = try Markdown(string: "# test line " + String(i), options: .None)
                     let html = try markdown.document()
@@ -103,7 +105,7 @@ class MarkdownTests: XCTestCase {
             }
         }
 
-        self.waitForExpectationsWithTimeout(30, handler: nil)
+        self.waitForExpectations(timeout: 30, handler: nil)
     }
 
     #endif
@@ -127,4 +129,4 @@ extension MarkdownTests : XCTestCaseProvider {
         return tests
 	}
 }
-#endif
+#endif