cocoapods 1.0.0.rc.2 → 1.0.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 +4 -4
- data/CHANGELOG.md +24 -0
- data/lib/cocoapods/gem_version.rb +1 -1
- data/lib/cocoapods/generator/xcconfig/pod_xcconfig.rb +1 -1
- data/lib/cocoapods/installer.rb +19 -0
- data/lib/cocoapods/installer/installation_options.rb +1 -0
- data/lib/cocoapods/resolver.rb +16 -14
- data/lib/cocoapods/target/pod_target.rb +9 -0
- data/lib/cocoapods/validator.rb +7 -0
- metadata +94 -40
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 089fd601f4b77b13ce571371163234e74681fc6a
|
4
|
+
data.tar.gz: 2ba921d00ae8b35bad6446d8d86bc4437766dcec
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: dc073ce49be6c7c75b2e80f4eb888bb68d623f9041721129877a1a074eafa231e984f3ff93b25756784cf43e0bb741a1e7405ceb7d177799f14b920d1c64afcc
|
7
|
+
data.tar.gz: b21370ae05fa41e645bcf4d7ce27ee6e2b13507098ce5b4540f54cdd2b042ff26981cea047169379d911eac0835a72575842195ff5acfd0c7699142fdbf235ff
|
data/CHANGELOG.md
CHANGED
@@ -4,6 +4,30 @@ 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.0.0 (2016-05-10)
|
8
|
+
|
9
|
+
##### Enhancements
|
10
|
+
|
11
|
+
* Validate that resource bundles declared in the podspec contain resources.
|
12
|
+
[Samuel Giddins](https://github.com/segiddins)
|
13
|
+
[#5218](https://github.com/CocoaPods/CocoaPods/issues/5218)
|
14
|
+
|
15
|
+
* Improvements to the error messaging around missing dependencies.
|
16
|
+
[Orta Therox](https://github.com/orta)
|
17
|
+
[#5260](https://github.com/CocoaPods/CocoaPods/issues/5260)
|
18
|
+
|
19
|
+
* Make sharing schemes for development pods an installation option
|
20
|
+
(`share_schemes_for_development_pods`) and disable sharing schemes
|
21
|
+
by default.
|
22
|
+
[Samuel Giddins](https://github.com/segiddins)
|
23
|
+
|
24
|
+
##### Bug Fixes
|
25
|
+
|
26
|
+
* Fix search paths inheritance when there are transitive dependencies.
|
27
|
+
[Samuel Giddins](https://github.com/segiddins)
|
28
|
+
[#5264](https://github.com/CocoaPods/CocoaPods/issues/5264)
|
29
|
+
|
30
|
+
|
7
31
|
## 1.0.0.rc.2 (2016-05-04)
|
8
32
|
|
9
33
|
##### Enhancements
|
@@ -63,7 +63,7 @@ module Pod
|
|
63
63
|
@xcconfig.merge!(file_accessor.spec_consumer.pod_target_xcconfig)
|
64
64
|
end
|
65
65
|
XCConfigHelper.add_target_specific_settings(target, @xcconfig)
|
66
|
-
@xcconfig.merge! XCConfigHelper.settings_for_dependent_targets(target, target.
|
66
|
+
@xcconfig.merge! XCConfigHelper.settings_for_dependent_targets(target, target.recursive_dependent_targets)
|
67
67
|
@xcconfig
|
68
68
|
end
|
69
69
|
|
data/lib/cocoapods/installer.rb
CHANGED
@@ -703,10 +703,29 @@ module Pod
|
|
703
703
|
#
|
704
704
|
def share_development_pod_schemes
|
705
705
|
development_pod_targets.select(&:should_build?).each do |pod_target|
|
706
|
+
next unless share_scheme_for_development_pod?(pod_target.pod_name)
|
706
707
|
Xcodeproj::XCScheme.share_scheme(pods_project.path, pod_target.label)
|
707
708
|
end
|
708
709
|
end
|
709
710
|
|
711
|
+
# @param [String] pod The root name of the development pod.
|
712
|
+
#
|
713
|
+
# @return [Bool] whether the scheme for the given development pod should be
|
714
|
+
# shared.
|
715
|
+
#
|
716
|
+
def share_scheme_for_development_pod?(pod)
|
717
|
+
case dev_pods_to_share = installation_options.share_schemes_for_development_pods
|
718
|
+
when TrueClass, FalseClass, NilClass
|
719
|
+
dev_pods_to_share
|
720
|
+
when Array
|
721
|
+
dev_pods_to_share.any? { |dev_pod| dev_pod === pod } # rubocop:disable Style/CaseEquality
|
722
|
+
else
|
723
|
+
raise Informative, 'Unable to handle share_schemes_for_development_pods ' \
|
724
|
+
"being set to #{dev_pods_to_share.inspect} -- please set it to true, " \
|
725
|
+
'false, or an array of pods to share schemes for.'
|
726
|
+
end
|
727
|
+
end
|
728
|
+
|
710
729
|
# Writes the Podfile and the lock files.
|
711
730
|
#
|
712
731
|
# @todo Pass the checkout options to the Lockfile.
|
data/lib/cocoapods/resolver.rb
CHANGED
@@ -419,20 +419,22 @@ module Pod
|
|
419
419
|
end
|
420
420
|
message << "\nYou should explicitly specify the version in order to install a pre-release version"
|
421
421
|
elsif !conflict.existing
|
422
|
-
conflict.requirements.values.flatten.uniq
|
423
|
-
|
424
|
-
|
425
|
-
|
426
|
-
|
427
|
-
|
428
|
-
|
429
|
-
|
430
|
-
|
431
|
-
|
432
|
-
|
433
|
-
|
434
|
-
|
435
|
-
|
422
|
+
conflicts = conflict.requirements.values.flatten.uniq
|
423
|
+
found_conflicted_specs = conflicts.reject { |c| search_for(c).empty? }
|
424
|
+
if found_conflicted_specs.empty?
|
425
|
+
# There are no existing specification inside any of the spec repos with given requirements.
|
426
|
+
dependencies = conflicts.count == 1 ? 'dependency' : 'dependencies'
|
427
|
+
message << "\n\nNone of your spec sources contain a spec satisfying "\
|
428
|
+
"the #{dependencies}: `#{conflicts.join(', ')}`." \
|
429
|
+
"\n\nYou have either:" \
|
430
|
+
"\n * out-of-date source repos which you can update with `pod repo update`." \
|
431
|
+
"\n * mistyped the name or version." \
|
432
|
+
"\n * not added the source repo that hosts the Podspec to your Podfile." \
|
433
|
+
"\n\nNote: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by default."
|
434
|
+
|
435
|
+
else
|
436
|
+
message << "\n\nSpecs satisfying the `#{conflicts.join(', ')}` dependency were found, " \
|
437
|
+
'but they required a higher minimum deployment target.'
|
436
438
|
end
|
437
439
|
end
|
438
440
|
end
|
@@ -184,6 +184,15 @@ module Pod
|
|
184
184
|
end.uniq
|
185
185
|
end
|
186
186
|
|
187
|
+
# @return [Array<PodTarget>] the recursive targets that this target has a
|
188
|
+
# dependency upon.
|
189
|
+
#
|
190
|
+
def recursive_dependent_targets
|
191
|
+
targets = dependent_targets + dependent_targets.flat_map(&:recursive_dependent_targets)
|
192
|
+
targets.uniq!
|
193
|
+
targets
|
194
|
+
end
|
195
|
+
|
187
196
|
# Checks if the target should be included in the build configuration with
|
188
197
|
# the given name of a given target definition.
|
189
198
|
#
|
data/lib/cocoapods/validator.rb
CHANGED
@@ -556,6 +556,13 @@ module Pod
|
|
556
556
|
end
|
557
557
|
end
|
558
558
|
|
559
|
+
def _validate_resource_bundles
|
560
|
+
file_accessor.resource_bundles.each do |bundle, resource_paths|
|
561
|
+
next unless resource_paths.empty?
|
562
|
+
error('file patterns', "The `resource_bundles` pattern for `#{bundle}` did not match any file.")
|
563
|
+
end
|
564
|
+
end
|
565
|
+
|
559
566
|
# Ensures that a list of header files only contains header files.
|
560
567
|
#
|
561
568
|
def _validate_header_files(attr_name)
|
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.0.0
|
4
|
+
version: 1.0.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: 2016-05-
|
14
|
+
date: 2016-05-10 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: cocoapods-core
|
@@ -19,126 +19,174 @@ dependencies:
|
|
19
19
|
requirements:
|
20
20
|
- - '='
|
21
21
|
- !ruby/object:Gem::Version
|
22
|
-
version: 1.0.0
|
22
|
+
version: 1.0.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.0.0
|
29
|
+
version: 1.0.0
|
30
30
|
- !ruby/object:Gem::Dependency
|
31
31
|
name: claide
|
32
32
|
requirement: !ruby/object:Gem::Requirement
|
33
33
|
requirements:
|
34
|
-
- - '
|
34
|
+
- - '>='
|
35
35
|
- !ruby/object:Gem::Version
|
36
|
-
version: 1.0.0
|
36
|
+
version: 1.0.0
|
37
|
+
- - <
|
38
|
+
- !ruby/object:Gem::Version
|
39
|
+
version: '2.0'
|
37
40
|
type: :runtime
|
38
41
|
prerelease: false
|
39
42
|
version_requirements: !ruby/object:Gem::Requirement
|
40
43
|
requirements:
|
41
|
-
- - '
|
44
|
+
- - '>='
|
45
|
+
- !ruby/object:Gem::Version
|
46
|
+
version: 1.0.0
|
47
|
+
- - <
|
42
48
|
- !ruby/object:Gem::Version
|
43
|
-
version:
|
49
|
+
version: '2.0'
|
44
50
|
- !ruby/object:Gem::Dependency
|
45
51
|
name: cocoapods-deintegrate
|
46
52
|
requirement: !ruby/object:Gem::Requirement
|
47
53
|
requirements:
|
48
|
-
- - '
|
54
|
+
- - '>='
|
55
|
+
- !ruby/object:Gem::Version
|
56
|
+
version: 1.0.0
|
57
|
+
- - <
|
49
58
|
- !ruby/object:Gem::Version
|
50
|
-
version:
|
59
|
+
version: '2.0'
|
51
60
|
type: :runtime
|
52
61
|
prerelease: false
|
53
62
|
version_requirements: !ruby/object:Gem::Requirement
|
54
63
|
requirements:
|
55
|
-
- - '
|
64
|
+
- - '>='
|
56
65
|
- !ruby/object:Gem::Version
|
57
|
-
version: 1.0.0
|
66
|
+
version: 1.0.0
|
67
|
+
- - <
|
68
|
+
- !ruby/object:Gem::Version
|
69
|
+
version: '2.0'
|
58
70
|
- !ruby/object:Gem::Dependency
|
59
71
|
name: cocoapods-downloader
|
60
72
|
requirement: !ruby/object:Gem::Requirement
|
61
73
|
requirements:
|
62
|
-
- - '
|
74
|
+
- - '>='
|
63
75
|
- !ruby/object:Gem::Version
|
64
|
-
version: 1.0.0
|
76
|
+
version: 1.0.0
|
77
|
+
- - <
|
78
|
+
- !ruby/object:Gem::Version
|
79
|
+
version: '2.0'
|
65
80
|
type: :runtime
|
66
81
|
prerelease: false
|
67
82
|
version_requirements: !ruby/object:Gem::Requirement
|
68
83
|
requirements:
|
69
|
-
- - '
|
84
|
+
- - '>='
|
85
|
+
- !ruby/object:Gem::Version
|
86
|
+
version: 1.0.0
|
87
|
+
- - <
|
70
88
|
- !ruby/object:Gem::Version
|
71
|
-
version:
|
89
|
+
version: '2.0'
|
72
90
|
- !ruby/object:Gem::Dependency
|
73
91
|
name: cocoapods-plugins
|
74
92
|
requirement: !ruby/object:Gem::Requirement
|
75
93
|
requirements:
|
76
|
-
- - '
|
94
|
+
- - '>='
|
95
|
+
- !ruby/object:Gem::Version
|
96
|
+
version: 1.0.0
|
97
|
+
- - <
|
77
98
|
- !ruby/object:Gem::Version
|
78
|
-
version:
|
99
|
+
version: '2.0'
|
79
100
|
type: :runtime
|
80
101
|
prerelease: false
|
81
102
|
version_requirements: !ruby/object:Gem::Requirement
|
82
103
|
requirements:
|
83
|
-
- - '
|
104
|
+
- - '>='
|
105
|
+
- !ruby/object:Gem::Version
|
106
|
+
version: 1.0.0
|
107
|
+
- - <
|
84
108
|
- !ruby/object:Gem::Version
|
85
|
-
version:
|
109
|
+
version: '2.0'
|
86
110
|
- !ruby/object:Gem::Dependency
|
87
111
|
name: cocoapods-search
|
88
112
|
requirement: !ruby/object:Gem::Requirement
|
89
113
|
requirements:
|
90
|
-
- - '
|
114
|
+
- - '>='
|
115
|
+
- !ruby/object:Gem::Version
|
116
|
+
version: 1.0.0
|
117
|
+
- - <
|
91
118
|
- !ruby/object:Gem::Version
|
92
|
-
version:
|
119
|
+
version: '2.0'
|
93
120
|
type: :runtime
|
94
121
|
prerelease: false
|
95
122
|
version_requirements: !ruby/object:Gem::Requirement
|
96
123
|
requirements:
|
97
|
-
- - '
|
124
|
+
- - '>='
|
98
125
|
- !ruby/object:Gem::Version
|
99
|
-
version: 1.0.0
|
126
|
+
version: 1.0.0
|
127
|
+
- - <
|
128
|
+
- !ruby/object:Gem::Version
|
129
|
+
version: '2.0'
|
100
130
|
- !ruby/object:Gem::Dependency
|
101
131
|
name: cocoapods-stats
|
102
132
|
requirement: !ruby/object:Gem::Requirement
|
103
133
|
requirements:
|
104
|
-
- - '
|
134
|
+
- - '>='
|
135
|
+
- !ruby/object:Gem::Version
|
136
|
+
version: 1.0.0
|
137
|
+
- - <
|
105
138
|
- !ruby/object:Gem::Version
|
106
|
-
version:
|
139
|
+
version: '2.0'
|
107
140
|
type: :runtime
|
108
141
|
prerelease: false
|
109
142
|
version_requirements: !ruby/object:Gem::Requirement
|
110
143
|
requirements:
|
111
|
-
- - '
|
144
|
+
- - '>='
|
145
|
+
- !ruby/object:Gem::Version
|
146
|
+
version: 1.0.0
|
147
|
+
- - <
|
112
148
|
- !ruby/object:Gem::Version
|
113
|
-
version:
|
149
|
+
version: '2.0'
|
114
150
|
- !ruby/object:Gem::Dependency
|
115
151
|
name: cocoapods-trunk
|
116
152
|
requirement: !ruby/object:Gem::Requirement
|
117
153
|
requirements:
|
118
|
-
- - '
|
154
|
+
- - '>='
|
119
155
|
- !ruby/object:Gem::Version
|
120
|
-
version: 1.0.0
|
156
|
+
version: 1.0.0
|
157
|
+
- - <
|
158
|
+
- !ruby/object:Gem::Version
|
159
|
+
version: '2.0'
|
121
160
|
type: :runtime
|
122
161
|
prerelease: false
|
123
162
|
version_requirements: !ruby/object:Gem::Requirement
|
124
163
|
requirements:
|
125
|
-
- - '
|
164
|
+
- - '>='
|
126
165
|
- !ruby/object:Gem::Version
|
127
|
-
version: 1.0.0
|
166
|
+
version: 1.0.0
|
167
|
+
- - <
|
168
|
+
- !ruby/object:Gem::Version
|
169
|
+
version: '2.0'
|
128
170
|
- !ruby/object:Gem::Dependency
|
129
171
|
name: cocoapods-try
|
130
172
|
requirement: !ruby/object:Gem::Requirement
|
131
173
|
requirements:
|
132
|
-
- - '
|
174
|
+
- - '>='
|
175
|
+
- !ruby/object:Gem::Version
|
176
|
+
version: 1.0.0
|
177
|
+
- - <
|
133
178
|
- !ruby/object:Gem::Version
|
134
|
-
version:
|
179
|
+
version: '2.0'
|
135
180
|
type: :runtime
|
136
181
|
prerelease: false
|
137
182
|
version_requirements: !ruby/object:Gem::Requirement
|
138
183
|
requirements:
|
139
|
-
- - '
|
184
|
+
- - '>='
|
185
|
+
- !ruby/object:Gem::Version
|
186
|
+
version: 1.0.0
|
187
|
+
- - <
|
140
188
|
- !ruby/object:Gem::Version
|
141
|
-
version:
|
189
|
+
version: '2.0'
|
142
190
|
- !ruby/object:Gem::Dependency
|
143
191
|
name: molinillo
|
144
192
|
requirement: !ruby/object:Gem::Requirement
|
@@ -157,16 +205,22 @@ dependencies:
|
|
157
205
|
name: xcodeproj
|
158
206
|
requirement: !ruby/object:Gem::Requirement
|
159
207
|
requirements:
|
160
|
-
- - '
|
208
|
+
- - '>='
|
209
|
+
- !ruby/object:Gem::Version
|
210
|
+
version: 1.0.0
|
211
|
+
- - <
|
161
212
|
- !ruby/object:Gem::Version
|
162
|
-
version:
|
213
|
+
version: '2.0'
|
163
214
|
type: :runtime
|
164
215
|
prerelease: false
|
165
216
|
version_requirements: !ruby/object:Gem::Requirement
|
166
217
|
requirements:
|
167
|
-
- - '
|
218
|
+
- - '>='
|
219
|
+
- !ruby/object:Gem::Version
|
220
|
+
version: 1.0.0
|
221
|
+
- - <
|
168
222
|
- !ruby/object:Gem::Version
|
169
|
-
version:
|
223
|
+
version: '2.0'
|
170
224
|
- !ruby/object:Gem::Dependency
|
171
225
|
name: activesupport
|
172
226
|
requirement: !ruby/object:Gem::Requirement
|