ty-cocoapods-packager 1.5.6 → 1.5.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +50 -36
- data/cocoapods-packager.gemspec +1 -1
- data/lib/cocoapods-packager/builder.rb +2 -1
- data/lib/cocoapods-packager/pod_utils.rb +46 -32
- data/lib/cocoapods-packager/symbols.rb +1 -1
- data/lib/cocoapods_packager.rb +1 -1
- data/lib/pod/command/package.rb +2 -2
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 397e9f389ee85263d0a24fce9c0d7011d1b302ebdc382a39d356449b170c4033
|
4
|
+
data.tar.gz: 8fa7bc48959f55be521baaa2cea235dc06207c3b87999a8530aa191452775b67
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f8063d380c6d2f4a6cac2f93684c9a048063f3ad5ce3a4408681c77f76794cca30871dbec92d2a96157f702ef054b900970696b662f93982cbcfda96134dcc21
|
7
|
+
data.tar.gz: b4d6a45f41b915b298cb775447ee66dd1471c03e87258c08b4867b76210ff9e628a187bed1b335f88eb97d1132290ecbce5d3dc49958a7808fac20d454081893
|
data/Gemfile.lock
CHANGED
@@ -1,54 +1,62 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
cocoapods-packager (1.5.
|
5
|
-
cocoapods (>= 1.
|
4
|
+
cocoapods-packager (1.5.6)
|
5
|
+
cocoapods (>= 1.7.3, < 2.0)
|
6
6
|
|
7
7
|
GEM
|
8
8
|
remote: https://rubygems.org/
|
9
9
|
specs:
|
10
|
-
|
10
|
+
CFPropertyList (3.0.2)
|
11
|
+
activesupport (4.2.11.1)
|
11
12
|
i18n (~> 0.7)
|
12
|
-
json (~> 1.7, >= 1.7.7)
|
13
13
|
minitest (~> 5.1)
|
14
14
|
thread_safe (~> 0.3, >= 0.3.4)
|
15
15
|
tzinfo (~> 1.1)
|
16
|
+
algoliasearch (1.27.1)
|
17
|
+
httpclient (~> 2.8, >= 2.8.3)
|
18
|
+
json (>= 1.5.1)
|
16
19
|
ast (2.3.0)
|
20
|
+
atomos (0.1.3)
|
17
21
|
bacon (1.2.0)
|
18
|
-
claide (1.0.
|
19
|
-
cocoapods (1.
|
22
|
+
claide (1.0.3)
|
23
|
+
cocoapods (1.8.4)
|
20
24
|
activesupport (>= 4.0.2, < 5)
|
21
|
-
claide (>= 1.0.
|
22
|
-
cocoapods-core (= 1.
|
23
|
-
cocoapods-deintegrate (>= 1.0.
|
24
|
-
cocoapods-downloader (>= 1.
|
25
|
+
claide (>= 1.0.2, < 2.0)
|
26
|
+
cocoapods-core (= 1.8.4)
|
27
|
+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
|
28
|
+
cocoapods-downloader (>= 1.2.2, < 2.0)
|
25
29
|
cocoapods-plugins (>= 1.0.0, < 2.0)
|
26
30
|
cocoapods-search (>= 1.0.0, < 2.0)
|
27
31
|
cocoapods-stats (>= 1.0.0, < 2.0)
|
28
|
-
cocoapods-trunk (>= 1.
|
32
|
+
cocoapods-trunk (>= 1.4.0, < 2.0)
|
29
33
|
cocoapods-try (>= 1.1.0, < 2.0)
|
30
|
-
|
34
|
+
colored2 (~> 3.1)
|
31
35
|
escape (~> 0.0.4)
|
32
|
-
fourflusher (
|
36
|
+
fourflusher (>= 2.3.0, < 3.0)
|
33
37
|
gh_inspector (~> 1.0)
|
34
|
-
molinillo (~> 0.
|
38
|
+
molinillo (~> 0.6.6)
|
35
39
|
nap (~> 1.0)
|
36
|
-
|
37
|
-
|
38
|
-
|
40
|
+
ruby-macho (~> 1.4)
|
41
|
+
xcodeproj (>= 1.11.1, < 2.0)
|
42
|
+
cocoapods-core (1.8.4)
|
43
|
+
activesupport (>= 4.0.2, < 6)
|
44
|
+
algoliasearch (~> 1.0)
|
45
|
+
concurrent-ruby (~> 1.1)
|
39
46
|
fuzzy_match (~> 2.0.4)
|
40
47
|
nap (~> 1.0)
|
41
|
-
cocoapods-deintegrate (1.0.
|
42
|
-
cocoapods-downloader (1.
|
48
|
+
cocoapods-deintegrate (1.0.4)
|
49
|
+
cocoapods-downloader (1.3.0)
|
43
50
|
cocoapods-plugins (1.0.0)
|
44
51
|
nap
|
45
52
|
cocoapods-search (1.0.0)
|
46
|
-
cocoapods-stats (1.
|
47
|
-
cocoapods-trunk (1.
|
53
|
+
cocoapods-stats (1.1.0)
|
54
|
+
cocoapods-trunk (1.4.1)
|
48
55
|
nap (>= 0.8, < 2.0)
|
49
|
-
netrc (
|
56
|
+
netrc (~> 0.11)
|
50
57
|
cocoapods-try (1.1.0)
|
51
|
-
|
58
|
+
colored2 (3.1.2)
|
59
|
+
concurrent-ruby (1.1.5)
|
52
60
|
coveralls (0.8.14)
|
53
61
|
json (>= 1.8, < 3)
|
54
62
|
simplecov (~> 0.12.0)
|
@@ -57,20 +65,23 @@ GEM
|
|
57
65
|
tins (~> 1.6.0)
|
58
66
|
docile (1.1.5)
|
59
67
|
escape (0.0.4)
|
60
|
-
fourflusher (2.
|
68
|
+
fourflusher (2.3.1)
|
61
69
|
fuzzy_match (2.0.4)
|
62
|
-
gh_inspector (1.
|
63
|
-
|
70
|
+
gh_inspector (1.1.3)
|
71
|
+
httpclient (2.8.3)
|
72
|
+
i18n (0.9.5)
|
73
|
+
concurrent-ruby (~> 1.0)
|
64
74
|
json (1.8.3)
|
65
75
|
metaclass (0.0.4)
|
66
|
-
minitest (5.
|
76
|
+
minitest (5.13.0)
|
67
77
|
mocha (0.11.4)
|
68
78
|
metaclass (~> 0.0.1)
|
69
79
|
mocha-on-bacon (0.2.1)
|
70
80
|
mocha (>= 0.9.8)
|
71
|
-
molinillo (0.
|
81
|
+
molinillo (0.6.6)
|
82
|
+
nanaimo (0.2.6)
|
72
83
|
nap (1.1.0)
|
73
|
-
netrc (0.
|
84
|
+
netrc (0.11.0)
|
74
85
|
parser (2.3.1.2)
|
75
86
|
ast (~> 2.2)
|
76
87
|
powerpack (0.1.1)
|
@@ -84,6 +95,7 @@ GEM
|
|
84
95
|
rainbow (>= 1.99.1, < 3.0)
|
85
96
|
ruby-progressbar (~> 1.7)
|
86
97
|
unicode-display_width (~> 1.0, >= 1.0.1)
|
98
|
+
ruby-macho (1.4.0)
|
87
99
|
ruby-progressbar (1.8.1)
|
88
100
|
simplecov (0.12.0)
|
89
101
|
docile (~> 1.1.0)
|
@@ -93,15 +105,17 @@ GEM
|
|
93
105
|
term-ansicolor (1.3.2)
|
94
106
|
tins (~> 1.0)
|
95
107
|
thor (0.19.1)
|
96
|
-
thread_safe (0.3.
|
108
|
+
thread_safe (0.3.6)
|
97
109
|
tins (1.6.0)
|
98
|
-
tzinfo (1.2.
|
110
|
+
tzinfo (1.2.5)
|
99
111
|
thread_safe (~> 0.1)
|
100
112
|
unicode-display_width (1.1.0)
|
101
|
-
xcodeproj (1.
|
102
|
-
|
103
|
-
|
104
|
-
|
113
|
+
xcodeproj (1.13.0)
|
114
|
+
CFPropertyList (>= 2.3.3, < 4.0)
|
115
|
+
atomos (~> 0.1.3)
|
116
|
+
claide (>= 1.0.2, < 2.0)
|
117
|
+
colored2 (~> 3.1)
|
118
|
+
nanaimo (~> 0.2.6)
|
105
119
|
|
106
120
|
PLATFORMS
|
107
121
|
ruby
|
@@ -118,4 +132,4 @@ DEPENDENCIES
|
|
118
132
|
rubocop
|
119
133
|
|
120
134
|
BUNDLED WITH
|
121
|
-
1.
|
135
|
+
1.17.3
|
data/cocoapods-packager.gemspec
CHANGED
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
|
|
15
15
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
16
16
|
spec.require_paths = ["lib"]
|
17
17
|
|
18
|
-
spec.add_dependency "cocoapods", '>= 1.
|
18
|
+
spec.add_dependency "cocoapods", '>= 1.7.3', '< 2.0'
|
19
19
|
|
20
20
|
spec.add_development_dependency "bundler", "~> 1.3"
|
21
21
|
spec.add_development_dependency "rake"
|
@@ -15,6 +15,8 @@ module Pod
|
|
15
15
|
end
|
16
16
|
|
17
17
|
def build(platform, library)
|
18
|
+
UI.puts `xcrun xcodebuild -version`
|
19
|
+
|
18
20
|
if library
|
19
21
|
build_static_library(platform)
|
20
22
|
else
|
@@ -315,7 +317,6 @@ MAP
|
|
315
317
|
args = "#{args} CODE_SIGN_IDENTITY=\"\" CODE_SIGNING_REQUIRED=NO"
|
316
318
|
end
|
317
319
|
|
318
|
-
UI.puts 'xcrun xcodebuild -version'
|
319
320
|
command = "xcrun xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{config} -target #{target} -project #{project_root}/Pods.xcodeproj 2>&1"
|
320
321
|
output = `#{command}`.lines.to_a
|
321
322
|
|
@@ -100,9 +100,12 @@ module Pod
|
|
100
100
|
end
|
101
101
|
|
102
102
|
def spec_with_path(path)
|
103
|
-
return if path.nil?
|
103
|
+
return if path.nil?
|
104
|
+
path = Pathname.new(path)
|
105
|
+
path = Pathname.new(Dir.pwd).join(path) unless path.absolute?
|
106
|
+
return unless path.exist?
|
104
107
|
|
105
|
-
@path = path
|
108
|
+
@path = path.expand_path
|
106
109
|
|
107
110
|
if Pathname.new(path).directory?
|
108
111
|
help! path + ': is a directory.'
|
@@ -128,9 +131,17 @@ module Pod
|
|
128
131
|
dynamic_sandbox
|
129
132
|
end
|
130
133
|
|
131
|
-
|
134
|
+
# @param [Pod::Sandbox] dynamic_sandbox
|
135
|
+
#
|
136
|
+
# @param [Pod::Sandbox] static_sandbox
|
137
|
+
#
|
138
|
+
# @param [Pod::Installer] static_installer
|
139
|
+
#
|
140
|
+
# @param [Pod::Platform] platform
|
141
|
+
#
|
142
|
+
def install_dynamic_pod(dynamic_sandbox, static_sandbox, static_installer, platform)
|
132
143
|
# 1 Create a dynamic target for only the spec pod.
|
133
|
-
dynamic_target = build_dynamic_target(dynamic_sandbox, static_installer)
|
144
|
+
dynamic_target = build_dynamic_target(dynamic_sandbox, static_installer, platform)
|
134
145
|
|
135
146
|
# 2. Build a new xcodeproj in the dynamic_sandbox with only the spec pod as a target.
|
136
147
|
project = prepare_pods_project(dynamic_sandbox, dynamic_target.name, static_installer)
|
@@ -141,31 +152,40 @@ module Pod
|
|
141
152
|
# 4. Copy the supporting files for the dynamic framework from the static sandbox.
|
142
153
|
copy_dynamic_supporting_files(static_sandbox, dynamic_target, dynamic_sandbox)
|
143
154
|
|
144
|
-
# 5. Update the file accecssors.
|
145
|
-
dynamic_target = update_file_accessors(dynamic_target, dynamic_sandbox)
|
146
|
-
|
147
155
|
# 6. Create the file references.
|
148
156
|
install_file_references(dynamic_sandbox, [dynamic_target], project)
|
149
157
|
|
150
158
|
# 7. Install the target.
|
151
|
-
install_library(dynamic_sandbox, dynamic_target)
|
159
|
+
install_library(dynamic_sandbox, dynamic_target, project)
|
152
160
|
|
153
161
|
# 9. Write the actual Xcodeproject to the dynamic sandbox.
|
154
162
|
write_pod_project(project, dynamic_sandbox)
|
155
163
|
end
|
156
164
|
|
157
|
-
|
165
|
+
# @param [Pod::Installer] static_installer
|
166
|
+
#
|
167
|
+
# @return [Pod::PodTarget]
|
168
|
+
#
|
169
|
+
def build_dynamic_target(dynamic_sandbox, static_installer, platform)
|
158
170
|
spec_targets = static_installer.pod_targets.select do |target|
|
159
171
|
target.name == @spec.name
|
160
172
|
end
|
161
173
|
static_target = spec_targets[0]
|
162
174
|
|
163
|
-
|
164
|
-
|
165
|
-
|
175
|
+
file_accessors = create_file_accessors(static_target, dynamic_sandbox)
|
176
|
+
|
177
|
+
archs = []
|
178
|
+
|
179
|
+
dynamic_target = Pod::PodTarget.new(dynamic_sandbox, true, static_target.user_build_configurations, archs, platform, static_target.specs, static_target.target_definitions, file_accessors)
|
166
180
|
dynamic_target
|
167
181
|
end
|
168
182
|
|
183
|
+
# @param [Pod::Sandbox] dynamic_sandbox
|
184
|
+
#
|
185
|
+
# @param [String] spec_name
|
186
|
+
#
|
187
|
+
# @param [Pod::Installer] installer
|
188
|
+
#
|
169
189
|
def prepare_pods_project(dynamic_sandbox, spec_name, installer)
|
170
190
|
# Create a new pods project
|
171
191
|
pods_project = Pod::Project.new(dynamic_sandbox.project_path)
|
@@ -181,7 +201,6 @@ module Pod
|
|
181
201
|
was_absolute = dynamic_sandbox.local_path_was_absolute?(spec_name)
|
182
202
|
pods_project.add_pod_group(spec_name, path, local, was_absolute)
|
183
203
|
|
184
|
-
dynamic_sandbox.project = pods_project
|
185
204
|
pods_project
|
186
205
|
end
|
187
206
|
|
@@ -195,16 +214,13 @@ module Pod
|
|
195
214
|
support_dir.mkdir
|
196
215
|
end
|
197
216
|
|
198
|
-
def
|
199
|
-
pod_root = dynamic_sandbox.pod_dir(
|
217
|
+
def create_file_accessors(target, dynamic_sandbox)
|
218
|
+
pod_root = dynamic_sandbox.pod_dir(target.root_spec.name)
|
200
219
|
|
201
220
|
path_list = Sandbox::PathList.new(pod_root)
|
202
|
-
|
203
|
-
Sandbox::FileAccessor.new(path_list, spec.consumer(
|
221
|
+
target.specs.map do |spec|
|
222
|
+
Sandbox::FileAccessor.new(path_list, spec.consumer(target.platform))
|
204
223
|
end
|
205
|
-
|
206
|
-
dynamic_target.file_accessors = file_accessors
|
207
|
-
dynamic_target
|
208
224
|
end
|
209
225
|
|
210
226
|
def install_file_references(dynamic_sandbox, pod_targets, pods_project)
|
@@ -212,22 +228,20 @@ module Pod
|
|
212
228
|
installer.install!
|
213
229
|
end
|
214
230
|
|
215
|
-
def install_library(dynamic_sandbox, dynamic_target)
|
231
|
+
def install_library(dynamic_sandbox, dynamic_target, project)
|
216
232
|
return if dynamic_target.target_definitions.flat_map(&:dependencies).empty?
|
217
|
-
target_installer = Pod::Installer::Xcode::PodsProjectGenerator::PodTargetInstaller.new(dynamic_sandbox, dynamic_target)
|
218
|
-
target_installer.install!
|
233
|
+
target_installer = Pod::Installer::Xcode::PodsProjectGenerator::PodTargetInstaller.new(dynamic_sandbox, project, dynamic_target)
|
234
|
+
result = target_installer.install!
|
235
|
+
native_target = result.native_target
|
219
236
|
|
220
237
|
# Installs System Frameworks
|
221
|
-
dynamic_target.
|
222
|
-
|
223
|
-
|
224
|
-
|
238
|
+
if dynamic_target.should_build?
|
239
|
+
dynamic_target.file_accessors.each do |file_accessor|
|
240
|
+
file_accessor.spec_consumer.frameworks.each do |framework|
|
241
|
+
native_target.add_system_framework(framework)
|
225
242
|
end
|
226
|
-
|
227
|
-
|
228
|
-
file_accessor.spec_consumer.libraries.each do |library|
|
229
|
-
if dynamic_target.should_build?
|
230
|
-
dynamic_target.native_target.add_system_library(library)
|
243
|
+
file_accessor.spec_consumer.libraries.each do |library|
|
244
|
+
native_target.add_system_library(library)
|
231
245
|
end
|
232
246
|
end
|
233
247
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
module Symbols
|
2
2
|
def symbols_from_library(library)
|
3
|
-
syms = `nm -
|
3
|
+
syms = `nm -defined-only -extern-only #{library}`.split("\n")
|
4
4
|
result = classes_from_symbols(syms)
|
5
5
|
result += constants_from_symbols(syms)
|
6
6
|
result += variables_from_symbols(syms)
|
data/lib/cocoapods_packager.rb
CHANGED
data/lib/pod/command/package.rb
CHANGED
@@ -57,7 +57,7 @@ module Pod
|
|
57
57
|
|
58
58
|
def run
|
59
59
|
if @path.nil? || @spec.nil?
|
60
|
-
help!
|
60
|
+
help! "Unable to find a podspec with path or name `#{@name}`."
|
61
61
|
return
|
62
62
|
end
|
63
63
|
|
@@ -80,7 +80,7 @@ module Pod
|
|
80
80
|
|
81
81
|
if @dynamic
|
82
82
|
dynamic_sandbox = build_dynamic_sandbox(static_sandbox, static_installer)
|
83
|
-
install_dynamic_pod(dynamic_sandbox, static_sandbox, static_installer)
|
83
|
+
install_dynamic_pod(dynamic_sandbox, static_sandbox, static_installer, platform)
|
84
84
|
end
|
85
85
|
|
86
86
|
begin
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ty-cocoapods-packager
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.5.
|
4
|
+
version: 1.5.7
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kyle Fuller
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2019-
|
12
|
+
date: 2019-12-07 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: cocoapods
|
@@ -17,7 +17,7 @@ dependencies:
|
|
17
17
|
requirements:
|
18
18
|
- - ">="
|
19
19
|
- !ruby/object:Gem::Version
|
20
|
-
version: 1.
|
20
|
+
version: 1.7.3
|
21
21
|
- - "<"
|
22
22
|
- !ruby/object:Gem::Version
|
23
23
|
version: '2.0'
|
@@ -27,7 +27,7 @@ dependencies:
|
|
27
27
|
requirements:
|
28
28
|
- - ">="
|
29
29
|
- !ruby/object:Gem::Version
|
30
|
-
version: 1.
|
30
|
+
version: 1.7.3
|
31
31
|
- - "<"
|
32
32
|
- !ruby/object:Gem::Version
|
33
33
|
version: '2.0'
|