cocoapods-bb-bin 0.2.7.11 → 0.2.7.12

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1e334d566dee758f5c2592d2ffc72b863255d1f08759cf59650b4abe59b6e8d2
4
- data.tar.gz: adddf8822527acd261a9e967e261b3008a996086a507199548d61bbfaf690ea8
3
+ metadata.gz: ef6e723659917a02b23b7fa92a8e34630bd1d6526cb9d972f8583a570f12bfde
4
+ data.tar.gz: a3620ac0ba8003bda68bf6d57af984e77f6a0143795f5e72ec0db8632eccd02c
5
5
  SHA512:
6
- metadata.gz: 9e59446bca139135c8ad404215322afdf29fae1ee434cd7aabfaa85393271a995ed832bedb23fb8b27446c037a463acb0c6e6365219821d3bdf82f145d213117
7
- data.tar.gz: 445592c43862620d945773a09fd440c4a13fcc54febcccbffb792a58ab01cfc6454caedc9516985caa16a48f7938ffd9185eb1979b257cc9ff3dec679f8afd30
6
+ metadata.gz: e24a99b89a9bfc8245e02e70640f989bbbef0cfefd99cff3652d7df387a892b9e1d1152a021f8c67f949d89fe9a3c87ccf006b114cf6a4ab711139ae6e2771e9
7
+ data.tar.gz: 8c5169d2da2229bd14ae8959d520bf5539fad6efed981a46952fd0c32431d81e0abcc6421e33c05ba11ae81aa261cd6e49cbe41103db9f30d8efd8c3a1a07e94
@@ -1,7 +1,7 @@
1
1
  require 'cocoapods'
2
2
 
3
3
  module CBin
4
- VERSION = '0.2.7.11'
4
+ VERSION = '0.2.7.12'
5
5
  end
6
6
 
7
7
  module Pod
@@ -50,8 +50,8 @@ module CBin
50
50
  end
51
51
 
52
52
  @filename = file
53
- # Pod::UI::puts "===copy origin file: #{file}"
54
- # Pod::UI::puts "===copy desc file: #{sourceSpecFilePath}"
53
+ # Pod::UI::puts "===copy origin file: #{file}".red
54
+ # Pod::UI::puts "===copy desc file: #{sourceSpecFilePath}".red
55
55
  # 拷贝二进制spec到源码spec by hm 22/1/19
56
56
  `cp -fa #{file} #{sourceSpecFilePath}`
57
57
  end
@@ -149,15 +149,27 @@ module CBin
149
149
  # vendored_frameworks | resources | source | source_files | public_header_files
150
150
  # license | resource_bundles | vendored_libraries
151
151
 
152
+ fkname = "#{frameworkName}.{framework,xcframework}" # 支持framework、xcframework
152
153
  # Project Linkin
153
- @spec.vendored_frameworks = "#{frameworkName}.{framework,xcframework}" # 支持framework、xcframework
154
+ @spec.vendored_frameworks = "#{fkname}"
154
155
 
155
156
  # Resources # framework以业务方自己配置为主 by hm 23/10/18
156
157
  extnames = []
157
158
  extnames << '*.bundle' if code_spec_consumer.resource_bundles.any?
158
159
  if code_spec_consumer.resources.any?
159
160
  # extnames += code_spec_consumer.resources.map { |r| File.basename(r) }
160
- extnames = code_spec_consumer.resources
161
+ puts "create_framework_from_code_spec extnames:#{extnames}".red
162
+ puts "code_spec_consumer:#{code_spec_consumer}".red
163
+ puts "is_xcframework:#{is_xcframework}".red
164
+ # 自有库bundle需要修改路径,二进制生成在xx.xcframework/xx.bundle by hm 24/2/28
165
+ if is_xcframework == true
166
+ code_spec_consumer.resources.map { |r|
167
+ bundle_comp = File.basename(r)
168
+ extnames << "#{fkname}/#{bundle_comp}"
169
+ }
170
+ else
171
+ extnames = code_spec_consumer.resources
172
+ end
161
173
  end
162
174
  if extnames.any?
163
175
  @spec.resources = extnames
@@ -37,7 +37,17 @@ module CBin
37
37
  isupload = binary_upload(zip_file)
38
38
  puts "上传二进制文件完成 状态:#{isupload}".green
39
39
  if isupload
40
- is_xcframework = zip_file.include?('xcframework.zip')
40
+ is_xcframework = false
41
+ [
42
+ "xcframework.zip", # 三方库
43
+ "xcframework_#{@spec.version}.zip", # 自有库
44
+ ].each do |name|
45
+ is_xcframework = zip_file.include?(name)
46
+ if is_xcframework == true
47
+ break
48
+ end
49
+ end
50
+ # is_xcframework = zip_file.include?('xcframework.zip')
41
51
  filename = spec_creator(vendored_framework_name, is_xcframework)
42
52
  Pod::UI.puts "上传二进制 podspec: #{filename} zip:#{zip_file} 是否动态库: #{isGenDylib} vendored_framework_name:#{vendored_framework_name} is_xcframework:#{is_xcframework}"
43
53
  push_helper = CBin::Push::Helper.new()
@@ -61,6 +61,14 @@ module CBin
61
61
  target_dir = File.join(framework_folder_path,framework_name)
62
62
  return target_dir
63
63
  end
64
+ def podspec_name
65
+ file_name = "#{@spec.name}.podspec.json"
66
+ return file_name
67
+ end
68
+ def podspec_file_path
69
+ target_dir = File.join(framework_folder_path,podspec_name)
70
+ return target_dir
71
+ end
64
72
 
65
73
  def cp_to_source_dir
66
74
 
@@ -75,7 +83,14 @@ module CBin
75
83
  # FileUtils.mkdir_p(zip_dir) unless File.exist?(zip_dir)
76
84
 
77
85
  UI.puts "Compressing #{framework_file_path} into #{target_dir}"
86
+
87
+ # `cp -fa #{framework_file_path} #{target_dir}` # xcframework文件拷贝
78
88
  `cp -fa #{framework_file_path} #{target_dir} && rm -rf #{framework_folder_path}` # xcframework文件拷贝 & 删除源文件
89
+
90
+ # 是否可以考虑以xcframework配置为主???
91
+ # spec_dir = CBin::Config::Builder.instance.local_psec_dir
92
+ # puts "spec_dir:#{spec_dir}".red
93
+ # `cp -fa #{podspec_file_path} #{spec_dir} && ls -al #{spec_dir}`
79
94
  end
80
95
  end
81
96
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cocoapods-bb-bin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.7.11
4
+ version: 0.2.7.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - humin
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-12-05 00:00:00.000000000 Z
11
+ date: 2024-02-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: parallel
@@ -70,7 +70,7 @@ dependencies:
70
70
  requirements:
71
71
  - - ">="
72
72
  - !ruby/object:Gem::Version
73
- version: 0.2.6.3
73
+ version: 0.2.6.4
74
74
  - - "<"
75
75
  - !ruby/object:Gem::Version
76
76
  version: '1.0'
@@ -80,7 +80,7 @@ dependencies:
80
80
  requirements:
81
81
  - - ">="
82
82
  - !ruby/object:Gem::Version
83
- version: 0.2.6.3
83
+ version: 0.2.6.4
84
84
  - - "<"
85
85
  - !ruby/object:Gem::Version
86
86
  version: '1.0'
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
206
206
  - !ruby/object:Gem::Version
207
207
  version: '0'
208
208
  requirements: []
209
- rubygems_version: 3.4.22
209
+ rubygems_version: 3.5.6
210
210
  signing_key:
211
211
  specification_version: 4
212
212
  summary: cocoapods-bb-bin is a plugin which helps develpers switching pods between