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

Update Bolts to work on OS X 10.10 and enable modules. Update iOS to include armv7s. #62

Merged
merged 4 commits into from Oct 8, 2014

Conversation

ghost
Copy link

@ghost ghost commented Oct 8, 2014

Changes:

  • Converted Bolts for OS X to framework product-type. OS X had it since a long time ago, so it shouldn't affect anyone.
  • Added Info.plist for OS X version of Bolts. This is required on 10.10 right now.
  • Added armv7s to ARCHS for iOS, so everyone can still use it.
  • Enabled module support in OS X bolts. (@import Bolts; now works).
  • Cleaned up build scripts for new OS X deployment via framework.
  • Cleaned up .travis.yml file

Test #1:

  • ./build_framework.sh inside scripts folder.
  • Try using the version that is built on Xcode 5 / 6 in few applications for both iOS and OSX.

Test #2:

  • ./build_framework.sh inside scripts folder.
  • Try using Bolts for OS X with Xcode 6.1 Beta targeting OS X 10.10
  • Codesign shouldn't fail now.

Test #3:

  • Try using Bolts for OS X in an example project
  • Replace #import <Bolts/*> with @import Bolts;
  • It shouldn't fail.

Oh yeah and the last one - travis CI now passes.

@grantland
Copy link
Member

LGTM

@ghost
Copy link
Author

ghost commented Oct 8, 2014

yunoaccept

grantland added a commit that referenced this pull request Oct 8, 2014
Update Bolts to work on OS X 10.10 and enable modules. Update iOS to include armv7s.
@grantland grantland merged commit ca84f21 into BoltsFramework:master Oct 8, 2014
@ghost ghost deleted the framework branch October 8, 2014 21:09
@iyunknona
Copy link

?

yullifurqon
Pada 9 Okt 2014 03:51, "Nikita Lutsenko" [email protected] menulis:

Changes:

  • Converted Bolts for OS X to framework product-type. OS X had it
    since a long time ago, so it shouldn't affect anyone.
  • Added Info.plist for OS X version of Bolts. This is required on
    10.10 right now.
  • Added armv7s to ARCHS for iOS, so everyone can still use it.
  • Enabled module support in OS X bolts. (@import Bolts; now works).
  • Cleaned up build scripts for new OS X deployment via framework.
  • Cleaned up .travis.yml file

Test #1 #1:

  • ./build_framework.sh inside scripts folder.
  • Try using the version that is built on Xcode 5 / 6 in few
    applications for both iOS and OSX.

Test #2 #2:

  • ./build_framework.sh inside scripts folder.
  • Try using Bolts for OS X with Xcode 6.1 Beta targeting OS X 10.10
  • Codesign shouldn't fail now.

Test #3 #3:

  • Try using Bolts for OS X in an example project
  • Replace #import <Bolts/*> with @import Bolts;
  • It shouldn't fail.

Oh yeah and the last one - travis CI now passes.

You can merge this Pull Request by running

git pull https://github.com/nlutsenko-fb/Bolts-iOS framework

Or view, comment on, or merge it at:

#62
Commit Summary

  • Add 'armv7s' to ARCHS for Bolts-iOS.
  • Converted Bolts for Mac into framework product-type. Added
    Info.plist for it.
  • Enable module support for OSX Bolts.
  • Update .travis.yml to use proper Configuration.

File Changes

Patch Links:


Reply to this email directly or view it on GitHub
#62.

@facebook-github-bot
Copy link
Contributor

@ghost updated the pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants