cocoapods-bb-bin 0.2.12.0 → 0.2.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 513d66c8a95960b33e0aab22e3bcb22932d3670b1e252a29599080e037229ca5
-  data.tar.gz: 6669c915cc922f2049714b3b2d80a1022a4889cbf1de00f08abf86ba59144bfa
+  metadata.gz: 436d5ca6587d55a7fde3fda6646dc51051f4307a8c236dd89e74a1ea79251717
+  data.tar.gz: 24d05024f5920a696fe155d162595aee1abab38f961dcd06ae73894cd3d6ea38
 SHA512:
-  metadata.gz: 469be51e7790b3ea7590cd1a4f82ddd1d8af3e29e748e377088a52d7248d770c6c40bfcef1a9f2e7dd2df142245e6e6f1ab0e15483c9b68dd7db66078191b241
-  data.tar.gz: 245147d9cff2f982077ad8769fd24f2f604b1e6257e7e50ba06eab80f94eab43a4016f18c6f1b31eaf26c64a8a29cca61913faae1c15551ae4436258586b8b4f
+  metadata.gz: c91ff8699f55fcddb7d899808a7e122e95cf6beef18877a82d1e02f2d68ebdc9c33b7c9c53137f186957684a4459d89d3ad9760b8a633a05faeb9fefd260af68
+  data.tar.gz: f45745fd9790a9b74c63fa57d7dbab900ee880115ceb0196fcad5215c28c4b97874613716f91ab439b037a9670b4d0d20435f2f68c8ddc1a4d0d33e94cff5445

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

@@ -90,6 +90,13 @@ module Pod
           return sources_sepc
         end
 
+        def build_workspace
+          worksppace_path = File.expand_path("#{CBin::Config::Builder.instance.gen_dir}/#{@spec.name}")
+          path = File.join(worksppace_path, "#{@spec.name}.xcworkspace")
+          raise Informative,  "#{path} File no exist, please check" unless File.exist?(path)
+          return path
+        end
+
         def build_root_spec
           builder = CBin::Build::Helper.new(@spec,
                                             @platform,
@@ -101,7 +108,8 @@ module Pod
                                             @zip,
                                             @spec,
                                             CBin::Config::Builder.instance.white_pod_list.include?(@spec.name),
-                                            @config)
+                                            @config,
+                                            build_workspace)
           builder.build
           builder.clean_workspace if @clean && !@all_make
         end
@@ -145,7 +153,8 @@ module Pod
                                                 @zip,
                                                 @spec,
                                                 false ,
-                                                @config)
+                                                @config,
+                                            build_workspace)
               builder.build
             rescue Object => exception
               UI.puts exception
@@ -184,11 +193,14 @@ module Pod
                 end
 
                 if CBin::Build::Utils.uses_frameworks? # 组件库重新生成pod工程引入静态库需要使用该选项，否则报cocoapods中verify_no_static_framework_transitive_dependencies验证无法通过 by hm 21/10/18
+                  # argvs += ['--use-libraries'] # 选项会导致生成.a
+                  UI.puts "generate framework project"
+                else
                   argvs += ['--use-libraries']
                 end
 
                 argvs << spec_file if spec_file
-                # UI.puts "argvs:#{argvs}"
+                UI.puts "generate_project argvs:#{argvs}"
                 gen = Pod::Command::Gen.new(CLAide::ARGV.new(argvs))
                 gen.validate!
                 gen.run

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

@@ -1,7 +1,7 @@
 require 'cocoapods'
 
 module CBin
-  VERSION = '0.2.12.0'
+  VERSION = '0.2.12.2'
 end
 
 module Pod

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

@@ -25,7 +25,8 @@ module CBin
                      zip,
                      rootSpec,
                      skip_archive = false,
-                     build_model="Release")
+                     build_model="Release",
+                     workspace=nil)
         @spec = spec
         @platform = platform
         @build_model = build_model
@@ -38,10 +39,11 @@ module CBin
         @support_maccatalyst = support_maccatalyst
         @spec_sources = spec_sources
         @zip = zip
+        @workspace = workspace
 
         @framework_path
 
-        UI.puts "build initialize...#{spec}"
+        UI.puts "build initialize...#{spec} rootSpec:#{rootSpec} build_model:#{build_model} workspace:#{workspace}"
       end
 
       # build framework
@@ -97,9 +99,9 @@ module CBin
       # build xcframework
       def build_static_xcframework
         source_dir = Dir.pwd
-        UI.puts "xcframework source_dir=#{source_dir}"
+        UI.puts "xcframework source_dir=#{source_dir} workspace:#{@workspace}"
         isGenDylib = @xcframework_dylib_output
-        builder = CBin::XCFramework::XCBuilder.new(@spec, @spec_sources, @support_maccatalyst, isGenDylib)
+        builder = CBin::XCFramework::XCBuilder.new(@spec, @spec_sources, @support_maccatalyst, isGenDylib, @workspace)
         builder.build
       end
 

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, support_maccatalyst=false,isGenDylib=false)
+            def initialize(spec, spec_sources, support_maccatalyst=false, isGenDylib=false, workspace=nil)
                 @spec = spec
                 @spec_sources = spec_sources.split(',') unless spec_sources.nil?
                 @name = "#{@spec.name}.podspec"
@@ -28,9 +28,10 @@ module CBin
                 @symbols = true
                 @support_maccatalyst = support_maccatalyst # 默认不再支持MacCatalyst方式支持iOS应用在mac平台运行库生成
                 @support_dynamic = isGenDylib
+                @workspace = workspace
                 
                 target_dir = "#{Dir.pwd}/#{@spec.name}-#{@spec.version}"
-                UI.puts "build initialize...#{spec} spec_sources:#{spec_sources} target_dir:#{target_dir} 是否支持Mac Catalyst:#{support_maccatalyst} 是否生成动态库:#{isGenDylib}"
+                UI.puts "build initialize...#{spec} spec_sources:#{spec_sources} target_dir:#{target_dir} 是否支持Mac Catalyst:#{support_maccatalyst} 是否生成动态库:#{isGenDylib} workspace:#{workspace}"
             end
 
             def build
@@ -61,6 +62,7 @@ module CBin
                     "--use-modular-headers=#{@use_modular_headers}",
                     "--archive-export", # 默认archive导出dylib
                     # "--no-archive-export",
+                    "--workspace=#{@workspace}",
                 ]
                 if @force
                     argvs += ['--force']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-bin
 version: !ruby/object:Gem::Version
-  version: 0.2.12.0
+  version: 0.2.12.2
 platform: ruby
 authors:
 - humin
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7.2
+        version: 0.2.7.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -93,7 +93,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7.2
+        version: 0.2.7.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'