cocoapods-bb-bin 0.2.7.2 → 0.2.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ba27ee353fb8afc8faf34326241d9021adad83317e7eae1b65d9765c4d53a10
-  data.tar.gz: d62111b697e6b0b29d70ba181a1b37b48a7e46a61a7af31c33b9555785126b5b
+  metadata.gz: 80c0429394d3ce85918c28ebcfa8f817aade2bb2309a73a980e447d6af6f48e8
+  data.tar.gz: d4c3794d17b0950d9279e460fedc9eb628adf299cfcc5851e95311e8bdefdba8
 SHA512:
-  metadata.gz: 1ddb6ee604a94a15cc9687fada3e2b7da2286ca8e21b7d9dc11485b635f57447b5b07d72adbdf15a8f4b8025a5c53121fedbbf40265e09b3437437be30ca8c12
-  data.tar.gz: 87051230e4b8b3a5f4b09690203e11bc6490a6919425a733aa32a662d3fcae5a8f5261b8a449a941f09968eb06883d91832b9a6273d16582d61a536e1d6207e8
+  metadata.gz: 0a78ad44d84637689c249ad3a210ce467c0f2c0c95b9159710f6d621c902d13ef8077b751a124d1d7682083bd8ce019c1c3613b06192285d2d291c004922de5c
+  data.tar.gz: c0f9294119b2f5662422c95e7a6073e1c39a010e5a3e41703c0b6050fb6d47420e290cb3f2a25575095c25c5e53f2181b8b41ce5311dec5be647c06dcaa9b8ba

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.2.7.2'
+  VERSION = '0.2.7.4'
 end
 
 module Pod

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

@@ -23,7 +23,9 @@ module CBin
       end
 
       def upload(isGenDylib=false)
-        return upload_binary_file(own_source_binary_file, isGenDylib, @spec.name)
+        Dir.chdir(CBin::Config::Builder.instance.root_dir) do
+          return upload_binary_file(own_source_binary_file, isGenDylib, @spec.name)
+        end
       end
 
       def upload_binary_file(zip_file, isGenDylib=false, vendored_framework_name=nil)

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

@@ -96,6 +96,8 @@ module Pod
         specs_by_target = old_resolver_specs_by_target.bind(self).call
 
         sources_manager = Config.instance.sources_manager
+        binary_source = sources_manager.binary_source
+        code_source = sources_manager.code_source
         use_source_pods = podfile.use_source_pods
 
         missing_binary_specs = []
@@ -123,11 +125,10 @@ module Pod
 
             # 采用二进制依赖并且不为开发组件
             use_binary = use_binary_rspecs.include?(rspec)
-            source = use_binary ? sources_manager.binary_source : sources_manager.code_source
-
+            source = use_binary ? binary_source : code_source
             spec_version = rspec.spec.version
-            # UI.message 'cocoapods-bb-bin 插件'
-            # UI.message "- 开始处理 #{rspec.spec.name} #{spec_version} 组件."
+            # UI.puts 'cocoapods-bb-bin 插件'
+            # UI.puts "- 开始处理 #{rspec.spec.name} #{spec_version} 组件."
 
             begin
               # 从新 source 中获取 spec,在bin archive中会异常，因为找不到

data/lib/cocoapods-bb-bin/native/sources_manager.rb

@@ -9,25 +9,52 @@ module Pod
 
       def initLibEnv(isGenDylib=false)
         @dylib = isGenDylib
+        UI.puts "初始化源环境support dylib:#{isGenDylib}"
       end
 
       # 源码 source
       def code_source
-        if @dylib # 动态库
+        if supportDylibSource # 动态库
           source_with_name_or_url(CBin.config.sourceV2_repo_url)
         else # 静态库
           source_with_name_or_url(CBin.config.code_repo_url)
         end
       end
 
+      # 静态库二进制源
+      def static_binary_source
+        source_with_name_or_url(CBin.config.binary_repo_url)
+      end
+      # 动态库二进制源
+      def dylib_binary_source
+        source_with_name_or_url(CBin.config.dylib_repo_url)
+      end
+
       # 二进制 source (区分动态库还是静态库)
       def binary_source
-        if @dylib # 动态库
-          source_with_name_or_url(CBin.config.dylib_repo_url)
-        else # 静态库
-          source_with_name_or_url(CBin.config.binary_repo_url)
+        return supportDylibSource ? dylib_binary_source : static_binary_source
+      end
+
+      # 是否支持动态库
+      def supportDylibSource
+        if @dylib
+          return true
+        else
+          # 优先解析podfile中source动态配置是否添加动态库源
+          podfile = Pod::Config.instance.podfile
+          if podfile
+            dylib_source = CBin.config.dylib_repo_url
+            podfile.sources.map do |source|
+              if source === dylib_source
+                UI.puts "切换到动态库源:#{dylib_binary_source}"
+                return true
+              end
+            end
+          end
+          return false
         end
       end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-bin
 version: !ruby/object:Gem::Version
-  version: 0.2.7.2
+  version: 0.2.7.4
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-05 00:00:00.000000000 Z
+date: 2023-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.14
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: cocoapods-bb-bin is a plugin which helps develpers switching pods between