cocoapods 1.2.0.rc.1 → 1.2.0
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
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2a57f79fc629b5289f1f038308f9c172f58b3f5b
|
4
|
+
data.tar.gz: abfa6799ad8f9141f65e606dfd4ef57a383c936e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a32e2f6f5ed591e2ad2538ecf5394c283d4d5baec0e7efc0a5705b8df4ed7f2a301150aeb872b1f714f42fe093c657c8f85075aff6eb1415d41c8217bc37c9b4
|
7
|
+
data.tar.gz: 9999bca177dead3fc01db2f130f8e41eba93c4a97dd91d90408e5337ca672a7cedf0d6c4d401ecf68b4afe78617db43ef8becb2632f7ff17fc507912438d45bb
|
data/CHANGELOG.md
CHANGED
@@ -4,6 +4,19 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
|
|
4
4
|
|
5
5
|
To install release candidates run `[sudo] gem install cocoapods --pre`
|
6
6
|
|
7
|
+
## 1.2.0 (2017-01-28)
|
8
|
+
|
9
|
+
##### Enhancements
|
10
|
+
|
11
|
+
* None.
|
12
|
+
|
13
|
+
##### Bug Fixes
|
14
|
+
|
15
|
+
* Do not link static frameworks to targets that use `inherit! search_paths`.
|
16
|
+
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
|
17
|
+
[#6065](https://github.com/CocoaPods/CocoaPods/issues/6065)
|
18
|
+
|
19
|
+
|
7
20
|
## 1.2.0.rc.1 (2017-01-13)
|
8
21
|
|
9
22
|
##### Enhancements
|
@@ -185,7 +185,7 @@ module Pod
|
|
185
185
|
|
186
186
|
targets.each do |pod_target|
|
187
187
|
unless pod_target.should_build? && pod_target.requires_frameworks?
|
188
|
-
XCConfigHelper.add_settings_for_file_accessors_of_target(pod_target, @xcconfig)
|
188
|
+
XCConfigHelper.add_settings_for_file_accessors_of_target(target, pod_target, @xcconfig)
|
189
189
|
end
|
190
190
|
end
|
191
191
|
end
|
@@ -59,7 +59,7 @@ module Pod
|
|
59
59
|
|
60
60
|
@xcconfig = Xcodeproj::Config.new(config)
|
61
61
|
|
62
|
-
XCConfigHelper.add_settings_for_file_accessors_of_target(target, @xcconfig)
|
62
|
+
XCConfigHelper.add_settings_for_file_accessors_of_target(nil, target, @xcconfig)
|
63
63
|
target.file_accessors.each do |file_accessor|
|
64
64
|
@xcconfig.merge!(file_accessor.spec_consumer.pod_target_xcconfig)
|
65
65
|
end
|
@@ -61,7 +61,10 @@ module Pod
|
|
61
61
|
|
62
62
|
# Configures the given Xcconfig
|
63
63
|
#
|
64
|
-
# @param [
|
64
|
+
# @param [AggregateTarget] aggregate_target
|
65
|
+
# The aggregate target, may be nil.
|
66
|
+
#
|
67
|
+
# @param [PodTarget] pod_target
|
65
68
|
# The pod target, which holds the list of +Spec::FileAccessor+.
|
66
69
|
#
|
67
70
|
# @param [Xcodeproj::Config] xcconfig
|
@@ -69,14 +72,14 @@ module Pod
|
|
69
72
|
#
|
70
73
|
# @return [void]
|
71
74
|
#
|
72
|
-
def self.add_settings_for_file_accessors_of_target(
|
73
|
-
|
75
|
+
def self.add_settings_for_file_accessors_of_target(aggregate_target, pod_target, xcconfig)
|
76
|
+
pod_target.file_accessors.each do |file_accessor|
|
74
77
|
XCConfigHelper.add_spec_build_settings_to_xcconfig(file_accessor.spec_consumer, xcconfig)
|
75
|
-
XCConfigHelper.add_static_dependency_build_settings(
|
78
|
+
XCConfigHelper.add_static_dependency_build_settings(aggregate_target, pod_target, xcconfig, file_accessor)
|
76
79
|
end
|
77
|
-
XCConfigHelper.add_dynamic_dependency_build_settings(
|
78
|
-
if
|
79
|
-
|
80
|
+
XCConfigHelper.add_dynamic_dependency_build_settings(pod_target, xcconfig)
|
81
|
+
if pod_target.requires_frameworks?
|
82
|
+
pod_target.dependent_targets.each do |dependent_target|
|
80
83
|
XCConfigHelper.add_dynamic_dependency_build_settings(dependent_target, xcconfig)
|
81
84
|
end
|
82
85
|
end
|
@@ -84,7 +87,10 @@ module Pod
|
|
84
87
|
|
85
88
|
# Adds build settings for static vendored frameworks and libraries.
|
86
89
|
#
|
87
|
-
# @param
|
90
|
+
# @param [AggregateTarget] aggregate_target
|
91
|
+
# The aggregate target, may be nil.
|
92
|
+
#
|
93
|
+
# @param [PodTarget] pod_target
|
88
94
|
# The pod target, which holds the list of +Spec::FileAccessor+.
|
89
95
|
#
|
90
96
|
# @param [Xcodeproj::Config] xcconfig
|
@@ -95,18 +101,20 @@ module Pod
|
|
95
101
|
#
|
96
102
|
# @return [void]
|
97
103
|
#
|
98
|
-
def self.add_static_dependency_build_settings(
|
104
|
+
def self.add_static_dependency_build_settings(aggregate_target, pod_target, xcconfig, file_accessor)
|
99
105
|
file_accessor.vendored_static_frameworks.each do |vendored_static_framework|
|
100
|
-
|
106
|
+
if aggregate_target.nil? || aggregate_target.target_definition.inheritance != 'search_paths'
|
107
|
+
XCConfigHelper.add_framework_build_settings(vendored_static_framework, xcconfig, pod_target.sandbox.root)
|
108
|
+
end
|
101
109
|
end
|
102
110
|
file_accessor.vendored_static_libraries.each do |vendored_static_library|
|
103
|
-
XCConfigHelper.add_library_build_settings(vendored_static_library, xcconfig,
|
111
|
+
XCConfigHelper.add_library_build_settings(vendored_static_library, xcconfig, pod_target.sandbox.root)
|
104
112
|
end
|
105
113
|
end
|
106
114
|
|
107
115
|
# Adds build settings for dynamic vendored frameworks and libraries.
|
108
116
|
#
|
109
|
-
# @param [PodTarget]
|
117
|
+
# @param [PodTarget] pod_target
|
110
118
|
# The pod target, which holds the list of +Spec::FileAccessor+.
|
111
119
|
#
|
112
120
|
# @param [Xcodeproj::Config] xcconfig
|
@@ -114,13 +122,13 @@ module Pod
|
|
114
122
|
#
|
115
123
|
# @return [void]
|
116
124
|
#
|
117
|
-
def self.add_dynamic_dependency_build_settings(
|
118
|
-
|
125
|
+
def self.add_dynamic_dependency_build_settings(pod_target, xcconfig)
|
126
|
+
pod_target.file_accessors.each do |file_accessor|
|
119
127
|
file_accessor.vendored_dynamic_frameworks.each do |vendored_dynamic_framework|
|
120
|
-
XCConfigHelper.add_framework_build_settings(vendored_dynamic_framework, xcconfig,
|
128
|
+
XCConfigHelper.add_framework_build_settings(vendored_dynamic_framework, xcconfig, pod_target.sandbox.root)
|
121
129
|
end
|
122
130
|
file_accessor.vendored_dynamic_libraries.each do |vendored_dynamic_library|
|
123
|
-
XCConfigHelper.add_library_build_settings(vendored_dynamic_library, xcconfig,
|
131
|
+
XCConfigHelper.add_library_build_settings(vendored_dynamic_library, xcconfig, pod_target.sandbox.root)
|
124
132
|
end
|
125
133
|
end
|
126
134
|
end
|
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.2.0
|
4
|
+
version: 1.2.0
|
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-01-
|
14
|
+
date: 2017-01-28 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.2.0
|
22
|
+
version: 1.2.0
|
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.2.0
|
29
|
+
version: 1.2.0
|
30
30
|
- !ruby/object:Gem::Dependency
|
31
31
|
name: claide
|
32
32
|
requirement: !ruby/object:Gem::Requirement
|