cocoapods-bin 0.1.16 → 0.1.17
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/Gemfile +1 -1
- data/Gemfile.lock +14 -14
- data/lib/cocoapods-bin/gem_version.rb +1 -1
- data/lib/cocoapods-bin/native/resolver.rb +16 -3
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5b68aa3357e723d5a556e030ffc5d80605c6fbcc
|
|
4
|
+
data.tar.gz: 62385a5cf0e53b1e478a110b39bff2b003625b57
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 470934fa523f4292f780257628810bb875822ae64588b152f8ff582603ea584af950f9ae699ba618d6c92ebefe9fc254433689db6a22faf3fc3bea943342cdb5
|
|
7
|
+
data.tar.gz: 0f8f3d3d662a801997d517dab286897b60f0d6d0814d31fb3c9a68dece4698ee65b830d2a94c3227a1c258921e221f2168fb807e527b201d7152e47abb902299
|
data/Gemfile
CHANGED
data/Gemfile.lock
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
cocoapods-bin (0.1.
|
|
4
|
+
cocoapods-bin (0.1.17)
|
|
5
5
|
cocoapods (~> 1.4)
|
|
6
6
|
parallel
|
|
7
7
|
|
|
@@ -17,26 +17,26 @@ GEM
|
|
|
17
17
|
atomos (0.1.3)
|
|
18
18
|
bacon (1.2.0)
|
|
19
19
|
claide (1.0.2)
|
|
20
|
-
cocoapods (1.
|
|
20
|
+
cocoapods (1.7.1)
|
|
21
21
|
activesupport (>= 4.0.2, < 5)
|
|
22
22
|
claide (>= 1.0.2, < 2.0)
|
|
23
|
-
cocoapods-core (= 1.
|
|
24
|
-
cocoapods-deintegrate (>= 1.0.
|
|
25
|
-
cocoapods-downloader (>= 1.2.
|
|
23
|
+
cocoapods-core (= 1.7.1)
|
|
24
|
+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
|
|
25
|
+
cocoapods-downloader (>= 1.2.2, < 2.0)
|
|
26
26
|
cocoapods-plugins (>= 1.0.0, < 2.0)
|
|
27
27
|
cocoapods-search (>= 1.0.0, < 2.0)
|
|
28
28
|
cocoapods-stats (>= 1.0.0, < 2.0)
|
|
29
|
-
cocoapods-trunk (>= 1.3.
|
|
29
|
+
cocoapods-trunk (>= 1.3.1, < 2.0)
|
|
30
30
|
cocoapods-try (>= 1.1.0, < 2.0)
|
|
31
31
|
colored2 (~> 3.1)
|
|
32
32
|
escape (~> 0.0.4)
|
|
33
|
-
fourflusher (
|
|
33
|
+
fourflusher (>= 2.2.0, < 3.0)
|
|
34
34
|
gh_inspector (~> 1.0)
|
|
35
|
-
molinillo (~> 0.6.
|
|
35
|
+
molinillo (~> 0.6.6)
|
|
36
36
|
nap (~> 1.0)
|
|
37
|
-
ruby-macho (~> 1.
|
|
38
|
-
xcodeproj (>= 1.
|
|
39
|
-
cocoapods-core (1.
|
|
37
|
+
ruby-macho (~> 1.4)
|
|
38
|
+
xcodeproj (>= 1.8.2, < 2.0)
|
|
39
|
+
cocoapods-core (1.7.1)
|
|
40
40
|
activesupport (>= 4.0.2, < 6)
|
|
41
41
|
fuzzy_match (~> 2.0.4)
|
|
42
42
|
nap (~> 1.0)
|
|
@@ -53,7 +53,7 @@ GEM
|
|
|
53
53
|
colored2 (3.1.2)
|
|
54
54
|
concurrent-ruby (1.1.5)
|
|
55
55
|
escape (0.0.4)
|
|
56
|
-
fourflusher (2.0
|
|
56
|
+
fourflusher (2.3.0)
|
|
57
57
|
fuzzy_match (2.0.4)
|
|
58
58
|
gh_inspector (1.1.3)
|
|
59
59
|
i18n (0.9.5)
|
|
@@ -76,7 +76,7 @@ GEM
|
|
|
76
76
|
thread_safe (0.3.6)
|
|
77
77
|
tzinfo (1.2.5)
|
|
78
78
|
thread_safe (~> 0.1)
|
|
79
|
-
xcodeproj (1.
|
|
79
|
+
xcodeproj (1.10.0)
|
|
80
80
|
CFPropertyList (>= 2.3.3, < 4.0)
|
|
81
81
|
atomos (~> 0.1.3)
|
|
82
82
|
claide (>= 1.0.2, < 2.0)
|
|
@@ -89,7 +89,7 @@ PLATFORMS
|
|
|
89
89
|
DEPENDENCIES
|
|
90
90
|
bacon
|
|
91
91
|
bundler (~> 1.3)
|
|
92
|
-
cocoapods
|
|
92
|
+
cocoapods (= 1.7.1)
|
|
93
93
|
cocoapods-bin!
|
|
94
94
|
mocha
|
|
95
95
|
mocha-on-bacon
|
|
@@ -34,8 +34,15 @@ module Pod
|
|
|
34
34
|
additional_requirements.compact!
|
|
35
35
|
requirement = Requirement.new(dependency.requirement.as_list + additional_requirements.flat_map(&:as_list))
|
|
36
36
|
requirement = Requirement.new(dependency.requirement.as_list.map { |r| r + '.a' } + additional_requirements.flat_map(&:as_list)) if podfile.allow_prerelease? && !requirement.prerelease?
|
|
37
|
+
|
|
38
|
+
if Pod.match_version?('~> 1.7')
|
|
39
|
+
options = podfile.installation_options
|
|
40
|
+
else
|
|
41
|
+
options = installation_options
|
|
42
|
+
end
|
|
43
|
+
|
|
37
44
|
find_cached_set(dependency).
|
|
38
|
-
all_specifications(
|
|
45
|
+
all_specifications(options.warn_for_multiple_pod_sources).
|
|
39
46
|
select { |s| requirement.satisfied_by? s.version }.
|
|
40
47
|
map { |s| s.subspec_by_name(dependency.name, false, true) }.
|
|
41
48
|
compact
|
|
@@ -109,11 +116,17 @@ module Pod
|
|
|
109
116
|
# 造成 subspec_by_name 返回 nil，这个是正常现象
|
|
110
117
|
next unless specification
|
|
111
118
|
|
|
119
|
+
if Pod.match_version?('~> 1.7')
|
|
120
|
+
used_by_only = rspec.used_by_non_library_targets_only
|
|
121
|
+
else
|
|
122
|
+
used_by_only = rspec.used_by_tests_only
|
|
123
|
+
end
|
|
124
|
+
# used_by_only = rspec.respond_to?(:used_by_tests_only) ? rspec.used_by_tests_only : rspec.used_by_non_library_targets_only
|
|
112
125
|
# 组装新的 rspec ，替换原 rspec
|
|
113
126
|
rspec = if Pod.match_version?('~> 1.4.0')
|
|
114
|
-
ResolverSpecification.new(specification,
|
|
127
|
+
ResolverSpecification.new(specification, used_by_only)
|
|
115
128
|
else
|
|
116
|
-
ResolverSpecification.new(specification,
|
|
129
|
+
ResolverSpecification.new(specification, used_by_only, source)
|
|
117
130
|
end
|
|
118
131
|
rspec
|
|
119
132
|
rescue Pod::StandardError => error
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: cocoapods-bin
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.17
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- tripleCC
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-
|
|
11
|
+
date: 2019-06-13 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: parallel
|