Skip to content

Commit

Permalink
Test With Cocoapods 1.9.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Siddharth Gupta committed Mar 14, 2020
1 parent efd8b69 commit ba395d8
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source 'https://rubygems.org'
gemspec

group :development do
gem 'cocoapods', '1.8.1'
gem 'cocoapods', '1.9.1'

gem 'mocha'
gem 'bacon'
Expand Down
21 changes: 14 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ GEM
atomos (0.1.3)
bacon (1.2.0)
claide (1.0.3)
cocoapods (1.8.1)
cocoapods (1.9.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.8.1)
cocoapods-core (= 1.9.1)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -36,13 +36,15 @@ GEM
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.11.1, < 2.0)
cocoapods-core (1.8.1)
xcodeproj (>= 1.14.0, < 2.0)
cocoapods-core (1.9.1)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.3.0)
cocoapods-plugins (1.0.0)
Expand All @@ -56,6 +58,9 @@ GEM
colored2 (3.1.2)
concurrent-ruby (1.1.6)
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.12.2)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
Expand All @@ -73,9 +78,11 @@ GEM
netrc (0.11.0)
prettybacon (0.0.2)
bacon (~> 1.2)
rake (10.5.0)
rake (13.0.1)
ruby-macho (1.4.0)
thread_safe (0.3.6)
typhoeus (1.3.1)
ethon (>= 0.9.0)
tzinfo (1.2.6)
thread_safe (~> 0.1)
xcodeproj (1.15.0)
Expand All @@ -91,12 +98,12 @@ PLATFORMS
DEPENDENCIES
bacon
bundler (~> 1.3)
cocoapods (= 1.8.1)
cocoapods (= 1.9.1)
cocoapods-pod-merge!
mocha
mocha-on-bacon
prettybacon
rake (~> 10.0)
rake (~> 13.0)

BUNDLED WITH
1.17.3
2 changes: 1 addition & 1 deletion PodMergeExample/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ source "https://rubygems.org"

git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }

gem 'cocoapods', '1.8.1'
gem 'cocoapods', '1.9.1'
gem 'cocoapods-pod-merge', :path => '../'
17 changes: 12 additions & 5 deletions PodMergeExample/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ GEM
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.8.1)
cocoapods (1.9.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.8.1)
cocoapods-core (= 1.9.1)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -35,13 +35,15 @@ GEM
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.11.1, < 2.0)
cocoapods-core (1.8.1)
xcodeproj (>= 1.14.0, < 2.0)
cocoapods-core (1.9.1)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.3.0)
cocoapods-plugins (1.0.0)
Expand All @@ -55,6 +57,9 @@ GEM
colored2 (3.1.2)
concurrent-ruby (1.1.6)
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.12.2)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
Expand All @@ -69,6 +74,8 @@ GEM
netrc (0.11.0)
ruby-macho (1.4.0)
thread_safe (0.3.6)
typhoeus (1.3.1)
ethon (>= 0.9.0)
tzinfo (1.2.6)
thread_safe (~> 0.1)
xcodeproj (1.15.0)
Expand All @@ -82,7 +89,7 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (= 1.8.1)
cocoapods (= 1.9.1)
cocoapods-pod-merge!

BUNDLED WITH
Expand Down
2 changes: 1 addition & 1 deletion cocoapods-pod-merge.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ Gem::Specification.new do |spec|

spec.required_ruby_version = '>= 2.0.0'
spec.add_development_dependency 'bundler', '~> 1.3'
spec.add_development_dependency 'rake', '~> 10.0'
spec.add_development_dependency 'rake', '~> 13.0'
end

0 comments on commit ba395d8

Please sign in to comment.