Skip to content

Commit b9e8b6e

Browse files
dnkoutsosegiddins
authored andcommitted
Update API call to work with 1.7.0 release of CocoaPods (#11)
1 parent 90f160e commit b9e8b6e

File tree

5 files changed

+66
-42
lines changed

5 files changed

+66
-42
lines changed

.rubocop_todo.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2018-03-29 14:25:48 -0400 using RuboCop version 0.49.1.
3+
# on 2019-01-14 12:55:11 -0800 using RuboCop version 0.49.1.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
@@ -24,21 +24,21 @@ Lint/AssignmentInCondition:
2424
Metrics/AbcSize:
2525
Max: 24
2626

27-
# Offense count: 5
27+
# Offense count: 6
2828
# Configuration parameters: CountComments, ExcludedMethods.
2929
Metrics/BlockLength:
3030
Max: 89
3131

32-
# Offense count: 16
32+
# Offense count: 17
3333
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
3434
# URISchemes: http, https
3535
Metrics/LineLength:
36-
Max: 205
36+
Max: 203
3737

3838
# Offense count: 1
3939
# Configuration parameters: CountComments.
4040
Metrics/MethodLength:
41-
Max: 30
41+
Max: 31
4242

4343
# Offense count: 6
4444
Style/Documentation:

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ branches:
33
- master
44

55
before_script:
6-
- gem install bundler
6+
- gem install bundler -v "~> 1.17"
77

88
language: ruby
99
cache: bundler

Gemfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@ source 'https://rubygems.org'
55
# Specify your gem's dependencies in cocoapods-amicable.gemspec
66
gemspec
77

8+
def cocoapods_gem(name, gem_name = name.downcase, **opts)
9+
gem gem_name, git: "https://github.com/CocoaPods/#{name}", **opts
10+
end
11+
812
group :development do
9-
gem 'cocoapods'
13+
cocoapods_gem 'CocoaPods'
14+
cocoapods_gem 'Core', 'cocoapods-core'
15+
cocoapods_gem 'Xcodeproj'
1016

1117
gem 'rspec'
1218
gem 'rubocop', '<=0.50'

Gemfile.lock

Lines changed: 51 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,47 @@
1+
GIT
2+
remote: https://github.com/CocoaPods/CocoaPods
3+
revision: 45376ff5a5926a1885adef0fe1c00b9c680c2ecc
4+
specs:
5+
cocoapods (1.6.0.beta.2)
6+
activesupport (>= 4.0.2, < 5)
7+
claide (>= 1.0.2, < 2.0)
8+
cocoapods-core (= 1.6.0.beta.2)
9+
cocoapods-deintegrate (>= 1.0.2, < 2.0)
10+
cocoapods-downloader (>= 1.2.2, < 2.0)
11+
cocoapods-plugins (>= 1.0.0, < 2.0)
12+
cocoapods-search (>= 1.0.0, < 2.0)
13+
cocoapods-stats (>= 1.0.0, < 2.0)
14+
cocoapods-trunk (>= 1.3.1, < 2.0)
15+
cocoapods-try (>= 1.1.0, < 2.0)
16+
colored2 (~> 3.1)
17+
escape (~> 0.0.4)
18+
fourflusher (~> 2.1.0)
19+
gh_inspector (~> 1.0)
20+
molinillo (~> 0.6.6)
21+
nap (~> 1.0)
22+
ruby-macho (~> 1.3, >= 1.3.1)
23+
xcodeproj (>= 1.7.0, < 2.0)
24+
25+
GIT
26+
remote: https://github.com/CocoaPods/Core
27+
revision: 2972985a194494e0f779a9e498f2cc4d3e4375c8
28+
specs:
29+
cocoapods-core (1.6.0.beta.2)
30+
activesupport (>= 4.0.2, < 6)
31+
fuzzy_match (~> 2.0.4)
32+
nap (~> 1.0)
33+
34+
GIT
35+
remote: https://github.com/CocoaPods/Xcodeproj
36+
revision: 4ee4a1af41000cdf0765dd83b7591c95350d015a
37+
specs:
38+
xcodeproj (1.7.0)
39+
CFPropertyList (>= 2.3.3, < 4.0)
40+
atomos (~> 0.1.3)
41+
claide (>= 1.0.2, < 2.0)
42+
colored2 (~> 3.1)
43+
nanaimo (~> 0.2.6)
44+
145
PATH
246
remote: .
347
specs:
@@ -7,39 +51,16 @@ GEM
751
remote: https://rubygems.org/
852
specs:
953
CFPropertyList (3.0.0)
10-
activesupport (4.2.10)
54+
activesupport (4.2.11)
1155
i18n (~> 0.7)
1256
minitest (~> 5.1)
1357
thread_safe (~> 0.3, >= 0.3.4)
1458
tzinfo (~> 1.1)
1559
ast (2.4.0)
1660
atomos (0.1.3)
1761
claide (1.0.2)
18-
cocoapods (1.5.3)
19-
activesupport (>= 4.0.2, < 5)
20-
claide (>= 1.0.2, < 2.0)
21-
cocoapods-core (= 1.5.3)
22-
cocoapods-deintegrate (>= 1.0.2, < 2.0)
23-
cocoapods-downloader (>= 1.2.0, < 2.0)
24-
cocoapods-plugins (>= 1.0.0, < 2.0)
25-
cocoapods-search (>= 1.0.0, < 2.0)
26-
cocoapods-stats (>= 1.0.0, < 2.0)
27-
cocoapods-trunk (>= 1.3.0, < 2.0)
28-
cocoapods-try (>= 1.1.0, < 2.0)
29-
colored2 (~> 3.1)
30-
escape (~> 0.0.4)
31-
fourflusher (~> 2.0.1)
32-
gh_inspector (~> 1.0)
33-
molinillo (~> 0.6.5)
34-
nap (~> 1.0)
35-
ruby-macho (~> 1.1)
36-
xcodeproj (>= 1.5.7, < 2.0)
37-
cocoapods-core (1.5.3)
38-
activesupport (>= 4.0.2, < 6)
39-
fuzzy_match (~> 2.0.4)
40-
nap (~> 1.0)
4162
cocoapods-deintegrate (1.0.2)
42-
cocoapods-downloader (1.2.1)
63+
cocoapods-downloader (1.2.2)
4364
cocoapods-plugins (1.0.0)
4465
nap
4566
cocoapods-search (1.0.0)
@@ -49,10 +70,10 @@ GEM
4970
netrc (~> 0.11)
5071
cocoapods-try (1.1.0)
5172
colored2 (3.1.2)
52-
concurrent-ruby (1.0.5)
73+
concurrent-ruby (1.1.4)
5374
diff-lcs (1.3)
5475
escape (0.0.4)
55-
fourflusher (2.0.1)
76+
fourflusher (2.1.0)
5677
fuzzy_match (2.0.4)
5778
gh_inspector (1.1.3)
5879
i18n (0.9.5)
@@ -95,23 +116,19 @@ GEM
95116
tzinfo (1.2.5)
96117
thread_safe (~> 0.1)
97118
unicode-display_width (1.3.0)
98-
xcodeproj (1.6.0)
99-
CFPropertyList (>= 2.3.3, < 4.0)
100-
atomos (~> 0.1.3)
101-
claide (>= 1.0.2, < 2.0)
102-
colored2 (~> 3.1)
103-
nanaimo (~> 0.2.6)
104119

105120
PLATFORMS
106121
ruby
107122

108123
DEPENDENCIES
109124
bundler (~> 1.16)
110-
cocoapods
125+
cocoapods!
111126
cocoapods-amicable!
127+
cocoapods-core!
112128
rake (~> 12.3)
113129
rspec
114130
rubocop (<= 0.50)
131+
xcodeproj!
115132

116133
BUNDLED WITH
117134
1.16.1

lib/cocoapods_amicable.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ def add_check_manifest_lock_script_phase
88

99
phase_name = Pod::Installer::UserProjectIntegrator::TargetIntegrator::CHECK_MANIFEST_PHASE_NAME
1010
native_targets.each do |native_target|
11-
phase = Pod::Installer::UserProjectIntegrator::TargetIntegrator.create_or_update_build_phase(native_target, Pod::Installer::UserProjectIntegrator::TargetIntegrator::BUILD_PHASE_PREFIX + phase_name)
11+
phase = Pod::Installer::UserProjectIntegrator::TargetIntegrator.create_or_update_shell_script_build_phase(native_target,
12+
Pod::Installer::UserProjectIntegrator::TargetIntegrator::BUILD_PHASE_PREFIX + phase_name)
1213
native_target.build_phases.unshift(phase).uniq! unless native_target.build_phases.first == phase
1314

1415
phase.shell_script = <<-SH

0 commit comments

Comments
 (0)