cocoapods-fy-bin 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbd6a96a75872847c4d3ffa42076280cb90f67aa4cd2e74797f9d5a790868b16
-  data.tar.gz: 8eaf53a48a9b6b8a45a21af3882555e2be94ed0ceac822b70d3e3e13df83598c
+  metadata.gz: fabe41cc6cda2f5994cb55fa2c3385f5ae5df84cd585763ae319659098cd0e7e
+  data.tar.gz: e4cb60fbd085a56011ca5345bd1ae9764a73a1478de19fe1c49b95211fad730b
 SHA512:
-  metadata.gz: fd12f4edf60d61d00355766162b006e65b8860b3b0f62c40c9cbb09dece4ad9b20325425ceca2f87f35c7550e5f0cb5c1d7ba50f17def194e763f7b26af1c78d
-  data.tar.gz: bfc73167c0affefa93ed0be862b1cd913e8d75ecabf3a18057b1467bbc26344018fbefc1627c32828526bcf951369a0d054b473e6fbf6636c8986742a4a304d6
+  metadata.gz: 528c535a2d41e5bc101aabc3a8891fb3d605f7a85441b02b07c85f5ea069aadffb642b6292ef30053c97d075ca730f5d7d922d98eabd611cf9139b02a0612dc6
+  data.tar.gz: 4c1707bbd3842bc0a38e7f61ea427c0c19163cc69e9e104c51a4ca0dd9b2b7079635fae7b2c10d480981b9ff874d5c3b4fddbae0cda137f215f3226180d117e9

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end
 
 module Pod

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

@@ -167,7 +167,7 @@ module CBin
 
       def compile
         defines = "GCC_PREPROCESSOR_DEFINITIONS='$(inherited)'"
-        defines += ' '
+        defines += "  SWIFT_ACTIVE_COMPILATION_CONDITIONS='$(inherited)' "
         defines += @spec.consumer(@platform).compiler_flags.join(' ')
 
         options = ios_build_options
@@ -203,6 +203,7 @@ module CBin
 
         unless File.exist?("Pods.xcodeproj") #cocoapods-generate v2.0.0
           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"
+          puts command
         else
           command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{build_model} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
         end
@@ -295,31 +296,45 @@ module CBin
         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")
-            # end
-          }
+          # 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.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - dr
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel