[WIP] Building on Linux

.ci/build.sh

@@ -0,0 +1,78 @@
+#!/usr/bin/env bash
+
+VERSION="3.1.1"
+echo "Swift $VERSION Continuous Integration";
+
+# Determine OS
+UNAME=`uname`;
+if [[ $UNAME == "Darwin" ]];
+then
+    OS="macos";
+else
+    if [[ $UNAME == "Linux" ]];
+    then
+        UBUNTU_RELEASE=`lsb_release -a 2>/dev/null`;
+        if [[ $UBUNTU_RELEASE == *"15.10"* ]];
+        then
+            OS="ubuntu1510";
+        else
+            OS="ubuntu1404";
+        fi
+    else
+        echo "Unsupported Operating System: $UNAME";
+    fi
+fi
+echo "🖥 Operating System: $OS";
+
+if [[ $OS != "macos" ]];
+then
+    echo "📚 Installing Dependencies"
+    source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
+    wget -qO- https://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
+    sudo apt-get update
+    sudo apt-get install -y clang libicu-dev uuid-dev rethinkdb
+    eval "$(curl -sL https://apt.vapor.sh)"
+
+    echo "🐦 Installing Swift";
+    sudo apt-get install -y swift ctls rethinkdb
+else
+    echo "📚 Installing Dependencies"
+    brew tap vapor/homebrew-tap
+    brew update
+    brew install vapor rethinkdb
+fi
+
+echo "🎛️ Starting RethinkDB server"
+rethinkdb --daemon
+
+echo "📅 Version: `swift --version`";
+
+echo "🚀 Building";
+swift build
+if [[ $? != 0 ]]; 
+then 
+    echo "❌  Build failed";
+    exit 1; 
+fi
+
+echo "💼 Building Release";
+swift build -c release
+if [[ $? != 0 ]]; 
+then 
+    echo "❌  Build for release failed";
+    exit 1; 
+fi
+
+echo "🔎 Testing";
+
+swift test
+if [[ $? != 0 ]]; 
+then 
+    echo "❌ Tests failed";
+    exit 1; 
+fi
+
+echo "🛑 Stopping RethinkDB";
+killall rethinkdb
+
+echo "✅ Done"

.gitignore

@@ -1,5 +1,69 @@
 .DS_Store
-/.build
-/Packages
-Rethink.xcodeproj/project.xcworkspace/xcuserdata
-Rethink.xcodeproj/xcuserdata
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+*.xcodeproj
+
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+# Package.pins
+.build/
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output

.travis.yml

@@ -1,22 +1,12 @@
-language: objective-c
+os:
+  - linux
+  - osx
 
-branches:
- only:
- - master
+language: generic
 
-xcode_project: Rethink.xcodeproj
-xcode_scheme: Rethink
-osx_image: xcode8
+sudo: required
+dist: trusty
 
-before_install:
- - brew install rethinkdb
+osx_image: xcode8.3
 
-before_script:
- - rethinkdb --daemon
- - sleep 10
-
-script:
-- xcodebuild clean build test -project Rethink.xcodeproj -scheme Rethink CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY=""
-
-after_script:
- - killall rethinkdb
+script: ./.ci/build.sh

Package.pins

@@ -0,0 +1,54 @@
+{
+  "autoPin": true,
+  "pins": [
+    {
+      "package": "BCrypt",
+      "reason": null,
+      "repositoryURL": "https://github.com/vapor/bcrypt.git",
+      "version": "1.0.0"
+    },
+    {
+      "package": "Bits",
+      "reason": null,
+      "repositoryURL": "https://github.com/vapor/bits.git",
+      "version": "1.0.0"
+    },
+    {
+      "package": "CTLS",
+      "reason": null,
+      "repositoryURL": "https://github.com/vapor/ctls.git",
+      "version": "1.0.0"
+    },
+    {
+      "package": "Core",
+      "reason": null,
+      "repositoryURL": "https://github.com/vapor/core.git",
+      "version": "2.0.2"
+    },
+    {
+      "package": "Crypto",
+      "reason": null,
+      "repositoryURL": "https://github.com/vapor/crypto.git",
+      "version": "2.0.0"
+    },
+    {
+      "package": "Debugging",
+      "reason": null,
+      "repositoryURL": "https://github.com/vapor/debugging.git",
+      "version": "1.0.0"
+    },
+    {
+      "package": "Random",
+      "reason": null,
+      "repositoryURL": "https://github.com/vapor/random.git",
+      "version": "1.0.0"
+    },
+    {
+      "package": "Sockets",
+      "reason": null,
+      "repositoryURL": "https://github.com/vapor/sockets.git",
+      "version": "2.0.1"
+    }
+  ],
+  "version": 1
+}

Package.swift

@@ -3,8 +3,12 @@ import PackageDescription
 let package = Package(
 	name: "Rethink",
 	targets: [
-		Target(name: "Rethink", dependencies: ["GCDAsyncSocket", "SCRAM"]),
-		Target(name: "GCDAsyncSocket"),
+		Target(name: "Rethink", dependencies: ["SCRAM"]),
 		Target(name: "SCRAM")
-	]
+	],
+	dependencies: [
+        .Package(url: "https://github.com/vapor/sockets.git", majorVersion: 2),
+        .Package(url: "https://github.com/vapor/crypto.git", majorVersion: 2),
+        .Package(url: "https://github.com/vapor/bcrypt.git", majorVersion: 1),
+    ]
 )

README.md

@@ -74,8 +74,12 @@ HEADER_SEARCH_PATHS = $(inherited) "$(SRCROOT)/Packages/**"
 ```
 
 #### Manual
+To use the driver in an Xcode project, generate an Xcode project file using SPM:
+```
+swift package generate-xcodeproj
+```
 
-Drag Rethink.xcodeproj into your own project, then add Rethink or Rethink iOS as dependency (build targets) and link to it.
+Drag the generated 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