cocoapods-tdf-bin 0.0.26 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87ed9c79da19168d3d799acb3e10665686872ea5f7b5d0180da27a1176f7f8d2
-  data.tar.gz: 40d395b273425c1e8e24e71938635f092c784dec1678723ed280707639328847
+  metadata.gz: 66a60a204a9efc776e33a292e40562c5bd6e90f14dd3e63926080be837a280a9
+  data.tar.gz: 9181a31ac1374403f099518908fc94c617cbc2c323362e9755f380ae8c18a7cf
 SHA512:
-  metadata.gz: 4cb6a3cce2436e03b7010e5c5f94f286c342da9d6ee68dca686b86c80e8f74f6e2766d64bdc8d9585405c0bd0cf72677820078fe22671d44b36fbcbe962ac695
-  data.tar.gz: 1f308b97e69f2a6fec68967ae563fcf5ba6cdd6326c538e7212c19acb22facf17a131bc25ee0997148c6303b9ba623328af92c93890d2482bd09cc0bd0e2ba3d
+  metadata.gz: bcbe47a985ce1297af94fb8bded55c6f37042b8975bcc002ae055d4c4f54a38153a0cc697c5ed295cb7608f2545490bd2fbbdbbb4e41e95dddd138d7e8fd70b6
+  data.tar.gz: a8f38cbfdbb35db96b6b1d67ad75119c2c943047901a5fe71e46c805d9594c29cf4c97d5e3042b0f3da4d04f0bedd9bef5e765856bda88f12bef277d73de5e6a

data/README.md

@@ -4,7 +4,7 @@ cocoapods-tdf-bin功能点：
 
 - 组件二进制化，`无入侵式`支持组件二进制化，完全自动化，无需手动操作。致力于解决Ci打包速度慢、研发编译慢等编译问题。
 
-cocoapods-imy-bin插件所关联的组件二进制化策略：
+cocoapods-tdf-bin插件所关联的组件二进制化策略：
 
 - 预先将打包成 `.framework` 的组件保存到静态服务器上，并在 `install` 时，去下载组件对应的二进制版本，以减少组件编译时间，达到加快 App 打包、组件发布等操作的目的。
 
@@ -99,5 +99,18 @@ set_use_source_pods [
  ]
 ```
 
+#### 5. 使用 batch 命令
+```ruby
+    batch_pod_local [
+      "TDFSunKitchenModule",
+      "TDFRetailStock",
+    ], "本地路径" 
+
+    batch_pod_remote [
+      "TDFSunKitchenModule",
+      "TDFRetailStock",
+    ], "分支名" 
+```
+
 
 

data/lib/cocoapods-tdf-bin/command/bin/batch.rb

@@ -27,11 +27,13 @@ module Pod
         end
 
         def run
+
           podfile = File.join(Pathname.pwd, "Podfile")
           podfile_instance = Pod::Podfile.from_file(podfile)
           if podfile_instance.get_batch_local_pods == nil
             help! "没有本地依赖的组件"
           end
+
           if @arguments.size == 1 && @arguments[0] == "clone"
             clone_all(podfile_instance)
           elsif @arguments.size == 1 && @arguments[0] == "done"

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.0.26'
+  VERSION = '0.0.30'
 end
 
 module Pod

data/lib/cocoapods-tdf-bin/helpers/build_helper.rb

@@ -55,7 +55,7 @@ module CBin
         source_dir = Dir.pwd
         file_accessor = Sandbox::FileAccessor.new(Pathname.new('.').expand_path, @spec.consumer(@platform))
         Dir.chdir(workspace_directory) do
-          builder = CBin::Framework::Builder.new(@spec, file_accessor, @platform, source_dir, @isRootSpec, @build_model )
+          builder = CBin::Framework::Builder.new(@spec, file_accessor, @platform, source_dir, @isRootSpec, @build_model)
           @@build_defines = builder.build if @isRootSpec
           begin
             @framework_path = builder.lipo_build(@@build_defines) unless @skip_archive
@@ -118,7 +118,8 @@ module CBin
       end
 
       def framework_name
-        CBin::Config::Builder.instance.framework_name(@spec)
+        @spec.name + ".xcframework"
+        # CBin::Config::Builder.instance.framework_name(@spec)
       end
 
       def framework_name_zip

data/lib/cocoapods-tdf-bin/helpers/build_utils.rb

@@ -7,6 +7,7 @@ module CBin
     class Utils
 
       def Utils.is_framework(spec)
+        # 目前全部打包成 静态 framework
         return true
         # if Utils.uses_frameworks?
         #   return true

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

@@ -40,11 +40,13 @@ module CBin
       def lipo_build(defines)
         UI.section("Building static Library #{@spec}") do
 
-          cp_framework_to_source_dir
-          build_static_library_for_ios
+          # cp_framework_to_source_dir
+          build_xcframework_for_ios
+          # build_static_library_for_ios
 
           copy_resources
 
+          # link_header
         end
         framework
       end
@@ -53,7 +55,6 @@ module CBin
 
       def cp_framework_to_source_dir
         framework_name = "#{@spec.name}.framework"
-        framework_dir = "./build-armv7/#{framework_name}" if File.exist?('./build-armv7')
         framework_dir = "./build-arm64/#{framework_name}" if File.exist?('./build-arm64')
         target_dir = File.join(CBin::Config::Builder.instance.zip_dir,framework_name)
 
@@ -81,7 +82,7 @@ module CBin
         # archs = %w[i386 x86_64]
         archs = ios_architectures_sim
         archs.map do |arch|
-          xcodebuild(defines, "-sdk iphonesimulator ARCHS=\'#{arch}\' ", "build-#{arch}",@build_model)
+          xcodebuild(defines, "-sdk iphonesimulator ARCHS=\'#{arch}\' ", "build-#{arch}", @build_model)
         end
       end
 
@@ -94,6 +95,28 @@ module CBin
         file
       end
 
+=begin
+    制作 xcframework
+=end
+      def build_xcframework_for_ios
+        UI.message "Building ios libraries with archs #{ios_architectures}"
+
+        framework_name = "#{@spec.name}.xcframework"
+        output = File.join(CBin::Config::Builder.instance.zip_dir,framework_name)
+
+        build_path = Pathname("build")
+        build_path.path unless build_path.exist?
+
+        # if is_debug_model
+        libs = (ios_architectures + ios_architectures_sim) .map do |arch|
+          library = "-framework build-#{arch}/#{@spec.name}.framework"
+          library
+        end
+
+        UI.message "xcodebuild -create-xcframework #{libs.join(' ')} -output #{output}"
+        `xcodebuild -create-xcframework #{libs.join(' ')} -output #{output}`
+      end
+
 =begin
       lipo合并 二进制
 =end
@@ -133,7 +156,7 @@ module CBin
         #   iphone5,iphone5s以下的模拟器
         # >x86_64
         #   iphone6以上的模拟器
-        archs = %w[arm64 armv7]
+        archs = %w[arm64]
         # archs = %w[x86_64 arm64 armv7s i386]
         # @vendored_libraries.each do |library|
         #   archs = `lipo -info #{library}`.split & archs
@@ -202,12 +225,22 @@ module CBin
         end
       end
 
+      def link_header
+        header_dir = "#{CBin::Config::Builder.instance.zip_dir}/#{@spec.name}.xcframework/ios-arm64/#{@spec.name}.framework/Headers"
+        target_headers_dir = "#{CBin::Config::Builder.instance.zip_dir}/#{@spec.name}.xcframework/Headers"
+        FileUtils.mkdir_p(target_headers_dir) unless File.exist?(target_headers_dir)
+        Dir.foreach(header_dir) do |file|
+          if file !="." and file !=".."
+            `ln -s #{header_dir}/#{file} #{target_headers_dir}`
+          end
+        end
+      end
+
       def copy_resources
         resource_dir = './build/*.bundle'
-        resource_dir = './build-armv7/*.bundle' if File.exist?('./build-armv7')
         resource_dir = './build-arm64/*.bundle' if File.exist?('./build-arm64')
 
-        framework_name = "#{@spec.name}.framework"
+        framework_name = "#{@spec.name}.xcframework"
         resource_target_dir = File.join(CBin::Config::Builder.instance.zip_dir,framework_name,"Resources")
 
         FileUtils.mkdir_p(resource_target_dir) unless File.exist?(resource_target_dir)
@@ -267,8 +300,11 @@ module CBin
             not expand_suffix(suffix)
           end
 
-          UI.message "Copying resources #{escape_resource_arr}"
-          `cp -rp #{escape_resource_arr.join(' ')} #{resource_target_dir}`
+          if escape_resource_arr.count > 0
+            UI.message "Copying resources #{escape_resource_arr}"
+            `cp -rp #{escape_resource_arr.join(' ')} #{resource_target_dir}`
+          end
+
         end
       end
 

data/lib/cocoapods-tdf-bin/helpers/spec_creator.rb

@@ -59,7 +59,7 @@ module CBin
         # license | resource_bundles | vendored_libraries
 
         # Project Linkin
-        @spec.vendored_frameworks = "#{code_spec.root.name}.framework"
+        @spec.vendored_frameworks = "#{code_spec.root.name}.xcframework"
 
         # Resources
         extnames = []
@@ -75,8 +75,8 @@ module CBin
         @spec.source = binary_source
 
         # Source Code
-        @spec.source_files = framework_contents('Headers/*')
-        @spec.public_header_files = framework_contents('Headers/*')
+        # @spec.source_files = framework_contents('Headers/*')
+        # @spec.public_header_files = framework_contents('Headers/*')
 
         # Unused for binary
         spec_hash = @spec.to_hash
@@ -131,7 +131,7 @@ module CBin
       end
 
       def framework_contents(name)
-        ["#{code_spec.root.name}.framework"].map { |path| "#{path}/#{name}" }
+        ["#{code_spec.root.name}.xcframework"].map { |path| "#{path}/#{name}" }
       end
 
       def binary_source_files

data/lib/cocoapods-tdf-bin/helpers/spec_source_creator.rb

@@ -63,9 +63,9 @@ module CBin
 
         # Resources
         extnames = []
-        extnames << '*.bundle' if code_spec_consumer.resource_bundles.any?
-        if code_spec_consumer.resources.any?
-          extnames += code_spec_consumer.resources.map { |r| File.basename(r) }
+        extnames << '*.bundle' if contain_bundles
+        if code_spec_resource.any?
+          extnames += code_spec_resource.map { |r| File.basename(r) }
         end
         if extnames.any?
           @spec.resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } }
@@ -132,13 +132,13 @@ module CBin
         # license | resource_bundles | vendored_libraries
 
         # Project Linkin
-        @spec.vendored_frameworks = "#{code_spec.root.name}.framework"
+        @spec.vendored_frameworks = "#{code_spec.root.name}.xcframework"
 
         # Resources
         extnames = []
-        extnames << '*.bundle' if code_spec_consumer.resource_bundles.any?
-        if code_spec_consumer.resources.any?
-          extnames += code_spec_consumer.resources.map { |r| File.basename(r) }
+        extnames << '*.bundle' if contain_bundles
+        if code_spec_resource.any?
+          extnames += code_spec_resource.map { |r| File.basename(r) }
         end
 
         extnames = extnames.select do | extname |
@@ -147,7 +147,7 @@ module CBin
 
         if extnames.any?
           resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } }
-          resources << "#{code_spec.root.name}.framework/*.{storyboardc,nib,mom,momd,cdm}"
+          resources << "#{code_spec.root.name}.xcframework/ios-arm64/#{code_spec.root.name}.framework/*.{storyboardc,nib,mom,momd,cdm}"
           @spec.resources = resources
         end
 
@@ -155,8 +155,9 @@ module CBin
         @spec.source = binary_source
 
         # Source Code
-        @spec.source_files = framework_contents('Headers/*')
-        @spec.public_header_files = framework_contents('Headers/*')
+        # @spec.source_files = framework_contents("Headers/*.h")
+        # @spec.public_header_files = framework_contents("ios-arm64/#{code_spec.root.name}.framework/Headers/*.h")
+        # @spec.header_mappings_dir = "#{code_spec.root.name}.xcframework/ios-arm64/#{code_spec.root.name}.framework/Headers"
 
         # Unused for binary
         spec_hash = @spec.to_hash
@@ -164,6 +165,41 @@ module CBin
         spec_hash.delete('resource_bundles')
         spec_hash.delete('exclude_files')
         spec_hash.delete('preserve_paths')
+        spec_hash.delete('source_files')
+
+        # 处理子库，将二进制子库的依赖全部放到最外层，删除子库的source_files
+        dependencies = Hash(spec_hash["dependencies"])
+        sub_specs = spec_hash["subspecs"]
+        if sub_specs != nil
+          sub_specs.each { |suc_spec|
+            begin
+              deps_hash = suc_spec["dependencies"]
+              # 删除二进制下无用的字段，目前只支持 ios 架构
+              suc_spec["vendored_frameworks"] = spec_hash["vendored_frameworks"]
+              suc_spec.delete('source_files')
+              suc_spec.delete('dependencies')
+              suc_spec.delete('osx')
+              suc_spec.delete('tvos')
+              suc_spec.delete('watchos')
+              platforms = suc_spec["platforms"]
+              platforms.delete('osx')
+              platforms.delete('tvos')
+              platforms.delete('watchos')
+              if deps_hash != nil
+                dependencies = dependencies.merge(deps_hash)
+              end
+            rescue
+            end
+          }
+        end
+
+        # 去重自己对自己的依赖
+        dependencies = dependencies.reject do |d|
+          d.start_with?("#{@spec.name}/")
+        end
+        spec_hash["dependencies"] = dependencies
+        spec_hash["subspecs"] = sub_specs
+
         # 这里不确定 vendored_libraries 指定的时动态/静态库
         # 如果是静态库的话，需要移除，否则就不移除
         # 最好是静态库都独立成 Pod ，cocoapods-package 打静态库去 collect 目标文件时好做过滤
@@ -189,6 +225,18 @@ module CBin
         @spec
       end
 
+      def contain_bundles
+        consumers = [code_spec, *code_spec.recursive_subspecs].flat_map do |spec|
+          spec.consumer(:ios)
+        end
+        for consumer in consumers
+          if consumer.resource_bundles.any?
+            return true
+          end
+        end
+          return false
+      end
+
       def expand_suffix(suffix)
         if suffix.end_with?('.storyboard') ||
           suffix.end_with?('.xib') ||
@@ -204,12 +252,15 @@ module CBin
         { http: format(CBin.config.binary_download_url, code_spec.root.name, code_spec.version), type: CBin.config.download_file_type }
       end
 
-      def code_spec_consumer(_platform = :ios)
-        code_spec.consumer(:ios)
+      def code_spec_resource
+        resources = [code_spec, *code_spec.recursive_subspecs].flat_map do |spec|
+          spec.consumer(:ios).resources
+        end.compact.uniq
+        resources
       end
 
       def framework_contents(name)
-        ["#{code_spec.root.name}.framework"].map { |path| "#{path}/#{name}" }
+        ["#{code_spec.root.name}.xcframework"].map { |path| "#{path}/#{name}" }
       end
 
       def binary_source_files

data/lib/cocoapods-tdf-bin/helpers/upload_helper.rb

@@ -8,6 +8,7 @@ require 'cocoapods/generate'
 require 'cocoapods-tdf-bin/helpers/framework_builder'
 require 'cocoapods-tdf-bin/helpers/library_builder'
 require 'cocoapods-tdf-bin/helpers/sources_helper'
+require 'cocoapods-tdf-bin/helpers/spec_source_creator'
 require 'cocoapods-tdf-bin/command/bin/spec/push'
 
 module CBin
@@ -47,7 +48,7 @@ module CBin
       # curl http://ci.xxx:9192/frameworks -F "name=IMYFoundation" -F "version=7.7.4.2" -F "annotate=IMYFoundation_7.7.4.2_log" -F "file=@bin-zip/bin_IMYFoundation_7.7.4.2.zip"
       def curl_framework
 
-        zip_file = "#{CBin::Config::Builder.instance.zip_dir}/#{@spec.name}.framework.zip"
+        zip_file = "#{CBin::Config::Builder.instance.zip_dir}/#{@spec.name}.xcframework.zip"
         res = File.exist?(zip_file)
         if res
           command = "curl #{CBin.config.bin_upload_url} -F \"frameworkName=#{@spec.name}\" -F \"version=#{@spec.version}\" -F \"changelog=#{@spec.name}_#{@spec.version}_log\" -F \"framework=@#{zip_file}\""
@@ -68,7 +69,7 @@ EOF
         argvs = [
             "#{binary_podsepc_json}",
             "--binary",
-            "--sources=#{sources_option(@code_dependencies, @sources)},https:\/\/cdn.cocoapods.org",
+            "--sources=#{sources_option(@code_dependencies, @sources)}",
             "--skip-import-validation",
             "--use-libraries",
             "--allow-warnings",

data/lib/cocoapods-tdf-bin/native/resolver.rb

@@ -119,8 +119,14 @@ module Pod
         sources_manager = Config.instance.sources_manager
         use_source_pods = podfile.use_source_pods
 
+        # 所有库的个数
+        # all_spec_count = 0
+
         missing_binary_specs = []
         specs_by_target.each do |target, rspecs|
+
+          # all_spec_count = all_spec_count + rspecs.count
+
           # use_binaries 并且 use_source_pods 不包含  本地可过滤
           use_binary_rspecs = if podfile.use_binaries? || podfile.use_binaries_selector
                                 rspecs.select do |rspec|
@@ -222,7 +228,7 @@ module Pod
             end
             next if spec_git_res
 
-            #获取没有制作二进制版本的spec集合
+            # 获取没有制作二进制版本的spec集合
             sources_sepc << spec
             unless spec.defined_in_file.nil?
               FileUtils.cp("#{spec.defined_in_file}", "#{des_dir}")
@@ -230,6 +236,10 @@ module Pod
           end
         end
 
+        # 二进制库的个数
+        # bin_spec_count = all_spec_count - sources_sepc.count
+        # UI.message "组件二进制化比例 #{bin_spec_count}/#{all_spec_count}"
+
         specs_by_target
       end
     end

data/lib/cocoapods-tdf-bin/native/validator.rb

@@ -13,28 +13,70 @@ module Pod
     #
     # Perform analysis for a given spec (or subspec)
     #
-    def perform_extensive_analysis(spec)
-      return true
-    end
+    # def perform_extensive_analysis(spec)
+    #   return true
+    # end
 
     #覆盖
-    def check_file_patterns
-      FILE_PATTERNS.each do |attr_name|
-        next if %i(source_files resources).include? attr_name
-          if respond_to?("_validate_#{attr_name}", true)
-            send("_validate_#{attr_name}")
-          else
-            validate_nonempty_patterns(attr_name, :error)
+    # def check_file_patterns
+    #   FILE_PATTERNS.each do |attr_name|
+    #     next if %i(source_files resources).include? attr_name
+    #       if respond_to?("_validate_#{attr_name}", true)
+    #         send("_validate_#{attr_name}")
+    #       else
+    #         validate_nonempty_patterns(attr_name, :error)
+    #       end
+    #   end
+    #
+    #   _validate_header_mappings_dir
+    #   if consumer.spec.root?
+    #     _validate_license
+    #     _validate_module_map
+    #   end
+    # end
+
+    # def validate_source_url(spec); end
+
+    # 修改 验证 build 时的 ARCHS 配置
+    def xcodebuild(action, scheme, configuration, deployment_target:)
+      require 'fourflusher'
+      command = %W(clean #{action} -workspace #{File.join(validation_dir, 'App.xcworkspace')} -scheme #{scheme} -configuration #{configuration})
+      case consumer.platform_name
+      when :osx, :macos
+        command += %w(CODE_SIGN_IDENTITY=)
+      when :ios
+        command += %w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator)
+        command += Fourflusher::SimControl.new.destination(:oldest, 'iOS', deployment_target)
+        command += %w(ARCHS=x86_64)
+        xcconfig = consumer.pod_target_xcconfig
+        if xcconfig
+          archs = xcconfig['VALID_ARCHS']
+          if archs && (archs.include? 'armv7') && !(archs.include? 'i386') && (archs.include? 'x86_64')
+            # Prevent Xcodebuild from testing the non-existent i386 simulator if armv7 is specified without i386
+            command += %w(ARCHS=x86_64)
           end
+        end
+      when :watchos
+        command += %w(CODE_SIGN_IDENTITY=- -sdk watchsimulator)
+        command += Fourflusher::SimControl.new.destination(:oldest, 'watchOS', deployment_target)
+      when :tvos
+        command += %w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator)
+        command += Fourflusher::SimControl.new.destination(:oldest, 'tvOS', deployment_target)
+      end
+
+      if analyze
+        command += %w(CLANG_ANALYZER_OUTPUT=html CLANG_ANALYZER_OUTPUT_DIR=analyzer)
       end
 
-      _validate_header_mappings_dir
-      if consumer.spec.root?
-        _validate_license
-        _validate_module_map
+      begin
+        _xcodebuild(command, true)
+      rescue => e
+        message = 'Returned an unsuccessful exit code.'
+        message += ' You can use `--verbose` for more information.' unless config.verbose?
+        error('xcodebuild', message)
+        e.message
       end
     end
 
-    def validate_source_url(spec); end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdf-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.30
 platform: ruby
 authors:
 - gaijiaofan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel