Compare commits
2 Commits
master
...
mkirk/trac
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6a44557836 | ||
|
|
6b7d2c33e2 |
27
.gitignore
vendored
27
.gitignore
vendored
@ -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.resolved
Normal file
1
Cartfile.resolved
Normal file
@ -0,0 +1 @@
|
||||
github "mxcl/PromiseKit" "4.0.5"
|
||||
@ -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;;
|
||||
@ -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.
|
||||
|
||||
|
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
Loading…
Reference in New Issue
Block a user