cocoapods-core 1.0.0.rc.1 → 1.0.0.rc.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.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/cocoapods-core/gem_version.rb +1 -1
  3. data/lib/cocoapods-core/podfile/target_definition.rb +7 -3
  4. metadata +12 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b8172f4984659929a7a0b34b0b76b2277758a1f2
4
- data.tar.gz: b524a2733c2d5053b9bd9e842e435a75a070ce07
3
+ metadata.gz: 28cc3934ac6d1964311b6e9ca1be99669571dbef
4
+ data.tar.gz: f8e1a697841589701882a3cfd0a33e63b01182b8
5
5
  SHA512:
6
- metadata.gz: adf5309f5d25b6145aa45736521fa1401632e72cae5ded628f717510b9b9a0cae8b69419812c670f13507097ce4f57ee780b31ad3c039230c41b65964e9bbbbc
7
- data.tar.gz: 83d1a4d3e0ca0e8d83abce693425d7a6221f2a119dc9e8744d7c8de78f96b191563f3878174c6443ddf900dffde50fbf8bfb36761b6868390612eb450891c7b7
6
+ metadata.gz: 78ab11e060106aaf986bf234f1e8c3893ca29b1a4a77b7258756a4ac37e12df2c1ccca10432015ae150bdfa6423f26bbf6902dd7800ea99486318dd380be3365
7
+ data.tar.gz: d0f745457f786ab5aee32c1613ecb29343649efce80d6bd931fa2f0791fc654486d9241ea80bc5f80712f2bd57bb3fe765acda4c4374285e52ea025238e5fd72
data/lib/cocoapods-core/gem_version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Pod
2
2
  # The version of the cocoapods-core.
3
3
  #
4
- CORE_VERSION = '1.0.0.rc.1'.freeze unless defined? Pod::CORE_VERSION
4
+ CORE_VERSION = '1.0.0.rc.2'.freeze unless defined? Pod::CORE_VERSION
5
5
  end
data/lib/cocoapods-core/podfile/target_definition.rb CHANGED
@@ -153,7 +153,7 @@ module Pod
153
153
  # @return [Boolean] whether this target definition is abstract.
154
154
  #
155
155
  def abstract?
156
- get_hash_value('abstract', false)
156
+ get_hash_value('abstract', root?)
157
157
  end
158
158
 
159
159
  # Sets whether this target definition is abstract.
@@ -224,7 +224,9 @@ module Pod
224
224
  # `target_definition`.
225
225
  #
226
226
  def matches_platform?(target_definition)
227
- target_definition && target_definition.platform == platform
227
+ return false unless target_definition
228
+ return true if target_definition.platform == platform
229
+ !target_definition.platform && target_definition.abstract?
228
230
  end
229
231
 
230
232
  #--------------------------------------#
@@ -672,7 +674,9 @@ module Pod
672
674
  # Clean pods that are set to not inhibit inside parent if inhibit_all_warnings! was set.
673
675
  parent_hash['not_for_pods'] = nil
674
676
  end
675
- parent_hash.merge(inhibit_hash) { |_, l, r| (l + r).uniq }
677
+ parent_hash.merge(inhibit_hash) do |_, l, r|
678
+ Array(l).concat(r).uniq
679
+ end
676
680
  end
677
681
  end
678
682
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cocoapods-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.rc.1
4
+ version: 1.0.0.rc.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Eloy Duran
@@ -9,62 +9,62 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-04-29 00:00:00.000000000 Z
12
+ date: 2016-05-04 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - ">="
18
+ - - '>='
19
19
  - !ruby/object:Gem::Version
20
20
  version: 4.0.2
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - ">="
25
+ - - '>='
26
26
  - !ruby/object:Gem::Version
27
27
  version: 4.0.2
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: nap
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - "~>"
32
+ - - ~>
33
33
  - !ruby/object:Gem::Version
34
34
  version: '1.0'
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - "~>"
39
+ - - ~>
40
40
  - !ruby/object:Gem::Version
41
41
  version: '1.0'
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: fuzzy_match
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
- - - "~>"
46
+ - - ~>
47
47
  - !ruby/object:Gem::Version
48
48
  version: 2.0.4
49
49
  type: :runtime
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
- - - "~>"
53
+ - - ~>
54
54
  - !ruby/object:Gem::Version
55
55
  version: 2.0.4
56
56
  - !ruby/object:Gem::Dependency
57
57
  name: bacon
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
- - - "~>"
60
+ - - ~>
61
61
  - !ruby/object:Gem::Version
62
62
  version: '1.1'
63
63
  type: :development
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
- - - "~>"
67
+ - - ~>
68
68
  - !ruby/object:Gem::Version
69
69
  version: '1.1'
70
70
  description: |-
@@ -130,12 +130,12 @@ require_paths:
130
130
  - lib
131
131
  required_ruby_version: !ruby/object:Gem::Requirement
132
132
  requirements:
133
- - - ">="
133
+ - - '>='
134
134
  - !ruby/object:Gem::Version
135
135
  version: 2.0.0
136
136
  required_rubygems_version: !ruby/object:Gem::Requirement
137
137
  requirements:
138
- - - ">="
138
+ - - '>='
139
139
  - !ruby/object:Gem::Version
140
140
  version: '0'
141
141
  requirements: []