cocoapods-tdf-bin 0.0.32 → 0.0.34
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/cocoapods-tdf-bin/command/bin/auto.rb +1 -1
- data/lib/cocoapods-tdf-bin/gem_version.rb +1 -1
- data/lib/cocoapods-tdf-bin/helpers/build_helper.rb +1 -1
- data/lib/cocoapods-tdf-bin/helpers/framework_builder.rb +7 -3
- data/lib/cocoapods-tdf-bin/helpers/spec_source_creator.rb +8 -4
- data/lib/cocoapods-tdf-bin/native/resolver.rb +6 -6
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c1bc4f3966acc0b64ba2011ec32fceb515874a96171be9386f174483f6701e14
|
4
|
+
data.tar.gz: 7c3a845cd00bcc95a86d72177cc9d1cc87930b24567a76e4fa469a9cbe6e3624
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0cf97f19e6a20e1fdeb7b828966960adb7a543fd9b0b290e544b3f9f3dcfb5eb637b10e2b01b2e98436066285e41e9a47b1d76cf2f561dd5364188050317317f
|
7
|
+
data.tar.gz: 8eac599f85262658b32e117b38048775f8edde71f16087e82dbbe2bd1c3317d7a050aee7900eabce30f0aae0484deccf8f6a6e054d62d03ef87500d884eff53d
|
@@ -71,7 +71,7 @@ module Pod
|
|
71
71
|
if !@only_build
|
72
72
|
source_specs.uniq.each do |spec|
|
73
73
|
begin
|
74
|
-
fail_push_specs << spec unless CBin::Upload::Helper.new(spec
|
74
|
+
fail_push_specs << spec unless CBin::Upload::Helper.new(spec, @code_dependencies, @sources).upload
|
75
75
|
rescue Object => exception
|
76
76
|
UI.puts exception
|
77
77
|
fail_push_specs << spec
|
@@ -69,7 +69,7 @@ module CBin
|
|
69
69
|
source_dir = zip_dir
|
70
70
|
file_accessor = Sandbox::FileAccessor.new(Pathname.new('.').expand_path, @spec.consumer(@platform))
|
71
71
|
Dir.chdir(workspace_directory) do
|
72
|
-
builder = CBin::Library::Builder.new(@spec, file_accessor, @platform, source_dir
|
72
|
+
builder = CBin::Library::Builder.new(@spec, file_accessor, @platform, source_dir, @framework_path)
|
73
73
|
builder.build
|
74
74
|
end
|
75
75
|
end
|
@@ -31,7 +31,10 @@ module CBin
|
|
31
31
|
end
|
32
32
|
|
33
33
|
def build
|
34
|
+
# 编译出 arm64 的包
|
34
35
|
defines = compile
|
36
|
+
|
37
|
+
# 编译出 x86_64的包
|
35
38
|
build_sim_libraries(defines)
|
36
39
|
|
37
40
|
defines
|
@@ -44,6 +47,7 @@ module CBin
|
|
44
47
|
build_xcframework_for_ios
|
45
48
|
# build_static_library_for_ios
|
46
49
|
|
50
|
+
# 整理 spec 的资源文件到 framework
|
47
51
|
copy_resources
|
48
52
|
|
49
53
|
# link_header
|
@@ -180,7 +184,7 @@ module CBin
|
|
180
184
|
archs = ios_architectures
|
181
185
|
# archs = %w[arm64 armv7 armv7s]
|
182
186
|
archs.map do |arch|
|
183
|
-
xcodebuild(defines, "ARCHS=\'#{arch}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'","build-#{arch}"
|
187
|
+
xcodebuild(defines, "ARCHS=\'#{arch}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'","build-#{arch}", @build_model)
|
184
188
|
end
|
185
189
|
# else
|
186
190
|
# xcodebuild(defines,options)
|
@@ -206,9 +210,9 @@ module CBin
|
|
206
210
|
def xcodebuild(defines = '', args = '', build_dir = 'build', build_model = 'Debug')
|
207
211
|
|
208
212
|
unless File.exist?("Pods.xcodeproj") #cocoapods-generate v2.0.0
|
209
|
-
command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{File.join(File.expand_path("..", build_dir), File.basename(build_dir))} clean build -configuration #{build_model} -target #{target_name} -project ./Pods/Pods.xcodeproj 2>&1"
|
213
|
+
command = "xcodebuild #{defines} #{args} CODE_SIGN_IDENTITY='' CONFIGURATION_BUILD_DIR=#{File.join(File.expand_path("..", build_dir), File.basename(build_dir))} clean build -configuration #{build_model} -target #{target_name} -project ./Pods/Pods.xcodeproj 2>&1"
|
210
214
|
else
|
211
|
-
command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{build_model} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
|
215
|
+
command = "xcodebuild #{defines} #{args} CODE_SIGN_IDENTITY='' CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{build_model} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
|
212
216
|
end
|
213
217
|
|
214
218
|
UI.message "command = #{command}"
|
@@ -181,13 +181,17 @@ module CBin
|
|
181
181
|
suc_spec.delete('osx')
|
182
182
|
suc_spec.delete('tvos')
|
183
183
|
suc_spec.delete('watchos')
|
184
|
-
|
185
|
-
platforms.delete('osx')
|
186
|
-
platforms.delete('tvos')
|
187
|
-
platforms.delete('watchos')
|
184
|
+
|
188
185
|
if deps_hash != nil
|
189
186
|
dependencies = dependencies.merge(deps_hash)
|
190
187
|
end
|
188
|
+
|
189
|
+
platforms = suc_spec["platforms"]
|
190
|
+
if platforms != nil
|
191
|
+
platforms.delete('osx')
|
192
|
+
platforms.delete('tvos')
|
193
|
+
platforms.delete('watchos')
|
194
|
+
end
|
191
195
|
rescue
|
192
196
|
end
|
193
197
|
}
|
@@ -154,10 +154,10 @@ module Pod
|
|
154
154
|
|
155
155
|
spec_version = rspec.spec.version
|
156
156
|
|
157
|
-
if use_binary
|
158
|
-
|
159
|
-
|
160
|
-
end
|
157
|
+
# if use_binary
|
158
|
+
# UI.message 'cocoapods-tdf-bin 插件'
|
159
|
+
# UI.message "- 开始处理 #{rspec.spec.name} #{spec_version} 组件."
|
160
|
+
# end
|
161
161
|
|
162
162
|
if @@build_dependencies_only_build
|
163
163
|
missing_binary_specs << rspec.spec
|
@@ -216,8 +216,8 @@ module Pod
|
|
216
216
|
#缓存没有二进制组件到spec文件,local_psec_dir 目录
|
217
217
|
sources_sepc = []
|
218
218
|
des_dir = CBin::Config::Builder.instance.local_psec_dir
|
219
|
-
FileUtils.rm_f(des_dir) if File.exist?des_dir
|
220
|
-
Dir.mkdir des_dir unless File.exist?des_dir
|
219
|
+
FileUtils.rm_f(des_dir) if File.exist? des_dir
|
220
|
+
Dir.mkdir des_dir unless File.exist? des_dir
|
221
221
|
missing_binary_specs.uniq.each do |spec|
|
222
222
|
next if spec.name.include?('/')
|
223
223
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cocoapods-tdf-bin
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.34
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- gaijiaofan
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-12-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: parallel
|