cocoapods 1.4.0.beta.1 → 1.4.0.beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +81 -2
- data/lib/cocoapods.rb +1 -0
- data/lib/cocoapods/gem_version.rb +1 -1
- data/lib/cocoapods/generator/app_target_helper.rb +227 -0
- data/lib/cocoapods/generator/embed_frameworks_script.rb +9 -0
- data/lib/cocoapods/generator/info_plist_file.rb +13 -22
- data/lib/cocoapods/generator/xcconfig/pod_xcconfig.rb +1 -0
- data/lib/cocoapods/generator/xcconfig/xcconfig_helper.rb +49 -32
- data/lib/cocoapods/installer.rb +20 -14
- data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb +46 -32
- data/lib/cocoapods/installer/xcode/pods_project_generator.rb +20 -12
- data/lib/cocoapods/installer/xcode/pods_project_generator/aggregate_target_installer.rb +1 -1
- data/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb +88 -11
- data/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_integrator.rb +101 -0
- data/lib/cocoapods/installer/xcode/pods_project_generator/target_installer.rb +17 -3
- data/lib/cocoapods/target.rb +9 -7
- data/lib/cocoapods/target/aggregate_target.rb +1 -1
- data/lib/cocoapods/target/pod_target.rb +103 -43
- data/lib/cocoapods/validator.rb +25 -66
- metadata +10 -9
- data/lib/cocoapods/installer/pods_project_integrator/pod_target_integrator.rb +0 -85
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cocoapods
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.4.0.beta.
|
4
|
+
version: 1.4.0.beta.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Eloy Duran
|
@@ -11,7 +11,7 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date: 2017-
|
14
|
+
date: 2017-10-24 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: cocoapods-core
|
@@ -19,14 +19,14 @@ dependencies:
|
|
19
19
|
requirements:
|
20
20
|
- - '='
|
21
21
|
- !ruby/object:Gem::Version
|
22
|
-
version: 1.4.0.beta.
|
22
|
+
version: 1.4.0.beta.2
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
26
26
|
requirements:
|
27
27
|
- - '='
|
28
28
|
- !ruby/object:Gem::Version
|
29
|
-
version: 1.4.0.beta.
|
29
|
+
version: 1.4.0.beta.2
|
30
30
|
- !ruby/object:Gem::Dependency
|
31
31
|
name: claide
|
32
32
|
requirement: !ruby/object:Gem::Requirement
|
@@ -153,7 +153,7 @@ dependencies:
|
|
153
153
|
requirements:
|
154
154
|
- - ">="
|
155
155
|
- !ruby/object:Gem::Version
|
156
|
-
version: 1.
|
156
|
+
version: 1.3.0
|
157
157
|
- - "<"
|
158
158
|
- !ruby/object:Gem::Version
|
159
159
|
version: '2.0'
|
@@ -163,7 +163,7 @@ dependencies:
|
|
163
163
|
requirements:
|
164
164
|
- - ">="
|
165
165
|
- !ruby/object:Gem::Version
|
166
|
-
version: 1.
|
166
|
+
version: 1.3.0
|
167
167
|
- - "<"
|
168
168
|
- !ruby/object:Gem::Version
|
169
169
|
version: '2.0'
|
@@ -207,7 +207,7 @@ dependencies:
|
|
207
207
|
requirements:
|
208
208
|
- - ">="
|
209
209
|
- !ruby/object:Gem::Version
|
210
|
-
version: 1.5.
|
210
|
+
version: 1.5.3
|
211
211
|
- - "<"
|
212
212
|
- !ruby/object:Gem::Version
|
213
213
|
version: '2.0'
|
@@ -217,7 +217,7 @@ dependencies:
|
|
217
217
|
requirements:
|
218
218
|
- - ">="
|
219
219
|
- !ruby/object:Gem::Version
|
220
|
-
version: 1.5.
|
220
|
+
version: 1.5.3
|
221
221
|
- - "<"
|
222
222
|
- !ruby/object:Gem::Version
|
223
223
|
version: '2.0'
|
@@ -443,6 +443,7 @@ files:
|
|
443
443
|
- lib/cocoapods/generator/acknowledgements.rb
|
444
444
|
- lib/cocoapods/generator/acknowledgements/markdown.rb
|
445
445
|
- lib/cocoapods/generator/acknowledgements/plist.rb
|
446
|
+
- lib/cocoapods/generator/app_target_helper.rb
|
446
447
|
- lib/cocoapods/generator/bridge_support.rb
|
447
448
|
- lib/cocoapods/generator/copy_resources_script.rb
|
448
449
|
- lib/cocoapods/generator/dummy_source.rb
|
@@ -471,7 +472,6 @@ files:
|
|
471
472
|
- lib/cocoapods/installer/pod_source_installer.rb
|
472
473
|
- lib/cocoapods/installer/pod_source_preparer.rb
|
473
474
|
- lib/cocoapods/installer/podfile_validator.rb
|
474
|
-
- lib/cocoapods/installer/pods_project_integrator/pod_target_integrator.rb
|
475
475
|
- lib/cocoapods/installer/post_install_hooks_context.rb
|
476
476
|
- lib/cocoapods/installer/pre_install_hooks_context.rb
|
477
477
|
- lib/cocoapods/installer/source_provider_hooks_context.rb
|
@@ -483,6 +483,7 @@ files:
|
|
483
483
|
- lib/cocoapods/installer/xcode/pods_project_generator/aggregate_target_installer.rb
|
484
484
|
- lib/cocoapods/installer/xcode/pods_project_generator/file_references_installer.rb
|
485
485
|
- lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
|
486
|
+
- lib/cocoapods/installer/xcode/pods_project_generator/pod_target_integrator.rb
|
486
487
|
- lib/cocoapods/installer/xcode/pods_project_generator/target_installer.rb
|
487
488
|
- lib/cocoapods/installer/xcode/target_validator.rb
|
488
489
|
- lib/cocoapods/open-uri.rb
|
@@ -1,85 +0,0 @@
|
|
1
|
-
module Pod
|
2
|
-
class Installer
|
3
|
-
# This class is responsible for integrating a pod target. This includes integrating
|
4
|
-
# the test targets included by each pod target.
|
5
|
-
#
|
6
|
-
class PodTargetIntegrator
|
7
|
-
# @return [PodTarget] the target that should be integrated.
|
8
|
-
#
|
9
|
-
attr_reader :target
|
10
|
-
|
11
|
-
# Init a new PodTargetIntegrator.
|
12
|
-
#
|
13
|
-
# @param [PodTarget] target @see #target
|
14
|
-
#
|
15
|
-
def initialize(target)
|
16
|
-
@target = target
|
17
|
-
end
|
18
|
-
|
19
|
-
# Integrates the pod target.
|
20
|
-
#
|
21
|
-
# @return [void]
|
22
|
-
#
|
23
|
-
def integrate!
|
24
|
-
UI.section(integration_message) do
|
25
|
-
target.test_native_targets.each do |native_target|
|
26
|
-
add_embed_frameworks_script_phase(native_target)
|
27
|
-
add_copy_resources_script_phase(native_target)
|
28
|
-
end
|
29
|
-
end
|
30
|
-
end
|
31
|
-
|
32
|
-
# @return [String] a string representation suitable for debugging.
|
33
|
-
#
|
34
|
-
def inspect
|
35
|
-
"#<#{self.class} for target `#{target.label}'>"
|
36
|
-
end
|
37
|
-
|
38
|
-
private
|
39
|
-
|
40
|
-
# @!group Integration steps
|
41
|
-
#---------------------------------------------------------------------#
|
42
|
-
|
43
|
-
# Find or create a 'Copy Pods Resources' build phase
|
44
|
-
#
|
45
|
-
# @return [void]
|
46
|
-
#
|
47
|
-
def add_copy_resources_script_phase(native_target)
|
48
|
-
test_type = target.test_type_for_product_type(native_target.symbol_type)
|
49
|
-
script_path = "${PODS_ROOT}/#{target.copy_resources_script_path_for_test_type(test_type).relative_path_from(target.sandbox.root)}"
|
50
|
-
resource_paths = target.all_test_dependent_targets.flat_map(&:resource_paths)
|
51
|
-
input_paths = []
|
52
|
-
output_paths = []
|
53
|
-
unless resource_paths.empty?
|
54
|
-
input_paths = [script_path, *resource_paths.flatten.uniq]
|
55
|
-
output_paths = ['${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}']
|
56
|
-
end
|
57
|
-
Pod::Installer::UserProjectIntegrator::TargetIntegrator.add_copy_resources_script_phase_to_target(native_target, script_path, input_paths, output_paths)
|
58
|
-
end
|
59
|
-
|
60
|
-
# Find or create a 'Embed Pods Frameworks' Copy Files Build Phase
|
61
|
-
#
|
62
|
-
# @return [void]
|
63
|
-
#
|
64
|
-
def add_embed_frameworks_script_phase(native_target)
|
65
|
-
test_type = target.test_type_for_product_type(native_target.symbol_type)
|
66
|
-
script_path = "${PODS_ROOT}/#{target.embed_frameworks_script_path_for_test_type(test_type).relative_path_from(target.sandbox.root)}"
|
67
|
-
framework_paths = target.all_test_dependent_targets.flat_map(&:framework_paths)
|
68
|
-
input_paths = []
|
69
|
-
output_paths = []
|
70
|
-
unless framework_paths.empty?
|
71
|
-
input_paths = [script_path, *framework_paths.map { |fw| [fw[:input_path], fw[:dsym_input_path]] }.flatten.compact]
|
72
|
-
output_paths = framework_paths.map { |fw| [fw[:output_path], fw[:dsym_output_path]] }.flatten.compact
|
73
|
-
end
|
74
|
-
Pod::Installer::UserProjectIntegrator::TargetIntegrator.add_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths, output_paths)
|
75
|
-
end
|
76
|
-
|
77
|
-
# @return [String] the message that should be displayed for the target
|
78
|
-
# integration.
|
79
|
-
#
|
80
|
-
def integration_message
|
81
|
-
"Integrating target `#{target.name}`"
|
82
|
-
end
|
83
|
-
end
|
84
|
-
end
|
85
|
-
end
|