Skip to content

Commit

Permalink
Merge pull request MacDownApp#335 from orta/gemfile
Browse files Browse the repository at this point in the history
Use a gemfile to get around the CocoaPods bug

Fix MacDownApp#220.
  • Loading branch information
uranusjr committed Apr 6, 2015
2 parents 65dcba5 + 490190b commit 6441e39
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 12 deletions.
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'cocoapods', '0.34.4'
18 changes: 9 additions & 9 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ DEPENDENCIES:
- Sparkle (< 1.8)

SPEC CHECKSUMS:
GBCli: 304718a0ff52cb39ea7ae1bcb3c4cb40c5a48c8d
handlebars-objc: ced98b23adddc7b3fbf7473fb40225255e53f591
hoedown: d7b4579420f036df11884b55017bd38a67bcabb6
JJPluralForm: 14142b5f85ac6abdc3a2cf45f1af61fe6559ea60
LibYAML: d447960375d9114187bfddba6e6c24d69bff11f8
M13OrderedDictionary: 17dd456dd096dc1de8f810b93d70ae964063e0ff
MASPreferences: 48debf3a161039bb979e617b7416bc07bd879f75
PAPreferences: 3916ab2f4f332f0a9ed7d45c63dd628ea814a11c
Sparkle: fde5ffeb7bf01db28925499ce2a75977763af58a
GBCli: e5f988fadb68e1e3c01919f134009fed9796fde0
handlebars-objc: df4f98f81cd380b1e6b19a9f7dacddac6b4c3bd8
hoedown: 1a615272aa9b278b8497cda9e0b569d6b7580958
JJPluralForm: 9a6235813990a33a63fb3eff457eb2c633af6acd
LibYAML: 3af2c5adf3a40dff936d087aa6a77edc10036bc5
M13OrderedDictionary: f16e52c6eaaff5c6042f91fa2dc959350246133f
MASPreferences: 32d8a2c5ef1d60b63240f5676b011ff72e194cb1
PAPreferences: ba3f8d236c4c398b82bb0110cddd8546cd619770
Sparkle: f107eed24a7d41bcd510be49ebb640d176f06bb9

COCOAPODS: 0.34.4
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ You may also need to install Xcode’s command line tools with the following com

xcode-select --install

> Note: Due to an [upstream bug](https://github.com/CocoaPods/CocoaPods/issues/2559), Xcode will fail to build certain dependencies if you use the latest version of CocoaPods (0.35 at the time of writing). To avoid the problem and build the project correctly, you need to install an older version of CocoaPods (0.34.4 is recommended), and use that to build the dependencies instead. See [comment in issue #220](https://github.com/uranusjr/macdown/issues/220#issuecomment-65014799) for detailed instructions.
> Note: Due to an [upstream bug](https://github.com/CocoaPods/CocoaPods/issues/2559), Xcode will fail to build certain dependencies if you use the latest version of CocoaPods (0.36+ at the time of writing). To avoid the problem we use a Gemfile to specify the version, and thus you should add `bundle exec` before running a CocoaPods command.
An appropriate SDK should be bundled with Xcode 5 or later versions.

Expand All @@ -54,14 +54,15 @@ After cloning the repository, run the following commands inside the repository r

git submodule init
git submodule update
pod install
bundle install
bundle exec pod install

and open `MacDown.xcworkspace` in Xcode. The first command initialises the dependency submodule(s) used in MacDown; the second one installs dependencies managed by CocoaPods.

Refer to the official guides of Git and CocoaPods if you need more instructions. If you run into build issues later on, try running the following commands to update dependencies:

git submodule update
pod install
bundle exec pod install

## Discussion

Expand Down

0 comments on commit 6441e39

Please sign in to comment.