Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #1

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ac4c6e6
Merge branch 'master' into develop
dileping Mar 7, 2016
4a96270
Works with Boilerplate
dileping Mar 8, 2016
c6a31e5
Test mode run loop context
dileping Mar 8, 2016
e5865ab
new run loops
dileping Mar 11, 2016
22259e5
new API
dileping Mar 11, 2016
93b2d17
regenerated project
dileping Mar 12, 2016
2d61414
Some optimisations
dileping Mar 12, 2016
3cd830e
project fixes
dileping Mar 12, 2016
396f093
correct dependencies
dileping Apr 11, 2016
56f871b
Linux, project structure, Cartfile, small fixes
ypopovych Apr 15, 2016
8e26345
Fixed project settings for all platforms
ypopovych Apr 15, 2016
d04723b
Swift 3.0 fixes
ypopovych Apr 15, 2016
d5b1f8f
Swift 3.0 array fix
ypopovych Apr 15, 2016
1a2d981
endIndex fix
ypopovych Apr 15, 2016
cfc45fe
Fixed travis.yml
ypopovych Apr 15, 2016
75d08ca
travis libuv on osx
ypopovych Apr 15, 2016
defc64f
travis lib fix
ypopovych Apr 15, 2016
2956398
dispatch build and test on travis
ypopovych Apr 19, 2016
4d5e8a0
Linux test fix
ypopovych Apr 19, 2016
cd87560
Better linux run
ypopovych Apr 19, 2016
5246b46
Better linux tests
ypopovych Apr 19, 2016
275d8c7
Attempt to fix main thread tests
ypopovych Apr 19, 2016
0e1e47a
Merge pull request #17 from ypopovych/develop
dileping Apr 28, 2016
230fbad
Added tenant protocol
dileping May 4, 2016
f2b77e9
better movable protocol
dileping May 4, 2016
ed1e558
immediate if current
dileping May 4, 2016
92f2a7a
3.0 style enums
dileping May 4, 2016
1a70e35
added podspec
necrowman Jul 11, 2016
0114366
fixed podspec;
necrowman Jul 11, 2016
caeb39e
updated podspec
necrowman Jul 12, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 27 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@ env:
matrix:
include:
- script:
- xctool test -project $MODULE_NAME.xcodeproj -scheme $MODULE_NAME-OSX
- xctool test -project $MODULE_NAME.xcodeproj -scheme $MODULE_NAME-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6'
- xctool test -project $MODULE_NAME.xcodeproj -scheme $MODULE_NAME-tvOS -sdk appletvsimulator -destination 'platform=tvOS Simulator,name=Apple TV 1080p'
- xctool build -project $MODULE_NAME.xcodeproj -scheme $MODULE_NAME-watchOS -sdk watchsimulator -destination 'platform=watchOS Simulator,name=Apple Watch - 42mm'
- xcodebuild test -project $MODULE_NAME.xcodeproj -scheme $MODULE_NAME-OSX
- xcodebuild test -project $MODULE_NAME.xcodeproj -scheme $MODULE_NAME-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6'
- xcodebuild test -project $MODULE_NAME.xcodeproj -scheme $MODULE_NAME-tvOS -sdk appletvsimulator -destination 'platform=tvOS Simulator,name=Apple TV 1080p'
- xcodebuild build -project $MODULE_NAME.xcodeproj -scheme $MODULE_NAME-watchOS -sdk watchsimulator -destination 'platform=watchOS Simulator,name=Apple Watch - 42mm'
os: osx
osx_image: xcode7.2
osx_image: xcode7.3
language: objective-c
before_install:
- brew update
- brew outdated carthage || brew upgrade carthage
- brew outdated xctool || brew upgrade xctool
- brew install libuv
# - brew outdated xctool || brew upgrade xctool
before_script:
# bootstrap the dependencies for the project
# you can remove if you don't have dependencies
Expand All @@ -33,18 +34,35 @@ matrix:
repo: crossroadlabs/ExecutionContext
tags: true
- script:
- ./build
- ./build test
- ./build clean
- ./build test -Xcc -fblocks -Xswiftc -Ddispatch
sudo: required
dist: trusty
language: generic
before_install:
# install original swift distribution
- wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
- cd ..
- export SWIFT_VERSION="swift-DEVELOPMENT-SNAPSHOT-2016-03-01-a"
- export SWIFT_VERSION="swift-DEVELOPMENT-SNAPSHOT-2016-03-24-a"
- wget https://swift.org/builds/development/ubuntu1404/$SWIFT_VERSION/$SWIFT_VERSION-ubuntu14.04.tar.gz
- tar xzf $SWIFT_VERSION-ubuntu14.04.tar.gz
- export PATH="${PWD}/${SWIFT_VERSION}-ubuntu14.04/usr/bin:${PATH}"
- export SWIFT_ROOT_DIR="${PWD}/${SWIFT_VERSION}-ubuntu14.04"
- export PATH="${SWIFT_ROOT_DIR}/usr/bin:${PATH}"
# dispatch build
- sudo apt-get install clang autoconf libtool pkg-config systemtap-sdt-dev libblocksruntime-dev libkqueue-dev libpthread-workqueue-dev libbsd-dev git make
- git clone -b experimental/foundation https://github.com/apple/swift-corelibs-libdispatch.git
- cd swift-corelibs-libdispatch
- git submodule init
- git submodule update
- sh ./autogen.sh
- ./configure --with-swift-toolchain="${SWIFT_ROOT_DIR}/usr" --prefix="${SWIFT_ROOT_DIR}/usr"
- make && make install
- cd ..
# libuv v1
- sudo add-apt-repository ppa:swiftexpress/swiftexpress --yes
- sudo apt-get update
- sudo apt-get install libuv1-dev
# get back home
- cd $MODULE_NAME
# get crossroad build script
Expand Down
4 changes: 3 additions & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
github "crossroadlabs/Result" ~> 1.0
github "antitypical/Result" ~> 2.0
github "crossroadlabs/Boilerplate" ~> 0.1
github "crossroadlabs/RunLoop" "master"
1 change: 1 addition & 0 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "crossroadlabs/XCTest3" ~> 0.1
25 changes: 25 additions & 0 deletions ExecutionContext.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Pod::Spec.new do |s|
s.name = "ExecutionContext"
s.version = "0.4.0"
s.license = { :type => "Apache 2", :file => "LICENSE" }
s.summary = "Execution context: object oriented, cross platform, user friendly replacement of Dispatch"
s.homepage = "https://github.com/reactive-swift/ExecutionContext"
s.social_media_url = "https://github.com/reactive-swift/ExecutionContext"
s.authors = { "Daniel Leping" => "[email protected]" }

s.source = { :git => "https://github.com/reactive-swift/ExecutionContext.git", :tag => "#{s.version}", :branch => 'develop' }

s.ios.deployment_target = "8.0"
s.osx.deployment_target = "10.10"
s.watchos.deployment_target = "2.0"
s.tvos.deployment_target = "9.0"

s.source_files = "ExecutionContext/*.swift"

s.dependency 'Result', '~> 2.0'
s.dependency 'Boilerplate', '~> 0.1'
s.dependency 'RunLoop', '~> 0.1.1'

s.requires_arc = true

end
Loading