Merge pull request #7 from johnbona/feature/swift-pm

Support Swift Package Manager

.gitignore

@@ -1,2 +1,5 @@
+.DS_Store
+/.build
+/Packages
 Rethink.xcodeproj/project.xcworkspace/xcuserdata
 Rethink.xcodeproj/xcuserdata

Package.swift

@@ -0,0 +1,10 @@
+import PackageDescription
+
+let package = Package(
+	name: "Rethink",
+	targets: [
+		Target(name: "Rethink", dependencies: ["GCDAsyncSocket", "SCRAM"]),
+		Target(name: "GCDAsyncSocket"),
+		Target(name: "SCRAM")
+	]
+)

README.md

@@ -54,7 +54,28 @@ The driver is written for Swift 3. The last version working in Swift 2.2 can be
 
 ### Installation
 
-Drag Rethink.xcodeproj into your own project, then add Rethink.framework as dependency (build targets) and link to it.
+#### Swift Package Manager (SPM)
+
+You can install the driver using Swift Package Manager by adding the following line to your ```Package.swift``` as a dependency:
+
+```
+.Package(url: "https://github.com/pixelspark/rethink-swift.git", majorVersion: 1)
+```
+
+To use the driver in an Xcode project, generate an Xcode project file using SPM:
+```
+swift package generate-xcodeproj
+```
+Open the Xcode project file and open the .xcconfig file located under the Config folder and add the following Objective-C build settings:
+```
+CLANG_ENABLE_MODULES = YES
+CLANG_ENABLE_OBJC_ARC = YES
+HEADER_SEARCH_PATHS = $(inherited) "$(SRCROOT)/Packages/**"
+```
+
+#### Manual
+
+Drag Rethink.xcodeproj into your own project, then add Rethink or Rethink iOS as dependency (build targets) and link to it.
 You should then be able to simply 'import Rethink' from Swift code.
 
 ### License

Rethink.xcodeproj/project.xcworkspace/xcshareddata/Rethink.xcscmblueprint

@@ -9,7 +9,7 @@
   },
   "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "9D490845-C9AB-4999-8F49-108ED1CB5EBC",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
-    "B4ECFDB54DAEDE750287282DDD72484BDC32C452" : "Rethink\/",
+    "B4ECFDB54DAEDE750287282DDD72484BDC32C452" : "rethink-swift\/",
     "A5F18CC216C059F29632AA08FA9E5DF3898315E3" : ".."
   },
   "DVTSourceControlWorkspaceBlueprintNameKey" : "Rethink",

Sources/GCDAsyncSocket/Info.plist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2016 Pixelspark. All rights reserved.</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>

Rethink/ReConnection.swift → Sources/Rethink/ReConnection.swift

@@ -23,6 +23,8 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE. **/
 import Foundation
+import GCDAsyncSocket
+import SCRAM
 
 public class ReConnection: NSObject, GCDAsyncSocketDelegate {
 	public let url: URL

Rethink/ReSocket.swift → Sources/Rethink/ReSocket.swift

@@ -23,6 +23,7 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE. **/
 import Foundation
+import GCDAsyncSocket
 
 internal enum ReSocketState {
 	case unconnected

Rethink/Rethink.h → Sources/Rethink/Rethink.h

@@ -2,6 +2,3 @@
 
 FOUNDATION_EXPORT double RethinkVersionNumber;
 FOUNDATION_EXPORT const unsigned char RethinkVersionString[];
-
-#import "GCDAsyncSocket.h"
-#import "SCRAM.h"

Sources/SCRAM/Info.plist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2016 Pixelspark. All rights reserved.</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>

RethinkTests/RethinkTests.swift → Tests/RethinkTests/RethinkTests.swift

@@ -1,5 +1,6 @@
 import XCTest
 import Rethink
+import SCRAM
 
 class RethinkTests: XCTestCase {
 	private func asyncTest(_ block: (_ callback: @escaping () -> ()) -> ()) {