cocoapods-fy-bin 0.0.3 → 0.0.4

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.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/cocoapods-fy-bin/gem_version.rb +1 -1
  3. data/lib/cocoapods-fy-bin/helpers/framework_builder.rb +41 -26
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: dbd6a96a75872847c4d3ffa42076280cb90f67aa4cd2e74797f9d5a790868b16
4
- data.tar.gz: 8eaf53a48a9b6b8a45a21af3882555e2be94ed0ceac822b70d3e3e13df83598c
3
+ metadata.gz: fabe41cc6cda2f5994cb55fa2c3385f5ae5df84cd585763ae319659098cd0e7e
4
+ data.tar.gz: e4cb60fbd085a56011ca5345bd1ae9764a73a1478de19fe1c49b95211fad730b
5
5
  SHA512:
6
- metadata.gz: fd12f4edf60d61d00355766162b006e65b8860b3b0f62c40c9cbb09dece4ad9b20325425ceca2f87f35c7550e5f0cb5c1d7ba50f17def194e763f7b26af1c78d
7
- data.tar.gz: bfc73167c0affefa93ed0be862b1cd913e8d75ecabf3a18057b1467bbc26344018fbefc1627c32828526bcf951369a0d054b473e6fbf6636c8986742a4a304d6
6
+ metadata.gz: 528c535a2d41e5bc101aabc3a8891fb3d605f7a85441b02b07c85f5ea069aadffb642b6292ef30053c97d075ca730f5d7d922d98eabd611cf9139b02a0612dc6
7
+ data.tar.gz: 4c1707bbd3842bc0a38e7f61ea427c0c19163cc69e9e104c51a4ca0dd9b2b7079635fae7b2c10d480981b9ff874d5c3b4fddbae0cda137f215f3226180d117e9
data/lib/cocoapods-fy-bin/gem_version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
 
2
2
  module CBin
3
- VERSION = '0.0.3'
3
+ VERSION = '0.0.4'
4
4
  end
5
5
 
6
6
  module Pod
data/lib/cocoapods-fy-bin/helpers/framework_builder.rb CHANGED
@@ -167,7 +167,7 @@ module CBin
167
167
 
168
168
  def compile
169
169
  defines = "GCC_PREPROCESSOR_DEFINITIONS='$(inherited)'"
170
- defines += ' '
170
+ defines += " SWIFT_ACTIVE_COMPILATION_CONDITIONS='$(inherited)' "
171
171
  defines += @spec.consumer(@platform).compiler_flags.join(' ')
172
172
 
173
173
  options = ios_build_options
@@ -203,6 +203,7 @@ module CBin
203
203
 
204
204
  unless File.exist?("Pods.xcodeproj") #cocoapods-generate v2.0.0
205
205
  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"
206
+ puts command
206
207
  else
207
208
  command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{build_model} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
208
209
  end
@@ -295,31 +296,45 @@ module CBin
295
296
  if File.exist?(swift_module_map_dir)
296
297
  `ditto #{swift_module_map_dir} #{framework.swift_module_path}`
297
298
  # 解决module与class名称冲突问题
298
- swift_module_dir_path = File.expand_path(framework.swift_module_path)
299
-
300
- exclude_frameworks = ["Foundation","Swift","UIKit","_Concurrency"]
301
- Dir.chdir(swift_module_dir_path) {
302
- if File.exist?("./arm64.swiftinterface")
303
- arr = IO.readlines("arm64.swiftinterface")
304
- arr.map { |item|
305
- if item.include?("import ")
306
- items = item.split(" ")
307
- item_last = items.last
308
- if !exclude_frameworks.include?(item_last)
309
- `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.Method/#{item_last}BDF\\.Method/g' {} \\;`
310
- `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.#{item_last}/#{item_last}ACE\\.#{item_last}BDF/g' {} \\;`
311
- `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\./#{item_last}ACE\\./g' {} \\;`
312
- `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}ACE\\.//g' {} \\;`
313
- `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}BDF/#{item_last}/g' {} \\;`
314
- `find . -name "*.swiftinterface-e" | xargs rm -rf`
315
- end
316
- end
317
- }
318
- end
319
- # if File.exist?("./arm64-apple-ios.swiftinterface")
320
- # arr = IO.readlines("arm64-apple-ios.swiftinterface")
321
- # end
322
- }
299
+ # swift_module_dir_path = File.expand_path(framework.swift_module_path)
300
+ #
301
+ # exclude_frameworks = ["Foundation","Swift","UIKit","_Concurrency"]
302
+ # Dir.chdir(swift_module_dir_path) {
303
+ # if File.exist?("./arm64.swiftinterface")
304
+ # arr = IO.readlines("arm64.swiftinterface")
305
+ # arr.map { |item|
306
+ # if item.include?("import ")
307
+ # items = item.split(" ")
308
+ # item_last = items.last
309
+ # if !exclude_frameworks.include?(item_last)
310
+ # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.Method/#{item_last}BDF\\.Method/g' {} \\;`
311
+ # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.#{item_last}/#{item_last}ACE\\.#{item_last}BDF/g' {} \\;`
312
+ # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\./#{item_last}ACE\\./g' {} \\;`
313
+ # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}ACE\\.//g' {} \\;`
314
+ # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}BDF/#{item_last}/g' {} \\;`
315
+ # `find . -name "*.swiftinterface-e" | xargs rm -rf`
316
+ # end
317
+ # end
318
+ # }
319
+ # end
320
+ # if File.exist?("./arm64-apple-ios.swiftinterface")
321
+ # arr = IO.readlines("arm64-apple-ios.swiftinterface")
322
+ # arr.map { |item|
323
+ # if item.include?("import ")
324
+ # items = item.split(" ")
325
+ # item_last = items.last
326
+ # if !exclude_frameworks.include?(item_last)
327
+ # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.Method/#{item_last}BDF\\.Method/g' {} \\;`
328
+ # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.#{item_last}/#{item_last}ACE\\.#{item_last}BDF/g' {} \\;`
329
+ # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\./#{item_last}ACE\\./g' {} \\;`
330
+ # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}ACE\\.//g' {} \\;`
331
+ # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}BDF/#{item_last}/g' {} \\;`
332
+ # `find . -name "*.swiftinterface-e" | xargs rm -rf`
333
+ # end
334
+ # end
335
+ # }
336
+ # end
337
+ # }
323
338
  end
324
339
  end
325
340
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cocoapods-fy-bin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.3
4
+ version: 0.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - dr
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-08-24 00:00:00.000000000 Z
11
+ date: 2022-08-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: parallel