cocoapods-bb-bin 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80a611936a4bd31c7b59239796760fb1552400a158bef386aea81b6d87d8f59a
-  data.tar.gz: d70c00af4815949f0aedbd840ff314e39800226eb350af19f67254d2e1285665
+  metadata.gz: 76f2ce8fcc1062dc2abe81a8284f8eedce188b1aa9e0bf2990d9b7d8a76fc0dc
+  data.tar.gz: 36824c60a9c04f42d860cd4207f0f05edc8a226971dab512fa4a476721db0468
 SHA512:
-  metadata.gz: 1b58054947bc411400d6f01b72838b4538ad0422a8c9350ebbd670a84d936aef5605728d785c587a3435f03c58a5ba8960e06e0ca22d6fe5bfb6541183d3bb19
-  data.tar.gz: 8d9b7e5f68be76954d5f358fc78ca0c43e726f5124ccc826ae6dd34dc7b05a3cab26c26fc656e35148c24297e770efcb31a95f8bce85d6798dfb6bf88cbaf5c0
+  metadata.gz: 5e57f12db8d797fa85238c9b3b4671a75d4d627e4bdb851d709f7fae67458ccbd757c06f2fd7cbbaee64d0041f80eb915644da0b16b2621b6a950fb513de136c
+  data.tar.gz: 0d744031084e801efe7c4c2f5d252abf35504ab36e065543223f350b51b4b3eadc7946f28d8afebe7e2400c8c3d72ee6fbcb36280ecfd1f0176bb8a219637a69

data/README.md

@@ -19,6 +19,7 @@
  6. **支持 使用与不使用 use_frameworks!**
  7. **少数支持swift项目二进制化编译的开源项目之一**
  8. 静态库支持.a、.framework、.xcframework
+ 9. 动态库支持.xcframework
 
 
 关于 插件具体的架构部署实践和更详细的资源，可以参考
@@ -47,7 +48,8 @@
 ## Usage
     $ pod bin auto [NAME.podspec] # 根据use_frameworks判断生成.a还是.framework
     $ pod bin auto [NAME.podspec] --framework-output # 生成framework文件
-    $ pod bin auto [NAME.podspec] --xcframework-output # 生成xcframework文件
+    $ pod bin auto [NAME.podspec] --xcframework-output # 生成静态xcframework文件
+    $ pod bin auto [NAME.podspec] --xcframework-dylib-output # 生成动态xcframework文件
     更多请看
     $pod bin auto --help
 

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

@@ -29,7 +29,9 @@ module Pod
               ['--no-clean', '保留构建中间产物'],
               ['--sources', '私有源地址，多个用分号区分'],
               ['--framework-output', '输出framework文件'],
-              ['--xcframework-output', '输出xcframework文件'],
+              ['--xcframework-output', '输出静态xcframework文件'],
+              ['--xcframework-dylib-output', '输出动态xcframework文件'],
+              ['--support_maccatalyst', '输出xcframework文件是否支持Mac Catalyst'],
               ['--no-zip', '不压缩静态库 为 zip'],
               ['--configuration', 'Build the specified configuration (e.g. Debug). Defaults to Release'],
               ['--env', "该组件上传的环境 %w[dev debug_iphoneos release_iphoneos]"]
@@ -48,6 +50,8 @@ module Pod
           @code_dependencies = argv.flag?('code-dependencies')
           @framework_output = argv.flag?('framework-output', false )
           @xcframework_output = argv.flag?('xcframework-output', false )
+          @xcframework_dylib_output = argv.flag?('xcframework-dylib-output', false )
+          @support_maccatalyst = argv.flag?('support_maccatalyst', false )
           @clean = argv.flag?('no-clean', false)
           @zip = argv.flag?('zip', true)
           @all_make = argv.flag?('all-make', false )
@@ -62,7 +66,7 @@ module Pod
           @additional_args = argv.remainder!
           @build_finshed = false
           @spec_sources = @sources
-          if @xcframework_output == true
+          if @xcframework_output || @xcframework_dylib_output
             # 生存xcframework优先使用源码仓库\二进制仓库
             @spec_sources = "#{sources_optionV2(@code_dependencies, nil)},https:\/\/cdn.cocoapods.org"
           end
@@ -91,6 +95,8 @@ module Pod
                                             @platform,
                                             @framework_output,
                                             @xcframework_output,
+                                            @xcframework_dylib_output,
+                                            @support_maccatalyst,
                                             @spec_sources,
                                             @zip,
                                             @spec,
@@ -133,6 +139,8 @@ module Pod
                                                 @platform,
                                                 @framework_output,
                                                 @xcframework_output,
+                                                @xcframework_dylib_output,
+                                                @support_maccatalyst,
                                                 @sources,
                                                 @zip,
                                                 @spec,

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

@@ -1,6 +1,7 @@
 
 require 'cocoapods-bb-bin/command/bin/auto'
 require 'cocoapods-bb-bin/helpers/upload_helper'
+require 'cocoapods-bb-bin/native/sources_manager'
 
 module Pod
   class Command
@@ -17,7 +18,9 @@ module Pod
               ['--allow-prerelease', '允许使用 prerelease 的版本'],
               ['--no-clean', '保留构建中间产物'],
               ['--framework-output', '输出framework文件'],
-              ['--xcframework-output', '输出xcframework文件'],
+              ['--xcframework-output', '输出静态xcframework文件'],
+              ['--xcframework-dylib-output', '输出动态xcframework文件'],
+              ['--support_maccatalyst', '输出xcframework文件是否支持Mac Catalyst'],
               ['--no-zip', '不压缩静态 framework 为 zip'],
               ['--all-make', '对该组件的依赖库，全部制作为二进制组件'],
               ['--configuration', 'Build the specified configuration (e.g. Release ). Defaults to Debug'],
@@ -41,6 +44,8 @@ module Pod
             @allow_prerelease = argv.flag?('allow-prerelease')
             @framework_output = argv.flag?('framework-output', false )
             @xcframework_output = argv.flag?('xcframework-output', false )
+            @xcframework_dylib_output = argv.flag?('xcframework-dylib-output', false )
+            @support_maccatalyst = argv.flag?('support_maccatalyst', true )
             @pushsourcespec = argv.flag?('all-push', false )
             @clean = argv.flag?('clean', true)
             @zip = argv.flag?('zip', true)
@@ -59,6 +64,15 @@ module Pod
         end
 
         def run
+          # 配置二进制库环境，需要区分静态库还是动态库
+          if @xcframework_output || @xcframework_dylib_output
+            isGenDylib = @xcframework_dylib_output
+            sources_manager = Pod::Config.instance.sources_manager
+            sources_manager.initLibEnv(isGenDylib)
+            source = sources_manager.binary_source
+            UI.puts "push run source:#{source}"
+          end
+
           @specification = Specification.from_file(@podspec)
 
           sources_sepc = run_archive
@@ -66,7 +80,7 @@ module Pod
           fail_push_specs = []
           sources_sepc.uniq.each do |spec|
             begin
-              fail_push_specs << spec unless CBin::Upload::Helper.new(spec,@code_dependencies,@sources,@pushsourcespec).upload
+              fail_push_specs << spec unless CBin::Upload::Helper.new(spec,@code_dependencies,@sources,@pushsourcespec).upload(@xcframework_dylib_output)
             rescue  Object => exception
               UI.puts exception
               fail_push_specs << spec
@@ -125,6 +139,12 @@ module Pod
           if @xcframework_output
             argvs += ['--xcframework-output']
           end
+          if @xcframework_dylib_output
+            argvs += ['--xcframework-dylib-output']
+          end
+          if @support_maccatalyst
+            argvs += ['--support_maccatalyst']
+          end
           if @all_make
             argvs += ['--all-make']
           end

data/lib/cocoapods-bb-bin/command/bin/repo/push.rb

@@ -19,7 +19,8 @@ module Pod
 
           def self.options
             [
-              ['--binary', '发布组件的二进制版本'],
+              ['--binary', '发布组件的二进制库版本'],
+              ['--dylib', '是否生成动态库，默认生成静态库'],
               ['--template-podspec=A.binary-template.podspec', '生成拥有 subspec 的二进制 spec 需要的模版 podspec, 插件会更改 version 和 source'],
               ['--reserve-created-spec', '保留生成的二进制 spec 文件'],
               ['--code-dependencies', '使用源码依赖进行 lint'],
@@ -34,6 +35,7 @@ module Pod
             @repo = argv.shift_argument
             @podspec = argv.shift_argument
             @binary = argv.flag?('binary')
+            @dylib = argv.flag?('dylib', false)
             @loose_options = argv.flag?('loose-options')
             @code_dependencies = argv.flag?('code-dependencies', true)
             @sources = argv.option('sources') || []

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

@@ -97,6 +97,8 @@ module Pod
                                             @platform,
                                             false,
                                             false,
+                                            false,
+                                            false,
                                             @sources,
                                             true,
                                             @spec,

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

@@ -13,7 +13,8 @@ module CBin
       {
           'configuration_env' => { description: '编译环境', default: 'dev', selection: %w[dev debug_iphoneos release_iphoneos] },
           'code_repo_url' => { description: '源码私有源 Git 地址', default: 'https://github.com/CocoaPods/Specs.git' },
-          'binary_repo_url' => { description: '二进制私有源 Git 地址', default: 'https://github.com/CocoaPods/Specs.git' },
+          'binary_repo_url' => { description: '二进制静态库私有源 Git 地址', default: 'https://github.com/CocoaPods/Specs.git' },
+          'dylib_repo_url' => { description: '动态链接库私有源 Git 地址', default: 'https://github.com/CocoaPods/Specs.git' },
           'binary_download_url' => { description: '二进制下载地址，内部会依次传入组件名称与版本，替换字符串中的 %s ', default: 'http://localhost:8080/frameworks/%s/%s/zip' },
           # 'binary_type' => { description: '二进制打包类型', default: 'framework', selection: %w[framework library] },
           'download_file_type' => { description: '下载二进制文件类型', default: 'zip', selection: %w[zip tgz tar tbz txz dmg] }

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.2.4'
+  VERSION = '0.2.6'
 end
 
 module Pod

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

@@ -19,6 +19,8 @@ module CBin
                      platform,
                      framework_output,
                      xcframework_output,
+                     xcframework_dylib_output,
+                     support_maccatalyst,
                      spec_sources,
                      zip,
                      rootSpec,
@@ -32,6 +34,8 @@ module CBin
         @skip_archive = skip_archive
         @framework_output = framework_output
         @xcframework_output = xcframework_output
+        @xcframework_dylib_output = xcframework_dylib_output
+        @support_maccatalyst = support_maccatalyst
         @spec_sources = spec_sources
         @zip = zip
 
@@ -85,7 +89,7 @@ module CBin
 
       # 是否编译xcframework库
       def is_build_xcframework
-        if @xcframework_output == true
+        if @xcframework_output || @xcframework_dylib_output
           return true
         end
         return false
@@ -94,7 +98,8 @@ module CBin
       def build_static_xcframework
         source_dir = Dir.pwd
         UI.puts "xcframework source_dir=#{source_dir}"
-        builder = CBin::XCFramework::XCBuilder.new(@spec, @spec_sources)
+        isGenDylib = @xcframework_dylib_output
+        builder = CBin::XCFramework::XCBuilder.new(@spec, @spec_sources, @support_maccatalyst, isGenDylib)
         builder.build
       end
 

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

@@ -15,7 +15,7 @@ module CBin
       end
 
       # 上传二进制 podspec
-      def push_binary_repo(binary_podsepc_json)
+      def push_binary_repo(binary_podsepc_json,isGenDylib=false)
         argvs = [
             "#{binary_source.name}",  # repo
             "#{binary_podsepc_json}", # spec
@@ -31,6 +31,9 @@ module CBin
         if @verbose
           argvs += ['--verbose']
         end
+        if isGenDylib # 生成动态库
+          argvs += ['--dylib']
+        end
         Pod::UI.message "上传二进制 argvs: #{argvs}"
         push = Pod::Command::Bin::Repo::Push.new(CLAide::ARGV.new(argvs))
         push.validate!

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

@@ -22,7 +22,7 @@ module CBin
         @pushsourcespec = pushsourcespec # 推送源码
       end
 
-      def upload
+      def upload(isGenDylib=false)
         Dir.chdir(CBin::Config::Builder.instance.root_dir) do
           # 创建binary-template.podsepc
           # 上传二进制文件
@@ -30,9 +30,9 @@ module CBin
           res_zip = curl_zip
           if res_zip
             filename = spec_creator
-            Pod::UI.message "上传二进制 podspec: #{filename}"
+            Pod::UI.message "上传二进制 podspec: #{filename} 是否动态库: #{isGenDylib}"
             push_helper = CBin::Push::Helper.new()
-            push_helper.push_binary_repo(filename)
+            push_helper.push_binary_repo(filename,isGenDylib)
             # 上传源码 podspec
             if @pushsourcespec
               Pod::UI.message "上传源码 podspec: #{@spec_creator.sourceSpecFilePath}"

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

@@ -14,7 +14,7 @@ module CBin
         class XCBuilder
             include Pod
             include Pod::Config::Mixin
-            def initialize(spec,spec_sources)
+            def initialize(spec,spec_sources, support_maccatalyst=false,isGenDylib=false)
                 @spec = spec
                 @spec_sources = spec_sources.split(',') unless spec_sources.nil?
                 @name = "#{@spec.name}.podspec"
@@ -26,18 +26,19 @@ module CBin
                 @use_static_library = true
                 @enable_bitcode = false
                 @symbols = true
-                @support_maccatalyst = false # 默认不再支持MacCatalyst方式支持iOS应用在mac平台运行库生成
+                @support_maccatalyst = support_maccatalyst # 默认不再支持MacCatalyst方式支持iOS应用在mac平台运行库生成
+                @support_dynamic = isGenDylib
                 
                 target_dir = "#{Dir.pwd}/#{@spec.name}-#{@spec.version}"
-                UI.puts "build initialize...#{spec} target_dir:#{target_dir}"
+                UI.puts "build initialize...#{spec} target_dir:#{target_dir} 是否支持Mac Catalyst:#{support_maccatalyst} 是否生成动态库:#{isGenDylib}"
                 UI.puts "spec_sources:#{spec_sources}"
                 UI.puts "spec_sources:#{@spec_sources}"
             end
 
             def build
-                UI.section("Building static xcframework #{@spec}") do
+                UI.section("Building xcframework #{@spec} 是否生成动态库:#{@support_dynamic}") do
                     config.static_library_enable = @use_static_library # 一定要配置 true，否则调用xcframework生成命令无效
-                    frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols, @support_maccatalyst)
+                    frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols, @support_maccatalyst, @support_dynamic)
                     frameworker.run
                     # 拷贝
                     cp_to_source_dir

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

@@ -6,14 +6,23 @@ require 'cocoapods-bb-bin/config/config'
 module Pod
   class Source
     class Manager
+
+      def initLibEnv(isGenDylib=false)
+        @dylib = isGenDylib
+      end
+
       # 源码 source
       def code_source
         source_with_name_or_url(CBin.config.code_repo_url)
       end
 
-      # 二进制 source
+      # 二进制 source (区分动态库还是静态库)
       def binary_source
-        source_with_name_or_url(CBin.config.binary_repo_url)
+        if @dylib # 动态库
+          source_with_name_or_url(CBin.config.dylib_repo_url)
+        else # 静态库
+          source_with_name_or_url(CBin.config.binary_repo_url)
+        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.4
+  version: 0.2.6
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -70,7 +70,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -80,7 +80,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.9
+rubygems_version: 3.4.16
 signing_key:
 specification_version: 4
 summary: cocoapods-bb-bin is a plugin which helps develpers switching pods between