cocoapods-meitu-bin 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 471b86e9797ce3ab7f09877755b0c3473baa5ea31ff3d3f19694dd829059b033
-  data.tar.gz: eef8b276868277386cc2153030a0f8dab00ee0fba7d4574d05c04406879e3aa7
+  metadata.gz: 86aab10f2c27b3bfbdf44ed3b6874b7d6be473bb91dcd8a51c0e5906547d48e6
+  data.tar.gz: a3b0f074a9ee8c24c8043c558314ea3bdfc3b28d1513e87909717547819b8460
 SHA512:
-  metadata.gz: 56f89da57ab03d6622b7c2f5649bd45a68fc89c6dd9847fafcf547da1d6a80255cb33c22ac12629d49e4d272b977d19911fe9a318721e6c7425775464dd3e3e0
-  data.tar.gz: 41be7d7d12089f6a6c8c74f45d4eda244f478c20634ea27d553b74bccc104b0c6cc6840b91320addf3bd97cf1c51915ea814a66096d0efd53b9f97d63d79ce73
+  metadata.gz: '088de3a018fda2b6b9215b61a26e101881fd4ca2a5a1f2ec9c4a9a4773b4ac3d11c4cd880a4ee979fc776a76bb54fcada03ae198b7dc14096903ee8d43a78f1c'
+  data.tar.gz: 7bf240596cded061b4dc3f86006c4e47f4fa9d5613a37b9d2655943ad8c980930e639159737fcd5f4ec5d7564cb5deecf7918ccfacaaf03257bb8a72a1026763

data/lib/cocoapods-meitu-bin/config/config.rb

@@ -3,6 +3,7 @@ require 'cocoapods-meitu-bin/native/podfile'
 require 'cocoapods-meitu-bin/native/podfile_env'
 require 'cocoapods/generate'
 require 'cocoapods'
+require 'ostruct'
 module CBin
   class Config
     def config_file

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

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = "1.4.0"
+  VERSION = "2.0.0"
 end
 
 module Pod

data/lib/cocoapods-meitu-bin/helpers/buildAll/builder.rb

@@ -352,23 +352,24 @@ ibtool \
         fwks_dir = "#{result_product_dir}/fwks"
         FileUtils.mkdir(fwks_dir) unless File.exist?(fwks_dir)
         fwks.map do |fwk|
-          new_fwk = get_XCFrameworkIntermediates_path(fwk)
-          if new_fwk && File.exist?(new_fwk)
-            `rsync -av #{new_fwk} #{fwks_dir}`
-          else
-            `rsync -av #{fwk} #{fwks_dir}`
-          end
-        end
-      end
-      def get_XCFrameworkIntermediates_path(path)
-        # 使用正则表达式匹配并提取 AdsFramework
-        match = path.to_s.match(/\/([^\/]+)\.xcframework/)
-        if match
-          framework_path = "#{product_dir}/#{iphoneos}/XCFrameworkIntermediates/#{match[1]}/#{match[1]}.framework"
-          return framework_path
+          `rsync -av #{fwk} #{fwks_dir}`
+          # new_fwk = get_XCFrameworkIntermediates_path(fwk)
+          # if new_fwk && File.exist?(new_fwk)
+          #   `rsync -av #{new_fwk} #{fwks_dir}`
+          # else
+          #   `rsync -av #{fwk} #{fwks_dir}`
+          # end
         end
-        return  nil
       end
+      # def get_XCFrameworkIntermediates_path(path)
+      #   # 使用正则表达式匹配并提取 AdsFramework
+      #   match = path.to_s.match(/\/([^\/]+)\.xcframework/)
+      #   if match
+      #     framework_path = "#{product_dir}/#{iphoneos}/XCFrameworkIntermediates/#{match[1]}/#{match[1]}.framework"
+      #     return framework_path
+      #   end
+      #   return  nil
+      # end
 
       # 拷贝 framework
       def copy_framework

data/lib/cocoapods-meitu-bin/helpers/buildAll/podspec_util.rb

@@ -27,7 +27,7 @@ module CBin
         # 处理vendored_libraries和vendored_frameworks
         spec['vendored_libraries'] = "#{root_dir}/libs/*.a"
         #兼容.xcframework
-        spec['vendored_frameworks'] = %W[#{root_dir} #{root_dir}/fwks/*.framework]
+        spec['vendored_frameworks'] = %W[#{root_dir} #{root_dir}/fwks/*.{framework,xcframework}]
         # 处理资源
         resources = %W[#{root_dir}/*.{#{special_resource_exts.join(',')}} #{root_dir}/resources/*]
         spec['resources'] = resources

data/lib/cocoapods-meitu-bin/native/installation_options.rb

@@ -23,6 +23,10 @@ module Pod
 
       # 并发执行个数
       option :multi_threads_count, 4
+
+      # 默认并发下载
+      defaults.delete('parallel_pod_downloads')
+      option :parallel_pod_downloads, true
     end
   end
 end

data/lib/cocoapods-meitu-bin/native/pod_source_installer.rb

@@ -6,14 +6,17 @@ module Pod
   class Installer
     class PodSourceInstaller
       attr_accessor :installation_options
-
-      alias old_verify_source_is_secure verify_source_is_secure
-      def verify_source_is_secure(root_spec)
-        # http source 默认不警告
-        if installation_options.warn_for_unsecure_source?
-          old_verify_source_is_secure(root_spec)
-        end
-      end
     end
+    # class PodSourceDownloader
+    #   attr_accessor :installation_options
+    #
+    #   alias old_verify_source_is_secure verify_source_is_secure
+    #   def verify_source_is_secure(root_spec)
+    #     # http source 默认不警告
+    #     if installation_options.warn_for_unsecure_source?
+    #       old_verify_source_is_secure(root_spec)
+    #     end
+    #   end
+    # end
   end
 end

data/lib/cocoapods-meitu-bin/source_provider_hook.rb

@@ -203,6 +203,13 @@ Pod::HooksManager.register('cocoapods-meitu-bin', :pre_install) do |_context|
   Pod::UI.puts "当前configuration: `#{ENV['configuration'] || Pod::Config.instance.podfile.configuration}`".green
   # pod bin repo update 更新二进制私有源
   Pod::Command::Bin::Repo::Update.new(CLAide::ARGV.new($ARGV)).run
+  #获取analyzer中所有git 且branch 指向的pod
+  Pod::Config.instance.podfile.dependencies.map do |dependency|
+    if dependency.external_source && dependency.external_source[:git] && (dependency.external_source[:branch] || (dependency.external_source.size == 1))
+      #brash 指定的组件添加到全局PodUpdateConfig配置中，执行pod install 需要更新的分支最新提交
+      PodUpdateConfig.add_value(dependency.name)
+    end
+  end
   content = File.read(Pod::Config.instance.podfile_path)
   if content
     if content.include?("target \"MTXX\"")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-meitu-bin
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-05 00:00:00.000000000 Z
+date: 2024-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel