Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • B Bolts-ObjC
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 34
    • Issues 34
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 7
    • Merge requests 7
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • BoltsFramework
  • Bolts-ObjC
  • Merge requests
  • !62

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

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Administrator requested to merge framework into master Oct 08, 2014
  • Overview 5
  • Commits 4
  • Pipelines 0
  • Changes 6

Created by: ghost

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.

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: framework