From cde2b8daab7f944d13da318a2edc71d177900944 Mon Sep 17 00:00:00 2001 From: Lucas Farah Date: Wed, 7 Sep 2016 14:48:26 -0700 Subject: [PATCH 1/2] Better Installation section fixes #30 --- README.md | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 38c2531..b9c98b1 100644 --- a/README.md +++ b/README.md @@ -136,23 +136,21 @@ System Requirements Concurrent supports OS X 10.9+ and iOS 7.0+. -Setup +Installation ===== -Concurrent can be included one of two ways: +#### Carthage +Create a `Cartfile` that lists the framework and run `carthage bootstrap`. Follow the [instructions](https://github.com/Carthage/Carthage#if-youre-building-for-ios) to add `$(SRCROOT)/Carthage/Build/iOS/Concurrent.framework` to an iOS project. -**Using Carthage** +``` +github "typelift/Concurrent" +``` -- Add Concurrent to your Cartfile -- Run `carthage update` -- Drag the relevant copy of Concurrent into your project. -- Expand the Link Binary With Libraries phase -- Click the + and add Concurrent -- Click the + at the top left corner to add a Copy Files build phase -- Set the directory to `Frameworks` -- Click the + and add Concurrent +#### Manually +1. Download and drop ```/Sources``` folder in your project. +2. Congratulations! -**Framework** +#### Framework - Drag Concurrent.xcodeproj or Concurrent-iOS.xcodeproj into your project tree as a subproject - Under your project's Build Phases, expand Target Dependencies From 7376e93082499022e4dda365a9aaefe720c0cb96 Mon Sep 17 00:00:00 2001 From: Robert Widmann Date: Sun, 18 Sep 2016 14:06:20 -0400 Subject: [PATCH 2/2] Add package manager instructions --- Package.swift | 12 +++++++----- README.md | 10 +++++++++- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index 338ba33..9646651 100644 --- a/Package.swift +++ b/Package.swift @@ -1,11 +1,13 @@ import PackageDescription let package = Package( - name: "Concurrent", - targets: [ - Target( - name: "Concurrent", - dependencies: []), + name: "Concurrent", + targets: [ + Target( + name: "Concurrent", + dependencies: []), ] ) +let libConcurrent = Product(name: "Concurrent", type: .Library(.Dynamic), modules: "Concurrent") +products.append(libConcurrent) diff --git a/README.md b/README.md index b9c98b1..711f5e9 100644 --- a/README.md +++ b/README.md @@ -139,6 +139,14 @@ Concurrent supports OS X 10.9+ and iOS 7.0+. Installation ===== +#### Swift Package Manager + +- Add SwiftCheck to your `Package.swift` file's dependencies section: + +``` +.Package(url: "https://github.com/typelift/Concurrent.git", versions: Version(0,4,0)..