Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
eliburke committed Sep 15, 2017
2 parents 3dde95c + 2cd2aa3 commit 006b2b4
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 1 deletion.
17 changes: 17 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import PackageDescription

let package = Package(
name: "Swamp",
targets: [
Target(
name: "Swamp",
dependencies: []
)
],
dependencies: [
.Package(url: "https://github.com/SwiftyJSON/SwiftyJSON.git", versions: Version(1,0,0)..<Version(3, .max, .max)),
.Package(url: "https://github.com/daltoniam/Starscream", majorVersion: 2, minor: 0),
.Package(url: "https://github.com/krzyzanowskim/CryptoSwift", majorVersion: 0, minor: 6),
],
exclude: ["Example"]
)
22 changes: 21 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[![Version](https://img.shields.io/cocoapods/v/Swamp.svg?style=flat)](http://cocoapods.org/pods/Swamp)
[![License](https://img.shields.io/cocoapods/l/Swamp.svg?style=flat)](http://cocoapods.org/pods/Swamp)
[![Platform](https://img.shields.io/cocoapods/p/Swamp.svg?style=flat)](http://cocoapods.org/pods/Swamp)
[![Swift Package Manager compatible](https://img.shields.io/badge/Swift%20Package%20Manager-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager)
## Swamp - Swift WAMP implementation

Swamp is a WAMP implementation in Swift.
Expand All @@ -19,14 +20,32 @@ Contributions to support MessagePack & Raw Sockets will be merged gladly!
| 3 | 0.2.0 and above | OSX 10.10 or iOS 8.0 |

## Installation
Swamp is available through cocoapods. Add
### cocoapods
To use Swamp through cocoapods, add

```ruby
pod 'Swamp', '~> 0.2.0'
```

to your Podfile. (use `'~> 0.1.0'` for Swift 2)

### Swift Package Manager
To use Swamp through Swift Package Manager, create a Package.swift file:

```swift
import PackageDescription

let package = Package(
name: "SwampTestProject",
targets: [],
dependencies: [
.Package(url: "https://github.com/RadarBee/swamp.git", majorVersion: 0, minor: 2)
]
)
```

`$ swift build`

## Usage
#### Connect to router

Expand Down Expand Up @@ -191,6 +210,7 @@ You can also inspect `Example/swamp-crossbar-instance.log` to find out what happ

- Yossi Abraham, yo.ab@outlook.com (Author)
- Dany Sousa, @danysousa (Swift 3 support)
- Kevin Lanik, @MPKevin (Swift Package Manager support)
- Eli Burke, @eliburke (Carthage, Msgpack)

## License
Expand Down

0 comments on commit 006b2b4

Please sign in to comment.