Skip to content

Commit ba395d8

Browse files
author
Siddharth Gupta
committed
Test With Cocoapods 1.9.1
1 parent efd8b69 commit ba395d8

File tree

5 files changed

+29
-15
lines changed

5 files changed

+29
-15
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
44
gemspec
55

66
group :development do
7-
gem 'cocoapods', '1.8.1'
7+
gem 'cocoapods', '1.9.1'
88

99
gem 'mocha'
1010
gem 'bacon'

Gemfile.lock

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ GEM
1818
atomos (0.1.3)
1919
bacon (1.2.0)
2020
claide (1.0.3)
21-
cocoapods (1.8.1)
21+
cocoapods (1.9.1)
2222
activesupport (>= 4.0.2, < 5)
2323
claide (>= 1.0.2, < 2.0)
24-
cocoapods-core (= 1.8.1)
24+
cocoapods-core (= 1.9.1)
2525
cocoapods-deintegrate (>= 1.0.3, < 2.0)
2626
cocoapods-downloader (>= 1.2.2, < 2.0)
2727
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -36,13 +36,15 @@ GEM
3636
molinillo (~> 0.6.6)
3737
nap (~> 1.0)
3838
ruby-macho (~> 1.4)
39-
xcodeproj (>= 1.11.1, < 2.0)
40-
cocoapods-core (1.8.1)
39+
xcodeproj (>= 1.14.0, < 2.0)
40+
cocoapods-core (1.9.1)
4141
activesupport (>= 4.0.2, < 6)
4242
algoliasearch (~> 1.0)
4343
concurrent-ruby (~> 1.1)
4444
fuzzy_match (~> 2.0.4)
4545
nap (~> 1.0)
46+
netrc (~> 0.11)
47+
typhoeus (~> 1.0)
4648
cocoapods-deintegrate (1.0.4)
4749
cocoapods-downloader (1.3.0)
4850
cocoapods-plugins (1.0.0)
@@ -56,6 +58,9 @@ GEM
5658
colored2 (3.1.2)
5759
concurrent-ruby (1.1.6)
5860
escape (0.0.4)
61+
ethon (0.12.0)
62+
ffi (>= 1.3.0)
63+
ffi (1.12.2)
5964
fourflusher (2.3.1)
6065
fuzzy_match (2.0.4)
6166
gh_inspector (1.1.3)
@@ -73,9 +78,11 @@ GEM
7378
netrc (0.11.0)
7479
prettybacon (0.0.2)
7580
bacon (~> 1.2)
76-
rake (10.5.0)
81+
rake (13.0.1)
7782
ruby-macho (1.4.0)
7883
thread_safe (0.3.6)
84+
typhoeus (1.3.1)
85+
ethon (>= 0.9.0)
7986
tzinfo (1.2.6)
8087
thread_safe (~> 0.1)
8188
xcodeproj (1.15.0)
@@ -91,12 +98,12 @@ PLATFORMS
9198
DEPENDENCIES
9299
bacon
93100
bundler (~> 1.3)
94-
cocoapods (= 1.8.1)
101+
cocoapods (= 1.9.1)
95102
cocoapods-pod-merge!
96103
mocha
97104
mocha-on-bacon
98105
prettybacon
99-
rake (~> 10.0)
106+
rake (~> 13.0)
100107

101108
BUNDLED WITH
102109
1.17.3

PodMergeExample/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ source "https://rubygems.org"
44

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

7-
gem 'cocoapods', '1.8.1'
7+
gem 'cocoapods', '1.9.1'
88
gem 'cocoapods-pod-merge', :path => '../'

PodMergeExample/Gemfile.lock

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ GEM
1717
json (>= 1.5.1)
1818
atomos (0.1.3)
1919
claide (1.0.3)
20-
cocoapods (1.8.1)
20+
cocoapods (1.9.1)
2121
activesupport (>= 4.0.2, < 5)
2222
claide (>= 1.0.2, < 2.0)
23-
cocoapods-core (= 1.8.1)
23+
cocoapods-core (= 1.9.1)
2424
cocoapods-deintegrate (>= 1.0.3, < 2.0)
2525
cocoapods-downloader (>= 1.2.2, < 2.0)
2626
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -35,13 +35,15 @@ GEM
3535
molinillo (~> 0.6.6)
3636
nap (~> 1.0)
3737
ruby-macho (~> 1.4)
38-
xcodeproj (>= 1.11.1, < 2.0)
39-
cocoapods-core (1.8.1)
38+
xcodeproj (>= 1.14.0, < 2.0)
39+
cocoapods-core (1.9.1)
4040
activesupport (>= 4.0.2, < 6)
4141
algoliasearch (~> 1.0)
4242
concurrent-ruby (~> 1.1)
4343
fuzzy_match (~> 2.0.4)
4444
nap (~> 1.0)
45+
netrc (~> 0.11)
46+
typhoeus (~> 1.0)
4547
cocoapods-deintegrate (1.0.4)
4648
cocoapods-downloader (1.3.0)
4749
cocoapods-plugins (1.0.0)
@@ -55,6 +57,9 @@ GEM
5557
colored2 (3.1.2)
5658
concurrent-ruby (1.1.6)
5759
escape (0.0.4)
60+
ethon (0.12.0)
61+
ffi (>= 1.3.0)
62+
ffi (1.12.2)
5863
fourflusher (2.3.1)
5964
fuzzy_match (2.0.4)
6065
gh_inspector (1.1.3)
@@ -69,6 +74,8 @@ GEM
6974
netrc (0.11.0)
7075
ruby-macho (1.4.0)
7176
thread_safe (0.3.6)
77+
typhoeus (1.3.1)
78+
ethon (>= 0.9.0)
7279
tzinfo (1.2.6)
7380
thread_safe (~> 0.1)
7481
xcodeproj (1.15.0)
@@ -82,7 +89,7 @@ PLATFORMS
8289
ruby
8390

8491
DEPENDENCIES
85-
cocoapods (= 1.8.1)
92+
cocoapods (= 1.9.1)
8693
cocoapods-pod-merge!
8794

8895
BUNDLED WITH

cocoapods-pod-merge.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
2222

2323
spec.required_ruby_version = '>= 2.0.0'
2424
spec.add_development_dependency 'bundler', '~> 1.3'
25-
spec.add_development_dependency 'rake', '~> 10.0'
25+
spec.add_development_dependency 'rake', '~> 13.0'
2626
end

0 commit comments

Comments
 (0)