cocoapods-jxedt 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad01cd6bd2da4418b03764271caab2236a186ea81f3c9f77a885910d12263d78
-  data.tar.gz: aa9f410bbbea81420a9d04f01c379428aece86e8449c9ec10a461a79d03825fe
+  metadata.gz: 9a42af93bf587f17cb6256301bdcc0b744cad56e731f8d00b4c11e072bf22058
+  data.tar.gz: bfd62a6afcaf885d939778b70d21779730ce3b5bc1c59df7cf1d781ea10fb77a
 SHA512:
-  metadata.gz: a0a5d962b702c2fde4f3ac10a81e027ba555f72310b31fee0530e94587eb7e56019ddf0d5e64951dd8f3c0e50626afbf286aa3c15b31a678bbb99413dcc5e8d1
-  data.tar.gz: 60e70a3f5be60178cf721b4d69b113d065275eb415f70655feb718279b9b2ad9de3bfb8a9ce0a01050b2972a7c2346ef7bbcd723849054d40bf79dc7b84db124
+  metadata.gz: 3d6963c2b36104bc5dbbd8b9d87c354d1074219662de03fac82b757245997a1b149c0c77711ca1cd640eb73181824aa9606181edf25372f0d891d91c1d2a7b42
+  data.tar.gz: 7bf5ed75aae47c6eb983962d8a4e6f13725e179351d4b2a48f46876932a6f6e406f445248f0a780bf9c853489fb01a84f63e3b93d8b115ecbf02529a943897c0

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

@@ -138,7 +138,7 @@ module Pod
             specs = self.analysis_result.specifications
             prebuilt_specs = (specs.select do |spec|
                 # rmtree
-                target_prebuild_files = self.sandbox.root + spec.root.name + "_Prebuild"
+                target_prebuild_files = self.sandbox.pod_dir(spec.name) + "_Prebuild"
                 target_prebuild_files.rmtree if target_prebuild_files.exist?
 
                 self.prebuild_pod_names.include? spec.root.name
@@ -149,18 +149,6 @@ module Pod
                 checked_specs[spec.root.name] = [] if checked_specs[spec.root.name].nil?
                 checked_specs[spec.root.name] << spec
 
-                # Use the prebuild framworks as vendered frameworks
-                # get_corresponding_targets
-                targets = Pod.fast_get_targets_for_pod_name(spec.root.name, self.pod_targets, cache)
-                targets.each do |target|
-                    # the framework_file_path rule is decided when `install_for_prebuild`,
-                    # as to compitable with older version and be less wordy.
-                    check_sandbox.prebuild_vendored_frameworks(spec.root.name).each do |frame_file_path|
-                        framework_file_path = "_Prebuild/" + frame_file_path
-                        framework_file_path = nil if checked_specs[spec.root.name].size > 1 # spec.root.name相同的只添加一次framework文件
-                        add_vendered_framework(spec, target.platform.name.to_s, framework_file_path)
-                    end
-                end
                 # Clean the source files
                 # we just add the prebuilt framework to specific platform and set no source files 
                 # for all platform, so it doesn't support the sence that 'a pod perbuild for one
@@ -186,8 +174,25 @@ module Pod
                     spec.attributes_hash["resources"] += prebuild_bundles
                 end
 
+                # Use the prebuild framworks as vendered frameworks
+                # get_corresponding_targets
+                targets = Pod.fast_get_targets_for_pod_name(spec.root.name, self.pod_targets, cache)
+                targets.each do |target|
+                    # the framework_file_path rule is decided when `install_for_prebuild`,
+                    # as to compitable with older version and be less wordy.
+                    check_sandbox.prebuild_vendored_frameworks(spec.root.name).each do |frame_file_path|
+                        framework_file_path = "_Prebuild/" + frame_file_path
+                        framework_file_path = nil if checked_specs[spec.root.name].size > 1 # spec.root.name相同的只添加一次framework文件
+                        add_vendered_framework(spec, target.platform.name.to_s, framework_file_path)
+                    end
+
+                    # clear resource when target is a dynamic framework
+                    spec.attributes_hash["resources"] = [] if target.build_as_dynamic_framework?
+                end
+
                 # to avoid the warning of missing license
                 spec.attributes_hash["license"] = {}
+                # keep all file in pods
                 spec.attributes_hash["preserve_paths"] = "**/*"
 
             end

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

@@ -24,12 +24,23 @@ module Jxedt
             :device_build_enabled => "编译真机。默认true",
             :simulator_build_enabled => "编译模拟器。默认false",
             :disable_dsym => "禁止编译dsym产物。默认true",
+            :disable_resource_compilable_pods => "禁止编译有需要编译的resource文件(xib、xcdatamodeld等)的pod",
             :build_log_path => "编译的log输出路径",
+            :prebuild_sandbox_path => '预编译的sandbox路径，可以配置一个多台电脑都可访问的路径，可以做源码和二进制的link。必须以`/Users/cocoapods-jxedt`开头',
             :build_args => "编译的配置。了解xcodebuild命令的可以配置编译参数，例如配置 ARCHS='arm64 armv7'",
+            :git_cache => 'git缓存配置，A Hash. 详情查看 GIT_CACHE_CONFIG'
         }.freeze
 
+        GIT_CACHE_CONFIG = {
+            :repo => '配置缓存仓库地址，如：{:remote => "https://github.com/user/cocoapods-cache.git", :local => "~/.cocoapods-jxedt/cocoapods-cache"}，或者直接写远程仓库地址"https://github.com/user/cocoapods-cache.git"',
+            :branch => 'git cache的branch，默认是master分支',
+            :auto_fetch => 'pod install过程是否自动拉取远程的二进制，默认true',
+            :auto_push => 'pod install过程是否自动同步二进制结果到远程仓库，默认false',
+        }.freeze
+        
         def initialize()
             @dsl_config = {}
+            @git_config = {}
         end
     
         def self.instance
@@ -108,6 +119,10 @@ module Jxedt
             @dsl_config[:disable_dsym] || @dsl_config[:disable_dsym].nil?
         end
 
+        def disable_resource_compilable_pods?
+            @dsl_config[:disable_resource_compilable_pods] || false
+        end
+
         def device_build_enabled?
             @dsl_config[:device_build_enabled] || @dsl_config[:device_build_enabled].nil?
         end
@@ -120,6 +135,15 @@ module Jxedt
             @dsl_config[:build_log_path]
         end
 
+        def prebuild_sandbox_path
+            @sandbox_path ||= begin
+                sandbox_path = @dsl_config[:prebuild_sandbox_path]
+                sandbox_path = nil unless sandbox_path =~ /^\/Users\/cocoapods-jxedt\/.{1,}$/
+                sandbox_path = nil unless File.exist?('/Users/cocoapods-jxedt')
+                sandbox_path
+            end
+        end
+
         def build_args
             @args ||= begin
                 args = @dsl_config[:build_args] || {}
@@ -140,5 +164,53 @@ module Jxedt
                 configurations
             end
         end
+
+        # git配置 ======================================= git配置
+        def git_cache_config
+            @git_cache ||= @dsl_config[:git_cache] || {}
+        end
+
+        def cache_repo
+            @cache_repo ||= begin
+                cache_repo = {}
+                user_config = git_cache_config[:repo]
+                cache_repo[:remote] = user_config if user_config.is_a?(String)
+                cache_repo.merge!(user_config) if user_config.is_a?(Hash)
+                cache_repo
+            end
+        end
+
+        def git_remote_repo
+            @remote ||= cache_repo[:remote]
+        end
+
+        def cache_repo_enabled?
+            remote = git_remote_repo
+            remote && remote.is_a?(String) && remote =~ /.*\.git$/
+        end
+
+        def git_cache_path
+            return nil unless cache_repo_enabled?
+
+            local = cache_repo[:local]
+            return File.expand_path(local) if local && local.is_a?(String) && local.split('/').size > 1
+
+            remote = git_remote_repo
+            repo_name = Pathname.new(remote).basename.sub_ext('').to_s
+            File.expand_path("~/.cocoapods-jxedt/#{repo_name}")
+        end
+
+        def auto_fetch?
+            git_cache_config[:auto_fetch] || git_cache_config[:auto_fetch].nil?
+        end
+
+        def auto_push?
+            git_cache_config[:auto_push]
+        end
+
+        def cache_branch
+            git_cache_config[:branch] || 'master'
+        end
+        # git配置 ======================================= git配置
     end
 end

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

@@ -0,0 +1,29 @@
+module Pod
+    class Podfile
+        if Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
+            # Calls the post install callback if defined.
+            #
+            # @param  [Pod::Installer] installer
+            #         the installer that is performing the installation.
+            #
+            # @return [Bool] whether a post install callback was specified and it was
+            #         called.
+            #
+            # This allows the user to customize, for instance, the generated Xcode project _before_ it’s written to disk.
+            alias_method :old_post_install!, :post_install!
+            def post_install!(installer)
+                executed = old_post_install!(installer)
+                handle_pods_project_configurations!(installer) unless executed
+                executed
+            end
+
+            def handle_pods_project_configurations!(installer)
+                installer.pods_project.targets.each do |target|
+                    target.build_configurations.each do |config|
+                        config.build_settings["CODE_SIGN_IDENTITY"] = "" if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
+                    end
+                end
+            end
+        end
+    end
+end

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

@@ -0,0 +1,11 @@
+
+module Pod
+    class JxedtPrebuildInstaller < Installer # rubocop:disable Metrics/ClassLength
+        def installation_options
+            # Skip integrating user targets for prebuild Pods project.
+            @installation_options ||= Pod::Installer::InstallationOptions.new(
+                super.to_h.merge(:integrate_targets => false)
+            )
+        end
+    end
+end

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

@@ -1,4 +1,13 @@
 module Pod
+  class Sandbox
+    attr_accessor :standard_sandbox
+
+    def standard_sandbox_root
+      return root if standard_sandbox.nil?
+      standard_sandbox.root
+    end
+  end
+
   # The sandbox provides support for the directory that CocoaPods uses for an
   # installation. In this directory the Pods projects, the support files and
   # the sources of the Pods are stored.
@@ -41,60 +50,69 @@ module Pod
   #     +-- PodTargetN.xcodeproj
   #
   #
-  class PrebuildSandbox < Sandbox
-    # [String] standard_sandbox_path
-    def self.from_standard_sandbox_path(path)
-      prebuild_sandbox_path = Pathname.new(path).realpath
-      new(prebuild_sandbox_path)
-    end
-
-    def self.from_standard_sandbox(sandbox)
-      from_standard_sandbox_path(sandbox.root)
+  class JxedtPrebuildSandbox < Sandbox
+    # [Pod::Sandbox] standard_sandbox
+    def self.from_standard_sandbox(sandbox, sandbox_path: nil, real_path_compiler: false)
+      prebuild_sandbox_path = Pathname.new(sandbox.root).realpath + '../Pods-Source'
+      prebuild_sandbox = new(prebuild_sandbox_path)
+      # initialize
+      prebuild_sandbox.standard_sandbox = sandbox
+      # prepare
+      prebuild_sandbox.prepare_dir
+      prebuild_sandbox
     end
 
-    def make_source_link(source, target)
-      source = Pathname.new(source)
-      target = Pathname.new(target)
-      target.parent.mkpath unless target.parent.exist?
-      target.rmtree if target.exist?
-      relative_source = source.relative_path_from(target.parent)
-      FileUtils.ln_sf(relative_source, target)
-    end
-
-    def source_path
-      '../Pods-Source'
+    def real_path_compiler?
+      @real_path_compiler ||= begin
+        prebuild_sandbox_path = Jxedt.config.prebuild_sandbox_path
+        real_path_compiler = prebuild_sandbox_path && prebuild_sandbox_path.length > 0
+        if real_path_compiler
+          prebuild_sources_root = Pathname.new(prebuild_sandbox_path)
+          prebuild_sources_root.rmtree if prebuild_sources_root.exist?
+          prebuild_sources_root.mkpath
+        end
+        real_path_compiler
+      end
     end
 
-    def headers_root
-      root + source_path + 'Headers'
-    end
+    def prepare_dir
+      # clear
+      root.children.each { |child| child.rmtree if '.xcodeproj' != child.extname }
 
-    def project_path
-      root + source_path + 'Pods-Source.xcodeproj'
-    end
+      # copy
+      standard_sandbox.root.children.each do |child|
+        # skip headers_root & target_support_files_root & project_path
+        should_skip_paths = [standard_sandbox.headers_root, standard_sandbox.target_support_files_root, standard_sandbox.project_path]
+        next if should_skip_paths.include?(child)
 
-    def specifications_root
-      # root + source_path + 'Local Podspecs'
-      super
+        should_copy_paths = [standard_sandbox.specifications_root, standard_sandbox.manifest_path]
+        if should_copy_paths.include?(child)
+          # copy Local Podspecs & manifest path
+          FileUtils.cp_r(child, root + child.basename) 
+        else
+          # 真实的路径去编译，则拷贝文件到prebuild_sandbox
+          FileUtils.cp_r(child, sources_root) if real_path_compiler?
+        end
+      end
     end
 
-    def target_support_files_root
-      root + source_path + 'Target Support Files'
+    def sources_root
+      if real_path_compiler?
+        # 真实的路径去编译，则返回prebuild sources root
+        return @prebuild_sources_root ||= Pathname.new(Jxedt.config.prebuild_sandbox_path)
+      end
+      standard_sandbox.root
     end
 
-    def link_source_project!
-      root.children.each do |child|
-        next if ['Headers', 'Local Podspecs', 'Target Support Files'].include? child.basename.to_s
-        next if ['.lock', '.xcodeproj'].include? child.extname.to_s
-        make_source_link(child, root + source_path + child.basename)
-      end 
+    def project_path
+      root + 'Pods-Source.xcodeproj'
     end
 
     def clean_source_project!
       return if Jxedt.config.keep_source_project?
 
-      source_project_path = root + source_path
-      source_project_path.rmtree if source_project_path.exist?
+      sources_root.rmtree if sources_root.exist?
+      root.rmtree if root.exist?
     end
   end
 end
@@ -108,20 +126,7 @@ module Pod
     class UserProjectIntegrator
       alias_method :old_create_workspace, :create_workspace
       def create_workspace
-        old_create_workspace unless sandbox.is_a?(Pod::PrebuildSandbox)
-      end
-    end
-  end
-end
-
-module Pod
-  class Installer
-    # Cleans up the sandbox directory by removing stale target support files and headers.
-    #
-    class SandboxDirCleaner
-      alias_method :old_clean!, :clean!
-      def clean!
-        old_clean! unless @sandbox.is_a?(Pod::PrebuildSandbox)
+        old_create_workspace unless sandbox.is_a?(Pod::JxedtPrebuildSandbox)
       end
     end
   end

data/lib/cocoapods-jxedt/binary/hooks/CocoapodsJxedtHook.rb

@@ -6,20 +6,17 @@ module CocoapodsJxedtHook
         Jxedt::PreInstall.new(installer_context).run
     end
 
-    Pod::HooksManager.register('cocoapods-jxedt', :pre_integrate) do |context, _|
-        
-    end
+    # Pod::HooksManager.register('cocoapods-jxedt', :pre_integrate) do |context, _|
+    # end
 
     Pod::HooksManager.register('cocoapods-jxedt', :post_install) do |context, _|
         require_relative 'post_install'
         Jxedt::PostInstall.new(context).run
     end
 
-    Pod::HooksManager.register('cocoapods-jxedt', :post_integrate) do |context, _|
-
-    end
+    # Pod::HooksManager.register('cocoapods-jxedt', :post_integrate) do |context, _|
+    # end
     
-    Pod::HooksManager.register('cocoapods-jxedt', :source_provider) do |context, _|
-
-    end
+    # Pod::HooksManager.register('cocoapods-jxedt', :source_provider) do |context, _|
+    # end
 end

data/lib/cocoapods-jxedt/binary/hooks/post_install.rb

@@ -11,11 +11,11 @@ module Jxedt
             require_relative '../helper/prebuild_sandbox'
 
             # :post_install过程校验两次`pod install`的值
-            validate_pod_checksum unless @installer_context.sandbox.is_a?(Pod::PrebuildSandbox)
+            validate_pod_checksum unless @installer_context.sandbox.is_a?(Pod::JxedtPrebuildSandbox)
         end
 
-        def validate_pod_checksum            
-            original_installer = ObjectSpace.each_object(Pod::Installer).reject {|installer| installer.sandbox.is_a?(Pod::PrebuildSandbox) }.first
+        def validate_pod_checksum
+            original_installer = ObjectSpace.each_object(Pod::Installer).reject {|installer| installer.sandbox.is_a?(Pod::JxedtPrebuildSandbox) }.first
             return if original_installer.nil?
 
             check_result = original_installer.lockfile == @installer_context.sandbox.source_lockfile
@@ -28,7 +28,7 @@ module Jxedt
                     value2 = source_lockfile.spec_checksums_hash_key(name)
                     validation_failed << name if value1.nil? || value2.nil? || value1 != value2
                 }
-                Pod::UI.warn "Lockfile文件校验失败，请检查Pod组件: #{validation_failed}"
+                Pod::UI.warn "⚠️  ⚠️  ⚠️  Lockfile文件校验失败，请检查Pod组件: #{validation_failed}"
             end
         end
     end

data/lib/cocoapods-jxedt/binary/hooks/pre_install.rb

@@ -16,21 +16,20 @@ module Jxedt
             # check binary switch
             return unless Jxedt.config.binary_switch?
 
-            # [Check Environment]
-            podfile = @installer_context.podfile
-            podfile.target_definition_list.each do |target_definition|
-                raise STDERR.puts "[!] Cocoapods-binary requires `use_frameworks!`".red if not target_definition.uses_frameworks?
+            unless Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
+                raise STDERR.puts "[!] cocoapods-jxedt binary plugin should use cocoapods version greater than '1.10.0'`".red
             end
 
             require_relative '../helper/prebuild_sandbox'
+            require_relative '../helper/prebuild_installer'
 
-            # 如果是Pod::PrebuildSandbox类则直接返回
-            return if @installer_context.sandbox.is_a?(Pod::PrebuildSandbox)
+            # 如果是Pod::JxedtPrebuildSandbox类则直接返回
+            return if @installer_context.sandbox.is_a?(Pod::JxedtPrebuildSandbox)
 
             # 获取原始的installer对象，必须先获取对象
             original_installer = ObjectSpace.each_object(Pod::Installer).first
-            sandbox = Pod::PrebuildSandbox.from_standard_sandbox(@installer_context.sandbox)
-            source_installer = Pod::Installer.new(sandbox, @installer_context.podfile, @installer_context.lockfile)
+            prebuild_sandbox = Pod::JxedtPrebuildSandbox.from_standard_sandbox(@installer_context.sandbox)
+            source_installer = Pod::JxedtPrebuildInstaller.new(prebuild_sandbox, @installer_context.podfile, @installer_context.lockfile)
             # 设置原始的installer携带的参数
             source_installer.update = original_installer.update
             source_installer.repo_update =  original_installer.repo_update
@@ -38,18 +37,39 @@ module Jxedt
             source_installer.install!
 
             # 保存首次`pod install`的lockfile结果，用来验证二进制文件和后面做结果校验
-            @installer_context.sandbox.source_lockfile = sandbox.source_lockfile = source_installer.lockfile
+            @installer_context.sandbox.source_lockfile = prebuild_sandbox.source_lockfile = source_installer.lockfile
 
             require_relative '../helper/podfile_options'
             require_relative '../prebuild'
 
+            # fetch cache and sync
+            if Jxedt.config.cache_repo_enabled? && Jxedt.config.auto_fetch?
+                log_section "🚗  Fetch git cache"
+                pods = prebuild_sandbox.source_lockfile.internal_data["SPEC CHECKSUMS"].keys
+                binary_hash = pods.reduce({}) do |hash, name|
+                    checksum = prebuild_sandbox.source_lockfile.spec_checksums_hash_key(name)
+                    hash.update(name => checksum) unless checksum.nil?
+                end
+
+                require 'cocoapods-jxedt/git_helper/cache_fetcher'
+                binary_dir = @installer_context.sandbox.standard_sandbox_root + Jxedt.config.binary_dir
+                Jxedt::CacheFetcher.sync(binary_hash, binary_dir)
+            end  
+
             # prebuild_job
-            sandbox.link_source_project!
             if Jxedt.config.prebuild_job?
                 log_section "🚀  Prebuild frameworks"
-                Jxedt::Prebuild.new(source_installer).build 
+                build_targets = Jxedt::Prebuild.new(source_installer).build 
+
+                # cache push
+                if Jxedt.config.cache_repo_enabled? && Jxedt.config.auto_push? && build_targets && build_targets.size > 0
+                    log_section "🚄  Push git cache"
+                    require 'cocoapods-jxedt/git_helper/cache_pucher'
+                    output_dir = prebuild_sandbox.standard_sandbox_root + Jxedt.config.binary_dir
+                    Jxedt::CachePucher.push(output_dir, build_targets, false)
+                end
             end
-            sandbox.clean_source_project!
+            prebuild_sandbox.clean_source_project!
 
             log_section "🤖  Resume pod installation"
             require_relative '../targets/pod_target'

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

@@ -1,3 +1,4 @@
 require_relative 'config'
 require_relative 'podfile_dsl'
 require_relative 'hooks/CocoapodsJxedtHook'
+require_relative 'helper/podfile_post_install_hook'

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

@@ -0,0 +1,40 @@
+module StaticFramework
+    class Tree
+      attr_reader :headers_path
+      attr_reader :private_headers_path
+      attr_reader :module_map_path
+      attr_reader :root_path
+      attr_reader :fwk_path
+  
+      def initialize(name, at_path)
+        @name = name
+        @at_path = at_path
+        make
+      end
+  
+      def make
+        make_root
+        make_framework
+      end
+  
+      private
+      def make_framework
+        @fwk_path = @root_path + Pathname.new(@name + '.framework')
+        @fwk_path.rmtree if @fwk_path.exist?
+        @fwk_path.mkdir
+  
+        @module_map_path = @fwk_path + Pathname.new('Modules')
+
+        @headers_path = @fwk_path + Pathname.new('Headers')
+        @headers_path.mkpath unless @headers_path.exist?
+
+        @private_headers_path = @fwk_path + Pathname.new('PrivateHeaders')
+      end
+  
+      def make_root
+        @root_path = Pathname.new(@at_path)
+        @root_path.mkpath unless @root_path.exist?
+      end
+    end
+  end
+  

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

@@ -19,9 +19,15 @@ module Jxedt
     end
 
     def run
-      sdks.each { |sdk| build_for_sdk(sdk) }
+      sdks.each { |sdk| 
+        build_for_sdk(sdk) 
+        @options[:clean_build] = false # 如果需要编译真机和模拟器，那么第二次编译的时候不能clean
+      }
 
       targets.each do |target|
+        # create static framework with library
+        create_framework_from_library(target) if target.build_as_library?
+
         if Jxedt.config.xcframework?
           create_xcframework(target)
         elsif sdks.count > 1
@@ -83,10 +89,82 @@ module Jxedt
         sdk: sdk,
         deployment_target: targets.map { |t| t.platform.deployment_target }.max.to_s,
         log_path: log_path(sdk),
+        clean_build: clean_build?,
         args: sdk == simulator ? @build_args[:simulator] : @build_args[:device]
       )
     end
 
+    def create_framework_from_library(target)
+      require_relative 'framework'
+      
+      sdks.each do |sdk|
+        procuct_dir = Pathname.new(target_products_dir_of(target, sdk))
+        # make static framework
+        fwk = StaticFramework::Tree.new(target.product_module_name, procuct_dir.to_s)
+
+        # copy library
+        lib_output = fwk.fwk_path + target.product_module_name
+        lib_file = procuct_dir + "lib#{target.name}.a"
+        `lipo -create -output #{lib_output} #{lib_file}` if lib_file.exist?
+
+        # copy public headers
+        headers_source = target.sandbox.headers_root + 'Public' + target.pod_name
+        Dir.glob("#{headers_source}/**/*.h").each { |h| `ditto #{h} #{fwk.headers_path}/#{File.basename(h)}` }
+
+        # target support module
+        if target.defines_module?
+          # create modulemap path
+          fwk.module_map_path.mkpath unless fwk.module_map_path.exist?
+
+          # check and copy umbrella headers
+          umbrella_headers = Dir.glob("#{procuct_dir}/*-umbrella.h")
+          umbrella_headers.each { |h| FileUtils.cp_r(h.to_s, fwk.headers_path) }
+
+          # check and copy swift headers
+          swift_headers = Dir.glob("#{procuct_dir}/*/*-Swift.h")
+          swift_headers.each { |h| FileUtils.cp_r(h.to_s, fwk.headers_path) }
+          
+          # check and copy swiftmodule files
+          swiftmodule_path = procuct_dir + "#{target.product_module_name}.swiftmodule"
+          FileUtils.cp_r(swiftmodule_path, fwk.module_map_path) if swiftmodule_path.exist?
+
+          # umbrella header name
+          umbrella_header_name = "#{target.pod_name}-umbrella.h"
+          unless File.exist?("#{fwk.headers_path}/#{umbrella_header_name}")
+            # 从Target Support Files文件夹中获取unbrella header
+            target_support_files_root = target.sandbox.target_support_files_root + target.name
+            Dir.glob("#{target_support_files_root}/*-umbrella.h").each { |h| FileUtils.cp_r(h.to_s, fwk.headers_path + umbrella_header_name) }
+          end
+
+          # make modulemap
+          if File.exist?("#{fwk.headers_path}/#{umbrella_header_name}")
+            module_map = <<MODULE_MAP
+framework module #{target.product_module_name} {
+    umbrella header "#{umbrella_header_name}"
+
+    export *
+    module * { export * }
+}
+MODULE_MAP
+          unless swift_headers.empty?
+            module_map << swift_module_map = <<SWIFT_MODULE_MAP
+module #{target.product_module_name}.Swift {
+    header "#{target.product_module_name}-Swift.h"
+    requires objc
+}
+SWIFT_MODULE_MAP
+            end
+            File.write("#{fwk.module_map_path}/module.modulemap", module_map) unless module_map.nil?
+          end
+        end
+
+        # remove library product
+        procuct_dir.children.each do |child|
+          FileUtils.rm_rf(child) if ['.h', '.modulemap', '.a', '.swiftmodule'].include?(child.extname) || "#{child.basename}" == 'Swift Compatibility Header'
+        end
+      end
+    end
+
     def create_xcframework(target)
       non_framework_paths = Dir[target_products_dir_of(target, preferred_sdk) + "/*"] \
         - [framework_path_of(target, preferred_sdk)] \
@@ -261,5 +339,9 @@ module Jxedt
     def log_path(sdk)
       @options[:log_path].nil? ? nil : "#{@options[:log_path]}_#{sdk}"
     end
+
+    def clean_build?
+      @options[:clean_build]
+    end
   end
 end

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

@@ -34,7 +34,7 @@ module Jxedt
         end
       end
       cmd += options[:args] if options[:args]
-      cmd += "clean" if options[:clean_build]
+      cmd << "clean" if options[:clean_build]
       cmd << "build"
 
       if options[:log_path].nil?