Skip to content

Commit

Permalink
Merge pull request #150 from CodaFi/work-stealing
Browse files Browse the repository at this point in the history
[WIP] Update to Swift 2.2+
  • Loading branch information
CodaFi committed Mar 22, 2016
2 parents 1d8f159 + 8d53e21 commit f214146
Show file tree
Hide file tree
Showing 44 changed files with 1,151 additions and 444 deletions.
25 changes: 25 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
We love that you're interested in contributing to this project!

To make the process as painless as possible, we have just a couple of guidelines
that should make life easier for everyone involved.

## Prefer Pull Requests

If you know exactly how to implement the feature being suggested or fix the bug
being reported, please open a pull request instead of an issue. Pull requests are easier than
patches or inline code blocks for discussing and merging the changes.

If you can't make the change yourself, please open an issue after making sure
that one isn't already logged.

## Contributing Code

Fork this repository, make it awesomer (preferably in a branch named for the
topic), send a pull request!

All code contributions should match our the framework's conventions. When in
doubt, you can look around the project for similar code, or just use [GitHub's
coding conventions](https://github.com/github/swift-style-guide).

Thanks for contributing! :boom::camel:

35 changes: 35 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
Version
========

_Share the git commit hash of the version of the framework that you are using. You can find it by running `git rev-parse HEAD` in the framework directory._

Environment
===========

_What's your environment? Mac OS X, Linux, or something else?_

Description
============

_In your own words, briefly describe the issue._

Steps To Reproduce
===================

_List the actions that will reproduce the issue._

Expected Result
================

_What was the expected result after running the steps above?_

Actual Result
==============

_What was the actual result after running the steps above?_

Additional information
======================

_Please provide any additional information that helps debugging, e.g. log output, stack traces, error codes, etc._

24 changes: 24 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
What's in this pull request?
============================

_Briefly describe the contents of this pull request. What did you add, remove,
change?_

Why merge this pull request?
============================

_Give us a short description of why this is important. For example, future
plans, cleanup, motivations for additional features, etc._

What's worth discussing about this pull request?
================================================

_Is there any part of this pull request that is especially important,
controversial, or that you're unsure of? We can totally help!_

What downsides are there to merging this pull request?
======================================================

_If you answered the last question in the affirmative, do you wish to discuss
alternative implementations or have any other overarching concerns?_

50 changes: 38 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,42 @@
language: objective-c
osx_image: xcode7.2
env:
- TEST_CONFIG="RELEASE"
- TEST_CONFIG="PODS"
- TEST_CONFIG="CARTHAGE"

install: true
script:
- if [[ "$TEST_CONFIG" == "RELEASE" ]]; then script/cibuild SwiftCheck SwiftCheck-iOS ; fi
- if [[ "$TEST_CONFIG" == "RELEASE" ]]; then xcodebuild test -scheme SwiftCheck-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 1080p' ; fi
- if [[ "$TEST_CONFIG" == "CARTHAGE" ]]; then carthage build --no-skip-current; fi
- if [[ "$TEST_CONFIG" == "PODS" ]]; then pod lib lint; fi
global:
- LC_CTYPE=en_US.UTF-8
matrix:
include:
- os: osx
language: objective-c
osx_image: xcode7.3
before_install:
- git submodule update --init --recursive
script:
- pod lib lint
- carthage build --no-skip-current
- os: osx
language: objective-c
osx_image: xcode7.3
before_install:
- git submodule update --init --recursive
script:
- set -o pipefail
- xcodebuild test -scheme SwiftCheck
- xcodebuild test -scheme SwiftCheck-iOS -destination 'platform=iOS Simulator,name=iPad Pro'
- xcodebuild test -scheme SwiftCheck-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 1080p'
- os: linux
language: generic
sudo: required
dist: trusty
before_install:
- git submodule update --init --recursive
- wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
- wget https://swift.org/builds/development/ubuntu1404/swift-DEVELOPMENT-SNAPSHOT-2016-02-08-a/swift-DEVELOPMENT-SNAPSHOT-2016-02-08-a-ubuntu14.04.tar.gz
- tar xzf swift-DEVELOPMENT-SNAPSHOT-2016-02-08-a-ubuntu14.04.tar.gz
- export PATH=${PWD}/swift-DEVELOPMENT-SNAPSHOT-2016-02-08-a-ubuntu14.04/usr/bin:"${PATH}"
- wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
- wget https://swift.org/builds/development/ubuntu1404/swift-DEVELOPMENT-SNAPSHOT-2016-02-08-a/swift-DEVELOPMENT-SNAPSHOT-2016-02-08-a-ubuntu14.04.tar.gz
- tar xzf swift-DEVELOPMENT-SNAPSHOT-2016-02-08-a-ubuntu14.04.tar.gz
- export PATH=${PWD}/swift-DEVELOPMENT-SNAPSHOT-2016-02-08-a-ubuntu14.04/usr/bin:"${PATH}"
script:
- swift build
notifications:
webhooks:
urls:
Expand Down
11 changes: 11 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import PackageDescription

let package = Package(
name: "SwiftCheck",
targets: [
Target(name: "SwiftCheck"),
Target(name: "SwiftCheck-iOS"),
Target(name: "SwiftCheck-tvOS"),
]
)

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ property("Shrunken lists of integers always contain [] or [0]") <- forAll { (l :
return (!l.getArray.isEmpty && l.getArray != [0]) ==> {
let ls = self.shrinkArbitrary(l).map { $0.getArray }
return (ls.filter({ $0 == [] || $0 == [0] }).count >= 1)
}()
}
}
```

Expand Down Expand Up @@ -236,7 +236,7 @@ with custom generators as simple as possible:
```swift
let onlyEven = Int.arbitrary.suchThat { $0 % 2 == 0 }

let vowels = Gen.fromElementsOf(["A", "E", "I", "O", "U" ])
let vowels = Gen.fromElementsOf([ "A", "E", "I", "O", "U" ])

let randomHexValue = Gen<UInt>.choose((0, 15))

Expand Down
Loading

0 comments on commit f214146

Please sign in to comment.