cocoapods-bb-bin 0.2.7.3 → 0.2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01c0f26fd0285f0023af5e6b16e4b9985bcab9064fad4120fa8f5d8fd19053f3
-  data.tar.gz: dd09243520e105bf958c09e47cab79732156724909322c2f4e9826667bdbeea9
+  metadata.gz: c5ec32213acb36e10ab5e168d45e9dc541cfcc445da98d4bb76572f6b93ddb66
+  data.tar.gz: b7d724ae801e154fe37accfe063d31f4032cfd3ddcf8042b1be9675d0df38415
 SHA512:
-  metadata.gz: e25a46ad7fb3d01f4622e92b888088cfb457e2cb34a1da19f7ca1bd753f6dc22ff65ae053ea5937db532983788a6af0e09f9118e2e176595f6f6ce4fc6c2a4e2
-  data.tar.gz: 96b7354a6c603503d126556528062c40e81de709feccff78dfc195ae2d30fbaed3eb98c546e04f4d9ae98fc9baa150d974448861fc22602963c9f2346581983a
+  metadata.gz: a80372673884427b1ba0bf191bff64e36e7a5c53f87fb4177e56b2adb396b24bfa0eeebe2ce11dfa618faa5bd8ac7fc9f99ec74dec2592528b00341391f5fa20
+  data.tar.gz: b0b2dcbb8437e26f3eacffe64cce27d3a0158938229d318437008d76cc1f87232ec981b6eefbc47a0929bfcbdc524e86b4823e727977a928a327c1c4c7a362d7

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

@@ -211,7 +211,7 @@ module Pod
           Pathname.pwd.children.each do |child|
             # puts child
             if File.file?(child)
-              if child.extname == '.podspec'
+              if child.extname == '.podspec' || child.basename.to_s.include?('.podspec.json')
                 name = File.basename(child)
                 unless name.include?("binary-template")
                   return name

data/lib/cocoapods-bb-bin/command/bin/localPush.rb

@@ -99,7 +99,7 @@ module Pod
             Pathname.pwd.children.each do |child|
               # puts child
               if File.file?(child)
-                if child.extname == '.podspec'
+                if child.extname == '.podspec' || child.basename.to_s.include?('.podspec.json')
                   name = File.basename(child)
                   unless name.include?("binary-template")
                     return name

data/lib/cocoapods-bb-bin/command/bin/tag.rb

@@ -72,7 +72,7 @@ module Pod
             Pathname.pwd.children.each do |child|
               # puts child
               if File.file?(child)
-                if child.extname == '.podspec'
+                if child.extname == '.podspec' || child.basename.to_s.include?('.podspec.json')
                   name = File.basename(child)
                   unless name.include?("binary-template")
                     return name

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.2.7.3'
+  VERSION = '0.2.7.5'
 end
 
 module Pod

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.3
+  version: 0.2.7.5
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-08 00:00:00.000000000 Z
+date: 2023-09-27 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