Compare commits

...

2 Commits

Author SHA1 Message Date
Michael Kirk
6a44557836 Track cocoapods in vendor dependencies
And move the WebRTC.framework to "Manual" to accurately reflect that it
was not installed/built by Carthage.

// FREEBIE
2017-02-13 19:35:38 -05:00
Matthew Chen
6b7d2c33e2 Update PromiseKit.
// FREEBIE
2017-02-10 14:28:21 -05:00
3781 changed files with 546120 additions and 102 deletions

27
.gitignore vendored
View File

@ -1,2 +1,29 @@
Build
build/
# Exclude temp nibs and swap files
*~.nib
*.swp
# Exclude OS X folder attributes
.DS_Store
# Exclude user-specific XCode 3 and 4 files
xcuserdata
*.xccheckout
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
*.xccheckout
*.moved-aside
DerivedData
*.hmap
*.ipa
*.xcuserstate

1
Cartfile Normal file
View File

@ -0,0 +1 @@
github "mxcl/PromiseKit"

1
Cartfile.resolved Normal file
View File

@ -0,0 +1 @@
github "mxcl/PromiseKit" "4.0.5"

View File

@ -18,8 +18,7 @@ script:
Mac)
xcodebuild -scheme PromiseKit -enableCodeCoverage YES test | xcpretty;;
iOS|tvOS)
xcrun instruments -w "$UUID" || true;
sleep 15;
open -a "simulator" --args -CurrentDeviceUDID "$UUID"
xcodebuild -scheme PromiseKit -destination "id=$UUID" -enableCodeCoverage YES test | xcpretty;;
watchOS)
xcodebuild -scheme PromiseKit -destination "name=Apple Watch - 38mm" | xcpretty;;

View File

@ -42,7 +42,7 @@
# [3.0.0](https://github.com/mxcl/PromiseKit/releases/tag/3.0.0) Oct 1st, 2015
In Swift 2.0 `catch` and `defer` became reserved keywords mandating we rename our functions with these names. This forced a major semantic version change on PromiseKit and thus we took the opportunity to make other minor (source compatability breaking) improvements.
In Swift 2.0 `catch` and `defer` became reserved keywords mandating we rename our functions with these names. This forced a major semantic version change on PromiseKit and thus we took the opportunity to make other minor (source compatibility breaking) improvements.
Thus if you cannot afford to adapt to PromiseKit 3 but still want to use Xcode-7.0/Swift-2.0 we provide a [minimal changes branch] where `catch` and `defer` are renamed `catch_` and `defer_` and all other changes are the bare minimum to make PromiseKit 2 compile against Swift 2.

View File

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Some files were not shown because too many files have changed in this diff Show More