cocoapods-fy-bin 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83385deb51078791c39ba4968f989f6a468bb8da5605dce88f9fa9a69fb65000
-  data.tar.gz: 78d9204eed0956a83025a228b8aac72d562ef9f351c1ebc9c91b55120004e68b
+  metadata.gz: 82f7afcca88450b45007d5c07cf393892ab0ea960704a581a1586b589a2a1cf0
+  data.tar.gz: 6912610afce0c9dc5b2d855769814ec7aa72b9347a0dccd55d13b0935b4c691b
 SHA512:
-  metadata.gz: 6ebaed0b8a01c84b64eff0897159a7301a1656c1e88ea66b20fcef790d17494e68df96a738d0a157601226dd238935076472650b1c1dfefac9f89fe96b84b1c7
-  data.tar.gz: 7c20988186ac2e2e3211d9307f1f5779451539c1b4e0b17632de7a34089f46f9c4ff06b3b3e19c8e65f5db726ab9f9f1f01c9a9dd74b58d4e212cc332d5ff34b
+  metadata.gz: 3df0dde8075533c59d59d1fba10315032f42076672af1934798db9dccdddbd5ff2883decfee8a2cac2f4b677df2de6ef01b9aa5d029f076d30e32ff2d4bcc4a9
+  data.tar.gz: 962acbdb51b7d86eabb857df736e8bfdb1bf8a403ffd1db6adf6de0f0a43422b2379fc8cdf86a6d076586f2ec9c224200e26d370003994fbea1a89edec271f11

data/lib/cocoapods-fy-bin/command/bin/archive.rb

@@ -170,6 +170,7 @@ module Pod
                   "--sources=#{sources_option(@code_dependencies, @sources)}",
                   "--gen-directory=#{CBin::Config::Builder.instance.gen_dir}",
                   '--clean',
+                  '--platforms=ios',
                   *@additional_args
                 ]
 

data/lib/cocoapods-fy-bin/gem_version.rb

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.2.2'
+  VERSION = '0.2.4'
 end
 
 module Pod

data/lib/cocoapods-fy-bin/helpers/framework_builder.rb

@@ -203,11 +203,11 @@ module CBin
       def target_name
         #区分多平台，如配置了多平台，会带上平台的名字
         # 如libwebp-iOS
-        if @spec.available_platforms.count > 1
-          "#{@spec.name}-#{Platform.string_name(@spec.consumer(@platform).platform_name)}"
-        else
+        # if @spec.available_platforms.count > 1
+        #   "#{@spec.name}-#{Platform.string_name(@spec.consumer(@platform).platform_name)}"
+        # else
           @spec.name
-        end
+        # end
       end
 
       # 编译前需执行的的shell脚本
@@ -348,46 +348,46 @@ module CBin
         swift_module_map_dir = "./build-#{arch}/#{treated_framework_name}.framework/Modules/#{treated_framework_name}.swiftmodule"
         if File.exist?(swift_module_map_dir)
           `ditto #{swift_module_map_dir} #{framework.swift_module_path}`
-          # 解决module与class名称冲突问题
-          # swift_module_dir_path = File.expand_path(framework.swift_module_path)
-          #
-          # exclude_frameworks = ["Foundation","Swift","UIKit","_Concurrency"]
-          # Dir.chdir(swift_module_dir_path) {
-          #   if File.exist?("./arm64.swiftinterface")
-          #     arr = IO.readlines("arm64.swiftinterface")
-          #     arr.map { |item|
-          #       if item.include?("import ")
-          #         items = item.split(" ")
-          #         item_last = items.last
-          #         if !exclude_frameworks.include?(item_last)
-          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.Method/#{item_last}BDF\\.Method/g' {} \\;`
-          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.#{item_last}/#{item_last}ACE\\.#{item_last}BDF/g' {} \\;`
-          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\./#{item_last}ACE\\./g' {} \\;`
-          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}ACE\\.//g' {} \\;`
-          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}BDF/#{item_last}/g' {} \\;`
-          #           `find . -name "*.swiftinterface-e" | xargs rm -rf`
-          #         end
-          #       end
-          #     }
-          #   end
-          #   if File.exist?("./arm64-apple-ios.swiftinterface")
-          #     arr = IO.readlines("arm64-apple-ios.swiftinterface")
-          #     arr.map { |item|
-          #       if item.include?("import ")
-          #         items = item.split(" ")
-          #         item_last = items.last
-          #         if !exclude_frameworks.include?(item_last)
-          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.Method/#{item_last}BDF\\.Method/g' {} \\;`
-          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.#{item_last}/#{item_last}ACE\\.#{item_last}BDF/g' {} \\;`
-          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\./#{item_last}ACE\\./g' {} \\;`
-          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}ACE\\.//g' {} \\;`
-          #           `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}BDF/#{item_last}/g' {} \\;`
-          #           `find . -name "*.swiftinterface-e" | xargs rm -rf`
-          #         end
-          #       end
-          #     }
-          #   end
-          # }
+          #解决module与class名称冲突问题
+          swift_module_dir_path = File.expand_path(framework.swift_module_path)
+
+          exclude_frameworks = ["Foundation","Swift","UIKit","_Concurrency"]
+          Dir.chdir(swift_module_dir_path) {
+            # if File.exist?("./arm64.swiftinterface")
+            #   arr = IO.readlines("arm64.swiftinterface")
+            #   arr.map { |item|
+            #     if item.include?("import ")
+            #       items = item.split(" ")
+            #       item_last = items.last
+            #       if !exclude_frameworks.include?(item_last)
+            #         `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.Method/#{item_last}BDF\\.Method/g' {} \\;`
+            #         `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.#{item_last}/#{item_last}ACE\\.#{item_last}BDF/g' {} \\;`
+            #         `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\./#{item_last}ACE\\./g' {} \\;`
+            #         `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}ACE\\.//g' {} \\;`
+            #         `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}BDF/#{item_last}/g' {} \\;`
+            #         `find . -name "*.swiftinterface-e" | xargs rm -rf`
+            #       end
+            #     end
+            #   }
+            # end
+            if File.exist?("./arm64-apple-ios.swiftinterface")
+              arr = IO.readlines("arm64-apple-ios.swiftinterface")
+              arr.map { |item|
+                if item.include?("import ")
+                  items = item.split(" ")
+                  item_last = items.last
+                  if !exclude_frameworks.include?(item_last)
+                    `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.Method/#{item_last}BDF\\.Method/g' {} \\;`
+                    `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\.#{item_last}/#{item_last}ACE\\.#{item_last}BDF/g' {} \\;`
+                    `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}\\./#{item_last}ACE\\./g' {} \\;`
+                    `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}ACE\\.//g' {} \\;`
+                    `find . -name "*.swiftinterface" -exec sed -i -e 's/#{item_last}BDF/#{item_last}/g' {} \\;`
+                    `find . -name "*.swiftinterface-e" | xargs rm -rf`
+                  end
+                end
+              }
+            end
+          }
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-fy-bin
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - dr
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2022-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel