cocoapods-jxedt 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abe43eae6c807ddde37ea7b81207987ba97882ffb07f19b6331d6e4ee3f0252a
-  data.tar.gz: 4de675f594a49c74c3c6542c4c39025cad621aefd62110f155b6da3634520137
+  metadata.gz: a6302e970ed73bc5b9e9d1c360b07866274dfef9c17cb525fbf421c18731a0af
+  data.tar.gz: bc7af03bb9f4754d6ad79011b9350f05008a311701236f69f5d8f265a85e1bd7
 SHA512:
-  metadata.gz: 5fe8e4a1d9f7f49bc3171c97372a60f540180124468b81e34dfd055aff059d4fed9d865c4b0a0a7298ea638d77d9876e709246fef564b94e03fb707a3ba23ee7
-  data.tar.gz: 5a2aad13e0ac630865c88ef177048fbca2ef7b5cf88cc783c4cf8d502ca01faddf7e1f9fb6fa1c2b5db1c339124cf3bafeea3425074cfe1789eb29e714d8229e
+  metadata.gz: 4792210d5b87ea5ed46be38635a2c6851a355c97cc964b59cfb8c35031bb5da0b18f36ac496ce59f031e9108cd469821ea3eb887bb22ecb6cf0b0744ecaaff4f
+  data.tar.gz: ae695a6d13a154a1b5d3f9fb060c1e8aabf346c719a8d5e3c2f76f07d4eb81260550796ef7721730b616090be5d0aaecd6ee726b85e6fbdd13ea51c7fd1aa4ec

data/lib/cocoapods-jxedt/binary/config.rb

@@ -18,6 +18,7 @@ module Jxedt
             :xcconfig_configuration_alias => "xcconfig文件中配置多configuration的别名（一定要唯一），用于搜索替换，我们用来支持多configuration的二进制。一般不需要设置，默认值为'cocoapods-jxedt-binary'",
             :framework_header_search_enabled => "开启binary的组件是否配置HEADER_SEARCH_PATH头文件搜索，兼容头文件引用的问题。默认为false",
             :silent_build => "静默编译，即不输出编译命令。默认true",
+            :fix_swiftinterface_pods => "修复swiftinterface的bug，即：组件中包含和module name同名的class，使用不同swift编译器编译时报错；需要填写需要修复的组件名称",
             :configurations => "支持的configuration配置，可以写字符串'Debug'或'Release'，也可以写多个'['Debug', 'Release']'。默认为'Release'",
             :xcframework => "编译结果是否为xcframework。默认false",
             :clean_build => "编译的时候是否clean build。默认true",
@@ -119,6 +120,11 @@ module Jxedt
             @dsl_config[:silent_build] || @dsl_config[:silent_build].nil?
         end
 
+        def should_fix_swiftinterface_bug?(target_name)
+            @fix_swiftinterface_pods = @dsl_config[:fix_swiftinterface_pods] || []
+            @fix_swiftinterface_pods.include?(target_name)
+        end
+
         def xcframework?
             @dsl_config[:xcframework] || false
         end
@@ -201,7 +207,12 @@ module Jxedt
         end
 
         def git_remote_repo
-            @remote ||= cache_repo[:remote]
+            @remote ||= begin
+                remote = cache_repo[:remote]
+                remote.chomp!('/') if remote.is_a?(String) # 去除最后的'/'
+                remote.strip! if remote.is_a?(String) # 去除左右空格、转义字符
+                remote
+            end
         end
 
         def cache_repo_enabled?

data/lib/cocoapods-jxedt/binary/helper/podfile_post_install_hook.rb

@@ -20,6 +20,7 @@ module Pod
             def handle_pods_project_configurations!(installer)
                 installer.pods_project.targets.each do |target|
                     target.build_configurations.each do |config|
+                        config.build_settings["BUILD_LIBRARY_FOR_DISTRIBUTION"] = "YES"
                         config.build_settings["CODE_SIGN_IDENTITY"] = "" if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
                     end
                 end

data/lib/cocoapods-jxedt/binary/pod-room/xcodebuild_command.rb

@@ -35,6 +35,16 @@ module Jxedt
         else
           collect_output(target, Dir[target_products_dir_of(target, sdks[0]) + "/*"])
         end
+
+        # fix swiftinterface bug
+        if target.defines_module? && Jxedt.config.should_fix_swiftinterface_bug?(target.label)
+          # https://developer.apple.com/forums/thread/123253
+          cmd = "find #{output_path(target)} -name '*.swiftinterface' -exec sed -i -e 's/#{target.product_module_name}\\.//g' {} \\;"
+          `#{cmd}`
+
+          Pod::UI.puts "- Fix Swiftinterface Bug: #{target}".magenta unless Jxedt.config.silent_build?
+          Pod::UI.puts_indented "$ #{cmd}" unless Jxedt.config.silent_build?
+        end
       end
     end
 

data/lib/cocoapods-jxedt/binary/targets/pod_target.rb

@@ -54,8 +54,6 @@ module Pod
       class BuildSettings
         # missing framework header search paths
         def missing_framework_header_search_path(pt)
-            return [] unless pt.frame_header_search_paths_enable?
-
             paths = []
             pt.file_accessors.each do |file_accessor|
                 # xcframeworks
@@ -123,7 +121,11 @@ module Pod
             alias_method :old_raw_header_search_paths, :_raw_header_search_paths
             def _raw_header_search_paths
                 header_search_paths = old_raw_header_search_paths
-                header_search_paths.concat pod_targets.flat_map { |pt| missing_framework_header_search_path(pt) }
+                header_search_paths.concat pod_targets.flat_map { |pt| 
+                    search_paths = []
+                    search_paths.concat missing_framework_header_search_path(pt) if pt.frame_header_search_paths_enable?
+                    search_paths
+                }
                 header_search_paths.uniq
             end
          end
@@ -134,7 +136,8 @@ module Pod
             alias_method :old_raw_header_search_paths, :_raw_header_search_paths
             def _raw_header_search_paths
                 header_search_paths = old_raw_header_search_paths
-                header_search_paths.concat dependent_targets.flat_map { |pt| missing_framework_header_search_path(pt) } if target.should_build?
+                # 两个条件都满足时添加header_search_paths
+                header_search_paths.concat dependent_targets.flat_map { |pt| missing_framework_header_search_path(pt) } if target.should_build? && target.frame_header_search_paths_enable?
                 header_search_paths.uniq
             end
 

data/lib/cocoapods-jxedt/command/binary/command/push.rb

@@ -12,11 +12,13 @@ module Pod
                     ]
                     def self.options
                         [
-                            ['--force-push', '强制推送组件二进制到远程，远程有相同的校验和会被本地覆盖']
+                            ['--force-push', '强制推送组件二进制到远程，远程有相同的校验和会被本地覆盖'],
+                            ['--name', '需要推送到远程的组件名称，不填则推送全部的二进制组件到远程']
                         ]
                     end
                     def initialize(argv)
                         @force_push = argv.flag?('force-push', false)
+                        @name = argv.option('name')
                         super
                     end
         
@@ -32,7 +34,10 @@ module Pod
                         require 'cocoapods-jxedt/git_helper/cache_pucher'
 
                         output_dir = Pod::Config.instance.sandbox.root + Jxedt.config.binary_dir
-                        Jxedt::CachePucher.push(output_dir, nil, @force_push)
+
+                        targets = []
+                        targets += @name.split(',') if @name && @name.length > 0
+                        Jxedt::CachePucher.push(output_dir, targets, @force_push)
                     end
                 end
             end

data/lib/cocoapods-jxedt/command/header/header.rb

@@ -75,7 +75,8 @@ module Pod
                         lines = File.readlines(file_path)
                         # 获取命中的行
                         File.foreach(file_path).with_index {|line, num|
-                            matched = line =~ /^\s*#import\s*"#{header_name_regulation}"\s*\n$/ || line =~ /^\s*#import\s*<#{header_name_regulation}>\s*\n$/
+                            matched_regex = "(^\s*#import\s*\"#{header_name_regulation}\")|(^\s*#import\s*<#{header_name_regulation}>)"
+                            matched = line =~ /#{matched_regex}/
                             next unless matched
                             
                             header_name = line.match(/(?<=")#{header_name_regulation}(?=")/) || line.match(/(?<=<)#{header_name_regulation}(?=>)/)
@@ -83,7 +84,7 @@ module Pod
 
                             changed = true # 文件需要修改
                             project_module_name = public_header_mapping["#{header_name}"]
-                            replace_line = "#import " << "<#{project_module_name}/#{header_name}>\n"
+                            replace_line = line.gsub(/#{matched_regex}/, "#import <#{project_module_name}/#{header_name}>") 
                             lines[num] = replace_line
                             record << "#{file_path} 第#{num}行，#{line} => #{replace_line}"
                         }
@@ -107,7 +108,8 @@ module Pod
                             文件修改详情：
                             #{JSON.pretty_generate(record)}
                         LOGS
-                        logs.gsub!('\\"', '"').gsub!('\\n', '') # 去除转义字符
+                        logs.gsub!('\\"', '"')# 去除转义字符
+                        logs.gsub!('\\n', '') # 去除转义字符
                         puts logs if @verbose_flag
                         File.open(log_file_path, 'w') { |file| file.write("#{logs}") } unless log_file_path.nil?
                     end

data/lib/cocoapods-jxedt/command/options/options.rb

@@ -53,7 +53,7 @@ module Pod
 all_binary!                             组件全部使用二进制
 binary_dir('../_Prebuild')              配置二进制的放置路径
 binary_switch(true)                     二进制开关
-framework_header_search_enabled(true)   开启配置依赖的framework头文件配置
+framework_header_search_enabled!        开启配置依赖的framework头文件配置
 use_binary_settings(Hash)               使用二进制的组件配置
 cocoapods_jxedt_config(Hash)            配置插件
 DSL_METHOD

data/lib/cocoapods-jxedt/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsJxedt
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

data/lib/cocoapods-jxedt/git_helper/cache_pucher.rb

@@ -16,7 +16,7 @@ module Jxedt
             output_dir.children.each do |child|
                 next unless child.directory?
                 pod_name = child.basename.to_s
-                next if targets && targets.is_a?(Array) && !(targets.include?(pod_name))
+                next if targets && targets.is_a?(Array) && targets.size > 0 && !(targets.include?(pod_name))
 
                 pod_checksum = child.children.select { |ch| ch.extname == '.checksum' }.first
                 pod_checksum = pod_checksum.basename.sub_ext('').to_s unless pod_checksum.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-jxedt
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - guojiashuang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-31 00:00:00.000000000 Z
+date: 2023-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods