pod-builder 1.9.3 → 1.9.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 44fea048890540dd75a6b4dca94995a526c9978ad8b496b2af98bbdd97c3a7e2
4
- data.tar.gz: 0efc17fe9c8ed070338f6b08e7190dde2826d14c9056c496e97e7c69b48ae72a
3
+ metadata.gz: b68e52a5461141c3370ea7dc00ddb205846f9ed7e2f2efce5a026e412b3b0d17
4
+ data.tar.gz: 800fd0c1940127ac4805a72cacd31f8311c146fe42a45596a4c9400e20764e37
5
5
  SHA512:
6
- metadata.gz: dba81b8a392cfc9969a506a43cd3df30a58280946946c452fce20b3cba71535d51b65c205cca28c81825d5fdaf8588234ef8ff290f94a5ab709731f23eef087d
7
- data.tar.gz: 802a0df25a2178fb3837b765456b086898d0f09f5d15c2caf50d91fdedb216973e6812fd981102c57c862c2d8daee2ee30136c803cb3e944d08b622a2dbdfb2c
6
+ metadata.gz: a1edc1b03e0f53c84ca624586c8d80631f22639e158888ebedf650c2224658a8f9d90f53bd1225a29b970293d5672ec906121c95c654495d1eba0039e226f98c
7
+ data.tar.gz: 4e16e658df48c264b84b4cf4db2fa44191aa929b4de1106d6bc84cb1f07227d9338c468339f6a28ce21b4a8757e191fcdb3a532f53cdcd04a2ed76c6b9b1565f
@@ -138,23 +138,36 @@ module PodBuilder
138
138
  return pods
139
139
  end
140
140
 
141
+ def self.buildable_dependencies(pod, buildable_items)
142
+ deps = []
143
+
144
+ pod.dependency_names.each do |dependency|
145
+ buildable_pods = buildable_items.select { |t| t.root_name == dependency }
146
+ if buildable_pods.any? { |t| t.source_files.count > 0 }
147
+ deps.push(dependency)
148
+ end
149
+ end
150
+
151
+ return deps
152
+ end
153
+
141
154
  def self.expected_common_dependencies(pods_to_build, buildable_items, options)
142
155
  warned_expected_pod_list = []
143
156
  expected_pod_list = []
144
157
  errors = []
145
158
 
146
159
  pods_to_build.each do |pod_to_build|
147
- pod_to_build.dependency_names.each do |dependency|
160
+ buildable_dependencies(pod_to_build, buildable_items).each do |dependency|
148
161
  unless buildable_items.detect { |x| x.root_name == dependency || x.name == dependency } != nil
149
162
  next
150
163
  end
151
164
 
152
165
  buildable_items.each do |buildable_pod|
153
- unless !pod_to_build.dependency_names.include?(buildable_pod.name)
166
+ unless !buildable_dependencies(pod_to_build, buildable_items).include?(buildable_pod.name)
154
167
  next
155
168
  end
156
169
 
157
- if buildable_pod.dependency_names.include?(dependency) && !buildable_pod.has_subspec(dependency) && !buildable_pod.has_common_spec(dependency) then
170
+ if buildable_dependencies(buildable_pod, buildable_items).include?(dependency) && !buildable_pod.has_subspec(dependency) && !buildable_pod.has_common_spec(dependency) then
158
171
  expected_pod_list += pods_to_build.map(&:root_name) + [buildable_pod.root_name]
159
172
  expected_pod_list.uniq!
160
173
 
@@ -165,7 +178,7 @@ module PodBuilder
165
178
  warned_expected_pod_list.push(expected_list)
166
179
 
167
180
  if options.has_key?(:auto_resolve_dependencies)
168
- puts "`#{pod_to_build.name}` has the following dependencies:\n`#{pod_to_build.dependency_names.join("`, `")}`\nWhich are in common with `#{buildable_pod.name}` and requires it to be recompiled\n\n".yellow
181
+ puts "`#{pod_to_build.name}` has the following dependencies:\n`#{buildable_dependencies(pod_to_build, buildable_items).join("`, `")}`\nWhich are in common with `#{buildable_pod.name}` and requires it to be recompiled\n\n".yellow
169
182
  end
170
183
  end
171
184
  end
@@ -35,8 +35,8 @@ module PodBuilder
35
35
 
36
36
  # These settings need to be set as is to properly build frameworks
37
37
  build_settings['SWIFT_COMPILATION_MODE'] = 'wholemodule'
38
+ build_settings['CLANG_ENABLE_MODULE_DEBUGGING'] = 'NO'
38
39
  build_settings['ONLY_ACTIVE_ARCH'] = 'NO'
39
- build_settings['CLANG_ENABLE_MODULE_DEBUGGING'] = "NO" # no drawbacks, see: https://stackoverflow.com/a/36367933/574449
40
40
  build_settings['DEBUG_INFORMATION_FORMAT'] = "dwarf-with-dsym"
41
41
 
42
42
  if Configuration.build_system == "Legacy"
@@ -1,4 +1,4 @@
1
1
  module PodBuilder
2
- VERSION = "1.9.3"
2
+ VERSION = "1.9.4"
3
3
  end
4
4
 
data/pod-builder.gemspec CHANGED
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
22
22
  spec.require_paths = ["lib"]
23
23
 
24
24
  spec.add_development_dependency "bundler", "~> 2.0"
25
- spec.add_development_dependency "rake", "~> 10.0"
25
+ spec.add_development_dependency "rake", ">= 12.3.3"
26
26
  spec.add_development_dependency "ruby-debug-ide"
27
27
  spec.add_development_dependency "debase"
28
28
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pod-builder
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.9.3
4
+ version: 1.9.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tomas Camin
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-02-25 00:00:00.000000000 Z
11
+ date: 2020-05-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -28,16 +28,16 @@ dependencies:
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: '10.0'
33
+ version: 12.3.3
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: '10.0'
40
+ version: 12.3.3
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: ruby-debug-ide
43
43
  requirement: !ruby/object:Gem::Requirement