cocoapods-fy-bin 0.2.1 → 0.2.3

Sign up to get free protection for your applications and to get access to all the features.
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 -40
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 335289349d8859930f7022c04a9c275974c56e7c714945ea06056043cffb0186
4
- data.tar.gz: bf009a1fec70c6abd2a411aaef09878f81912524e380a0a28e49821eeab9f77a
3
+ metadata.gz: ffe0a4c864648fcc5fd7786bbab2158ab889b6df901dae86c10d56ed24bf92c0
4
+ data.tar.gz: 12dcec3f789d8a9befd685e49d08e412300f27d8c9294037b1006af65e95c3dc
5
5
  SHA512:
6
- metadata.gz: f7403715854a4364cc9c9b8a57a25dfa2a1c34ad0c6d1210823a07769aca6e5659accd79e9a297fc3e8c0f96d5caa68a9d1d72b8c1cebace34edb17d12fe0e4b
7
- data.tar.gz: 298602484707e85f7600d914dca890376c9fb032c3eb79fa771eef5d0d079658090926f8bdd5e1c4bb8b98058cc2883400251810390f659b814e0211622a6ec8
6
+ metadata.gz: 54dd90f9752610b875d320906d7d8d645b393a7ef260f0f1edb2735bd39eec07b4e18010d756c17d512d41c968ec770384cec9c491adad209d2c95df7369052d
7
+ data.tar.gz: d82b9ecb4ca558e9f42df83781a094eae7655749c4a8e080e979c64c91d984433e41798e7e7e36c6420aa97e3bcdb3edb2019e98797a570e559a04d4f9e5a908
data/lib/cocoapods-fy-bin/gem_version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
 
2
2
  module CBin
3
- VERSION = '0.2.1'
3
+ VERSION = '0.2.3'
4
4
  end
5
5
 
6
6
  module Pod
data/lib/cocoapods-fy-bin/helpers/framework_builder.rb CHANGED
@@ -178,6 +178,7 @@ module CBin
178
178
  defines += "GCC_PREPROCESSOR_DEFINITIONS='$(inherited)'"
179
179
  defines += " SWIFT_ACTIVE_COMPILATION_CONDITIONS='$(inherited)' "
180
180
  defines += @spec.consumer(@platform).compiler_flags.join(' ')
181
+ defines += " CODE_SIGN_IDENTITY='' "
181
182
  # options = ios_build_options
182
183
  # if is_debug_model
183
184
  archs = ios_architectures
@@ -347,46 +348,46 @@ module CBin
347
348
  swift_module_map_dir = "./build-#{arch}/#{treated_framework_name}.framework/Modules/#{treated_framework_name}.swiftmodule"
348
349
  if File.exist?(swift_module_map_dir)
349
350
  `ditto #{swift_module_map_dir} #{framework.swift_module_path}`
350
- # 解决module与class名称冲突问题
351
- # swift_module_dir_path = File.expand_path(framework.swift_module_path)
352
- #
353
- # exclude_frameworks = ["Foundation","Swift","UIKit","_Concurrency"]
354
- # Dir.chdir(swift_module_dir_path) {
355
- # if File.exist?("./arm64.swiftinterface")
356
- # arr = IO.readlines("arm64.swiftinterface")
357
- # arr.map { |item|
358
- # if item.include?("import ")
359
- # items = item.split(" ")
360
- # item_last = items.last
361
- # if !exclude_frameworks.include?(item_last)
362
- # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.Method/#{item_last}BDF\\.Method/g' {} \\;`
363
- # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.#{item_last}/#{item_last}ACE\\.#{item_last}BDF/g' {} \\;`
364
- # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\./#{item_last}ACE\\./g' {} \\;`
365
- # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}ACE\\.//g' {} \\;`
366
- # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}BDF/#{item_last}/g' {} \\;`
367
- # `find . -name "*.swiftinterface-e" | xargs rm -rf`
368
- # end
369
- # end
370
- # }
371
- # end
372
- # if File.exist?("./arm64-apple-ios.swiftinterface")
373
- # arr = IO.readlines("arm64-apple-ios.swiftinterface")
374
- # arr.map { |item|
375
- # if item.include?("import ")
376
- # items = item.split(" ")
377
- # item_last = items.last
378
- # if !exclude_frameworks.include?(item_last)
379
- # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.Method/#{item_last}BDF\\.Method/g' {} \\;`
380
- # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.#{item_last}/#{item_last}ACE\\.#{item_last}BDF/g' {} \\;`
381
- # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\./#{item_last}ACE\\./g' {} \\;`
382
- # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}ACE\\.//g' {} \\;`
383
- # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}BDF/#{item_last}/g' {} \\;`
384
- # `find . -name "*.swiftinterface-e" | xargs rm -rf`
385
- # end
386
- # end
387
- # }
388
- # end
389
- # }
351
+ #解决module与class名称冲突问题
352
+ swift_module_dir_path = File.expand_path(framework.swift_module_path)
353
+
354
+ exclude_frameworks = ["Foundation","Swift","UIKit","_Concurrency"]
355
+ Dir.chdir(swift_module_dir_path) {
356
+ # if File.exist?("./arm64.swiftinterface")
357
+ # arr = IO.readlines("arm64.swiftinterface")
358
+ # arr.map { |item|
359
+ # if item.include?("import ")
360
+ # items = item.split(" ")
361
+ # item_last = items.last
362
+ # if !exclude_frameworks.include?(item_last)
363
+ # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.Method/#{item_last}BDF\\.Method/g' {} \\;`
364
+ # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.#{item_last}/#{item_last}ACE\\.#{item_last}BDF/g' {} \\;`
365
+ # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\./#{item_last}ACE\\./g' {} \\;`
366
+ # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}ACE\\.//g' {} \\;`
367
+ # `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}BDF/#{item_last}/g' {} \\;`
368
+ # `find . -name "*.swiftinterface-e" | xargs rm -rf`
369
+ # end
370
+ # end
371
+ # }
372
+ # end
373
+ if File.exist?("./arm64-apple-ios.swiftinterface")
374
+ arr = IO.readlines("arm64-apple-ios.swiftinterface")
375
+ arr.map { |item|
376
+ if item.include?("import ")
377
+ items = item.split(" ")
378
+ item_last = items.last
379
+ if !exclude_frameworks.include?(item_last)
380
+ `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.Method/#{item_last}BDF\\.Method/g' {} \\;`
381
+ `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.#{item_last}/#{item_last}ACE\\.#{item_last}BDF/g' {} \\;`
382
+ `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\./#{item_last}ACE\\./g' {} \\;`
383
+ `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}ACE\\.//g' {} \\;`
384
+ `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}BDF/#{item_last}/g' {} \\;`
385
+ `find . -name "*.swiftinterface-e" | xargs rm -rf`
386
+ end
387
+ end
388
+ }
389
+ end
390
+ }
390
391
  end
391
392
  end
392
393
 
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.2.1
4
+ version: 0.2.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - dr
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-10-13 00:00:00.000000000 Z
11
+ date: 2022-12-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: parallel