cocoapods-tdf-bin 0.0.32 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16d408732ce244aa6fa7590f6ff2737677dc5fc46a9f867aa91b034b7b70141a
-  data.tar.gz: e31eb5ad823627d63de950459b59b65e69bff363868ca5a7af962f891c6db4da
+  metadata.gz: c1bc4f3966acc0b64ba2011ec32fceb515874a96171be9386f174483f6701e14
+  data.tar.gz: 7c3a845cd00bcc95a86d72177cc9d1cc87930b24567a76e4fa469a9cbe6e3624
 SHA512:
-  metadata.gz: c4d2f61a21673472392f44b043f4d47295197cfe224b1b95090903cae474439b7ec2c75fe3b8f7b3233e2b42ccfe7bb65cb141d0c3e20208edb572b8b90f35e4
-  data.tar.gz: 539e68c18b271e1a4ef853f597b9de5f68259f8dbe2d9dcb67248435d953278028a2c2c6411d360b26f7073c4ade8f845b1a15e33576843be6f0e089935f9ae9
+  metadata.gz: 0cf97f19e6a20e1fdeb7b828966960adb7a543fd9b0b290e544b3f9f3dcfb5eb637b10e2b01b2e98436066285e41e9a47b1d76cf2f561dd5364188050317317f
+  data.tar.gz: 8eac599f85262658b32e117b38048775f8edde71f16087e82dbbe2bd1c3317d7a050aee7900eabce30f0aae0484deccf8f6a6e054d62d03ef87500d884eff53d

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

@@ -71,7 +71,7 @@ module Pod
           if !@only_build
             source_specs.uniq.each do |spec|
               begin
-                fail_push_specs << spec unless CBin::Upload::Helper.new(spec,@code_dependencies,@sources).upload
+                fail_push_specs << spec unless CBin::Upload::Helper.new(spec, @code_dependencies, @sources).upload
               rescue  Object => exception
                 UI.puts exception
                 fail_push_specs << spec

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = "0.0.32"
+  VERSION = "0.0.34"
 end
 
 module Pod

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

@@ -69,7 +69,7 @@ module CBin
         source_dir = zip_dir
         file_accessor = Sandbox::FileAccessor.new(Pathname.new('.').expand_path, @spec.consumer(@platform))
         Dir.chdir(workspace_directory) do
-          builder = CBin::Library::Builder.new(@spec, file_accessor, @platform, source_dir,@framework_path)
+          builder = CBin::Library::Builder.new(@spec, file_accessor, @platform, source_dir, @framework_path)
           builder.build
         end
       end

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

@@ -31,7 +31,10 @@ module CBin
       end
 
       def build
+        # 编译出 arm64 的包
         defines = compile
+
+        # 编译出 x86_64的包
         build_sim_libraries(defines)
 
         defines
@@ -44,6 +47,7 @@ module CBin
           build_xcframework_for_ios
           # build_static_library_for_ios
 
+          # 整理 spec 的资源文件到 framework
           copy_resources
 
           # link_header
@@ -180,7 +184,7 @@ module CBin
         archs = ios_architectures
         # archs = %w[arm64 armv7 armv7s]
         archs.map do |arch|
-          xcodebuild(defines, "ARCHS=\'#{arch}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'","build-#{arch}",@build_model)
+          xcodebuild(defines, "ARCHS=\'#{arch}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'","build-#{arch}", @build_model)
         end
         # else
         # xcodebuild(defines,options)
@@ -206,9 +210,9 @@ module CBin
       def xcodebuild(defines = '', args = '', build_dir = 'build', build_model = 'Debug')
 
         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"
+          command = "xcodebuild #{defines} #{args} CODE_SIGN_IDENTITY='' 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"
         else
-          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{build_model} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
+          command = "xcodebuild #{defines} #{args} CODE_SIGN_IDENTITY='' CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{build_model} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
         end
 
         UI.message "command = #{command}"

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

@@ -181,13 +181,17 @@ module CBin
               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
+
+              platforms = suc_spec["platforms"]
+              if platforms != nil
+                platforms.delete('osx')
+                platforms.delete('tvos')
+                platforms.delete('watchos')
+              end
             rescue
             end
           }

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

@@ -154,10 +154,10 @@ module Pod
 
             spec_version = rspec.spec.version
 
-            if use_binary
-              UI.message 'cocoapods-tdf-bin 插件'
-              UI.message "- 开始处理 #{rspec.spec.name} #{spec_version} 组件."
-            end
+            # if use_binary
+            #   UI.message 'cocoapods-tdf-bin 插件'
+            #   UI.message "- 开始处理 #{rspec.spec.name} #{spec_version} 组件."
+            # end
 
             if @@build_dependencies_only_build
               missing_binary_specs << rspec.spec
@@ -216,8 +216,8 @@ module Pod
           #缓存没有二进制组件到spec文件，local_psec_dir 目录
           sources_sepc = []
           des_dir = CBin::Config::Builder.instance.local_psec_dir
-          FileUtils.rm_f(des_dir) if File.exist?des_dir
-          Dir.mkdir des_dir unless File.exist?des_dir
+          FileUtils.rm_f(des_dir) if File.exist? des_dir
+          Dir.mkdir des_dir unless File.exist? des_dir
           missing_binary_specs.uniq.each do |spec|
             next if spec.name.include?('/')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdf-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.34
 platform: ruby
 authors:
 - gaijiaofan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel