cocoapods-tdfire-binary 1.0.0 → 1.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +6 -3
  3. data/cocoapods-tdfire-binary.gemspec +1 -1
  4. data/lib/cocoapods-tdfire-binary/binary_specification_refactor.rb +3 -3
  5. data/lib/cocoapods-tdfire-binary/binary_url_manager.rb +2 -2
  6. data/lib/cocoapods-tdfire-binary/command/binary.rb +2 -2
  7. data/lib/cocoapods-tdfire-binary/gem_version.rb +1 -1
  8. data/lib/cocoapods-tdfire-binary/podfile_hook.rb +18 -16
  9. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 94e8dc020c5e66365a856c284dcdd3c7b1a00898
4
- data.tar.gz: 9e8eddca9a7c4c3697a5b4cce1256f329d1656fe
3
+ metadata.gz: 620210af4e024dea816e4cd69115c9e46ddf59cc
4
+ data.tar.gz: d9910a756e7bc3eb9ed138061d86ba7e154e0236
5
5
  SHA512:
6
- metadata.gz: 51f6ec7edc094cf223b6569ccd75b8da5b4a01e2f7c459a3eebc43923d477cc3cc503776a78b1bb7b4d3f8e83c5ac2b1d3efbf7df95e1738dfc235544071fe1c
7
- data.tar.gz: cbcffa261842a595262f2881eb8ae4e4ff446d05f76c88e3702a5c0277d1fe09b84d63b04e8893413dcc8477cfd011158eb3825abbe8f63ebf2099918f5de138
6
+ metadata.gz: 7a33cad79d85024c5042a68b7bbe71fba3f6d34c5cea98d38a7f2fcdd645e283c0251ac81a9a4a97a6215013dfcee9da094f3e028b3e70a99a5a84506212fdb0
7
+ data.tar.gz: 9c0ade948066c98fe9d196883180e064da40497bbd0bf7d43a9c31208be39030457a3381dd94c8bc1ea8f0a3cb9af76ebf17c20ce05371be619111ae43a1e58d
data/README.md CHANGED
@@ -84,12 +84,15 @@ end
84
84
  - 配置源码依赖
85
85
 
86
86
  - tdfire_binary
87
- - 配置二进制依赖，其中 `vendored_framework`、`source_files`、`public_header_files` 内部设置成如下路径
87
+ - 配置二进制依赖，其中 `vendored_framework` 、`source_files`、`public_header_files` 内部设置成如下路径
88
88
 
89
89
  ```
90
90
  s.vendored_framework = "#{s.name}.framework"
91
- s.source_files = "#{s.name}.framework/Headers/*"
92
- s.public_header_files = "#{s.name}.framework/Headers/*"
91
+ #
92
+ # 这两句 framework 不需要，cocoapods-packager 插件生成的 framework 中， Headers 是一个软连接 ，所以即使设置了也不生效
93
+ # 这样就需要使用者都以 < > 的形式引用头文件了，而且需要是 umbrella 头文件，否则会出现警告
94
+ # s.source_files = "#{s.name}.framework/Headers/*"
95
+ # s.public_header_files = "#{s.name}.framework/Headers/*"
93
96
  ```
94
97
  - 提取 subspec 中的依赖、frameworks、 libraries、 weak_frameworks，至二进制组件对应属性中
95
98
  - 在组件源码依赖有 subspec 的情况下，插件会在二进制依赖时，动态创建 default subspec `TdfireBinary`，以及源码依赖时的 subspec ，并且让后者的所有 subspec 依赖 `TdfireBinary`
data/cocoapods-tdfire-binary.gemspec CHANGED
@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
21
21
  spec.add_development_dependency 'bundler', '~> 1.3'
22
22
  spec.add_development_dependency 'rake', '~> 12.0'
23
23
 
24
- spec.add_dependency 'cocoapods', '~> 1.4'
24
+ spec.add_dependency 'cocoapods', '~> 1.5'
25
25
  spec.add_dependency 'cocoapods-packager', '~> 1.5.0'
26
26
  end
data/lib/cocoapods-tdfire-binary/binary_specification_refactor.rb CHANGED
@@ -70,8 +70,8 @@ module Tdfire
70
70
  def configure_binary_with_reference_spec(spec)
71
71
  # 组件 frameworks 的依赖
72
72
  target_spec.vendored_frameworks = "#{target_spec.root.name}.framework"
73
- target_spec.source_files = "#{target_spec.root.name}.framework/Headers/*"
74
- target_spec.public_header_files = "#{target_spec.root.name}.framework/Headers/*"
73
+ # target_spec.source_files = "#{target_spec.root.name}.framework/Headers/*"
74
+ # target_spec.public_header_files = "#{target_spec.root.name}.framework/Headers/*"
75
75
 
76
76
  # 保留对 frameworks lib 的依赖
77
77
  %w[frameworks libraries weak_frameworks].each do |name|
@@ -137,7 +137,7 @@ module Tdfire
137
137
  echo "Tdfire: copying #{framework_name} ..."
138
138
 
139
139
  unzip #{framework_name}.zip
140
- cp -fr #{framework_name} ../
140
+ cp -fa #{framework_name} ../
141
141
  fi
142
142
 
143
143
  cd ..
data/lib/cocoapods-tdfire-binary/binary_url_manager.rb CHANGED
@@ -30,8 +30,8 @@ module Tdfire
30
30
  end
31
31
 
32
32
  def self.private_cocoapods_url
33
- "git@git.2dfire-inc.com:ios/cocoapods-spec.git"
34
- # "git@git.2dfire-inc.com:qingmu/private_cocoapods.git"
33
+ # "git@git.2dfire-inc.com:ios/cocoapods-spec.git"
34
+ "git@git.2dfire-inc.com:qingmu/private_cocoapods.git"
35
35
  end
36
36
 
37
37
  def self.template_lib_url
data/lib/cocoapods-tdfire-binary/command/binary.rb CHANGED
@@ -15,8 +15,8 @@ module Pod
15
15
  2Dfire 二进制工具库，提供打包、lint、推送、拉取、发布等命令
16
16
  DESC
17
17
 
18
- FIRE_FLAG = "2dfire"
19
- # FIRE_FLAG = "private"
18
+ # FIRE_FLAG = "2dfire"
19
+ FIRE_FLAG = "private"
20
20
 
21
21
  def first_podspec
22
22
  Dir["#{Dir.pwd}/*.podspec"].first
data/lib/cocoapods-tdfire-binary/gem_version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module CocoapodsTdfireBinary
2
- VERSION = "1.0.0"
2
+ VERSION = "1.0.1"
3
3
  end
data/lib/cocoapods-tdfire-binary/podfile_hook.rb CHANGED
@@ -43,27 +43,29 @@ module CocoapodsTdfireBinary
43
43
  # end
44
44
  end
45
45
 
46
- #fix `Shell Script` Build Phase Fails When Input / Output Files List is Too Large
47
46
  Pod::HooksManager.register('cocoapods-tdfire-binary', :post_install) do |context, _|
48
- Pod::UI.section('Tdfire: auto clean input and output files') do
49
- context.umbrella_targets.map(&:user_targets).flatten.uniq.each do |t|
50
- phase = t.shell_script_build_phases.find { |p| p.name.include?(Pod::Installer::UserProjectIntegrator::TargetIntegrator::COPY_PODS_RESOURCES_PHASE_NAME) }
47
+ # CocoaPods 1.5.0 修复了此问题
48
+ #
49
+ # fix `Shell Script` Build Phase Fails When Input / Output Files List is Too Large
50
+ # Pod::UI.section('Tdfire: auto clean input and output files') do
51
+ # context.umbrella_targets.map(&:user_targets).flatten.uniq.each do |t|
52
+ # phase = t.shell_script_build_phases.find { |p| p.name.include?(Pod::Installer::UserProjectIntegrator::TargetIntegrator::COPY_PODS_RESOURCES_PHASE_NAME) }
51
53
 
52
- max_input_output_paths = 1000
53
- input_output_paths = phase.input_paths.count + phase.output_paths.count
54
- Pod::UI.message "Tdfire: input paths and output paths count for #{t.name} : #{input_output_paths}"
54
+ # max_input_output_paths = 1000
55
+ # input_output_paths = phase.input_paths.count + phase.output_paths.count
56
+ # Pod::UI.message "Tdfire: input paths and output paths count for #{t.name} : #{input_output_paths}"
55
57
 
56
- if input_output_paths > max_input_output_paths
57
- phase.input_paths.clear
58
- phase.output_paths.clear
59
- end
58
+ # if input_output_paths > max_input_output_paths
59
+ # phase.input_paths.clear
60
+ # phase.output_paths.clear
61
+ # end
60
62
 
61
- end
63
+ # end
62
64
 
63
- context.umbrella_targets.map(&:user_project).each do |project|
64
- project.save
65
- end
66
- end
65
+ # context.umbrella_targets.map(&:user_project).each do |project|
66
+ # project.save
67
+ # end
68
+ # end
67
69
 
68
70
  Pod::UI.puts "Tdfire: all source dependency pods: #{BinaryStateStore.real_use_source_pods.join(', ')}" if BinaryStateStore.use_binary?
69
71
  Pod::UI.puts "Tdfire: all unpublished pods: #{BinaryStateStore.unpublished_pods.join(', ')}"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cocoapods-tdfire-binary
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - tripleCC
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-04-04 00:00:00.000000000 Z
11
+ date: 2018-04-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '1.4'
47
+ version: '1.5'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: '1.4'
54
+ version: '1.5'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: cocoapods-packager
57
57
  requirement: !ruby/object:Gem::Requirement