Skip to content
This repository has been archived by the owner on Nov 3, 2020. It is now read-only.

Commit

Permalink
[bundler] Builds gems successfully
Browse files Browse the repository at this point in the history
  • Loading branch information
orta committed Dec 29, 2015
1 parent c451c68 commit 5839345
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
6 changes: 3 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -539,9 +539,9 @@ end
installed_pod_bin = File.join(BUNDLE_DESTROOT, 'bin/pod')
file installed_pod_bin => rubygems_update_dir do
# Can figure this one out later
bundler = "/Users/orta/.rvm/gems/ruby-2.1.3/bin/bundle"
bundler = "/Users/orta/.rvm/gems/ruby-2.1.3/wrappers/bundle"
# Let bundler grab all our dependencies
`#{bundler} install --gemfile bundled-Gemfile --path workbench/ --standalone`
execute "bundling", [ bundler, "install", "--gemfile", "bundled-Gemfile", "--path", "workbench/", "--standalone"]

# Downloaded Gems include the file structure for the downloads
# we have to build the .gem file before installing
Expand All @@ -558,7 +558,7 @@ file installed_pod_bin => rubygems_update_dir do
gemfiles_to_install << gemspec
end

install_gem gemfile
install_gem gemfiles_to_install.join " "
end

plugin = 'cocoapods-plugins-install'
Expand Down
2 changes: 1 addition & 1 deletion bundled-Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ gem 'cocoapods-core', :git => "https://github.com/CocoaPods/Core.git", :branch =
gem 'xcodeproj', :git => "https://github.com/CocoaPods/Xcodeproj.git"

gem 'cocoapods-keys'
gem 'cocoapods-deintegrate', :git => "https://github.com/CocoaPods/cocoapods-deintegrate.git"
gem 'cocoapods-deintegrate', :git => "https://github.com/CocoaPods/cocoapods-deintegrate.git", :branch => "reduced_gemspec"
9 changes: 5 additions & 4 deletions bundled-Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/CocoaPods/CocoaPods.git
revision: 3cf3dbcde978d1666a8b007fe1eaae3c3ff42ab8
revision: db93068587f06ee2e326bbd09bc555c7ff125d77
branch: seg-podfile-refactor
specs:
cocoapods (0.39.0)
Expand All @@ -22,7 +22,7 @@ GIT

GIT
remote: https://github.com/CocoaPods/Core.git
revision: 9fd6c128f989655cf48b07f7145d73ad02ab0694
revision: e5b64946f634fec8c99ed82a4da198f9ba1031fc
branch: seg-podfile-refactor
specs:
cocoapods-core (0.39.0)
Expand All @@ -41,7 +41,8 @@ GIT

GIT
remote: https://github.com/CocoaPods/cocoapods-deintegrate.git
revision: a0c2a243ecd2006b56d59105c8680ab0991d7c32
revision: 160752789024db423c26e950362be6b0080ecc40
branch: reduced_gemspec
specs:
cocoapods-deintegrate (0.2.1)

Expand Down Expand Up @@ -97,4 +98,4 @@ DEPENDENCIES
xcodeproj!

BUNDLED WITH
1.10.6
1.11.2

0 comments on commit 5839345

Please sign in to comment.