cocoapods-bb-bin 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b30a04e912b87aa25398b4560ff1fdae7c03592486dc8dabb09dee1af0e0b8ca
-  data.tar.gz: 7b95c7b683c05776c6daab5fc46289a4f1922c0c09c39662b1c21e5257f44353
+  metadata.gz: 6b89f001104ecdb85f0dd860945910ad39e9f571f6a6cf6bfb80d7dbcb3651b5
+  data.tar.gz: 7b8527d71339c4c3eb0e44037e96e402578c524abe32e4a6e5656a251acbf87c
 SHA512:
-  metadata.gz: 320fff33dc1ed13e1c557818cbf751db6343de672dcb679eeabc1b68ed9e014035170024816ad3edf23776ba9de80d9ce0fe98c89fce4aa3c44821460f6a7d8b
-  data.tar.gz: 3746950eff6456298216505a3a3ee0d59560dcd1153a1f6e507ea0cf90eb406785ec14cbde344208593998f4c822ab3defa8eec8db084e1e64336cbf7c7e2a60
+  metadata.gz: 0efa752e40ced20e12331a10c9257b6af2699b3c113120f4fc03a1de0a232d0b4773ede729133bf420ad98f09c185a7a917356a969cf4206c9667eca01f609d6
+  data.tar.gz: f2c304f7f7cd5d8e547ddba78c00e2057d2c12de701c2699e700b94c1465bb65a97edb53d4d0b7e9d0bab1c348334d2ab9e0e88095290bb53ab7f0d31c1449c4

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

@@ -170,12 +170,12 @@ module Pod
                   argvs += ['--use-podfile']
                 end
 
-                unless CBin::Build::Utils.uses_frameworks?
+                if CBin::Build::Utils.uses_frameworks? # 组件库重新生成pod工程引入静态库需要使用该选项，否则报cocoapods中verify_no_static_framework_transitive_dependencies验证无法通过 by hm 21/10/18
                   argvs += ['--use-libraries']
                 end
 
                 argvs << spec_file if spec_file
-
+                UI.puts "argvs:#{argvs}"
                 gen = Pod::Command::Gen.new(CLAide::ARGV.new(argvs))
                 gen.validate!
                 gen.run

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

@@ -203,6 +203,8 @@ module Pod
           return name
         end
 
+        private
+
         # podfile创建软链接
         def link_podfile
           current_path = Pathname.pwd
@@ -210,16 +212,35 @@ module Pod
             if filename == 'Podfile'
               filepath = File.join(current_path,"#{filename}")
               return filepath
+            else
+              if filename != "." and filename != ".."
+                filepath = File.join(current_path,"#{filename}")
+                if File.directory?(filepath)
+                  # 二级目录遍历Podfile
+                  Dir.foreach(filepath) do |filename|
+                    if filename == 'Podfile'
+                      podfile_path = File.join(filepath,"#{filename}")
+                      create_link(podfile_path, current_path)
+                      return podfile_path
+                    end
+                  end
+                end
+              end
             end
           end
           # 没有找到podfile（小组件）
           podfile_path = File.join(current_path,"Example/Podfile")
           if File.file?(podfile_path)
-            system("ln -s #{podfile_path} #{current_path}")
-            UI.warn "创建软链接 podfile:#{podfile_path} link:#{current_path}"
+            create_link(podfile_path, current_path)
+          end
+        end
+
+        def create_link(source_file, dest_file)
+          if File.file?(source_file)
+            system("ln -s #{source_file} #{dest_file}")
+            UI.puts "创建软链接 source:#{source_file} link:#{dest_file}"
           end
         end
-    
       end
     end
   end

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

@@ -20,6 +20,7 @@ module CBin
       def load_build_config
         @white_pod_list = []
         @ignore_git_list = []
+        @ignore_http_list = []
         project_root = Pod::Config.instance.project_root
         path = File.join(project_root.to_s, 'BinArchive.json')
 
@@ -30,7 +31,7 @@ module CBin
           @ignore_git_list = config['ignore-git-list']
           UI.warn "====== ignore_git_list = #{@ignore_git_list}" if @ignore_git_list
           @ignore_http_list = config['ignore-http-list']
-
+          UI.warn "====== ignore_http_list = #{@ignore_http_list}" if @ignore_http_list
           @xcode_build_name = config['xcode_build_path']
           @root_dir = config['root_dir'] unless config['root_dir'].nil?
         end

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.1.0'
+  VERSION = '0.1.4'
 end
 
 module Pod

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

@@ -10,6 +10,9 @@ module CBin
         if Utils.uses_frameworks?
           return true
         end
+        if Utils.is_generate_frameworks(spec)
+          return true
+        end
 
         return Utils.is_swift_module(spec)
       end
@@ -57,6 +60,23 @@ module CBin
         return uses_frameworks
       end
 
+      def Utils.is_generate_frameworks(spec)
+        # framework
+        zip_file = CBin::Config::Builder.instance.framework_zip_file(spec) + ".zip"
+        res = File.exist?(zip_file)
+        Pod::UI::puts "zip_file = #{zip_file}"
+        unless res
+          # xcframework
+          zip_file = CBin::Config::Builder.instance.xcframework_zip_file(spec) + ".zip"
+          res = File.exist?(zip_file)
+          Pod::UI::puts "zip_file = #{zip_file}"
+        end
+        if res
+          is_framework = true
+        end
+        return is_framework
+      end
+
     end
 
   end

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

@@ -22,8 +22,10 @@ module CBin
       def create
         # spec = nil
         if CBin::Build::Utils.is_framework(@code_spec)
+          Pod::UI::puts "make framework spec"
           spec = create_framework_from_code_spec
         else
+          Pod::UI::puts "make source code spec"
           spec = create_from_code_spec
         end
 

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

@@ -3,13 +3,11 @@
 require 'cocoapods/command/gen'
 require 'cocoapods/generate'
 
-require 'cocoapods-framework/config'
-require 'cocoapods-framework/util'
-require 'cocoapods-framework/xbuilder'
-require 'cocoapods-framework/frameworker'
-require 'cocoapods-framework/muti_frameworker'
-#这个放在最后一个
-require 'cocoapods-framework/command'
+require 'cocoapods-xcframework/config'
+require 'cocoapods-xcframework/util'
+require 'cocoapods-xcframework/xbuilder'
+require 'cocoapods-xcframework/frameworker'
+require 'cocoapods-xcframework/muti_frameworker'
 
 module CBin
     class XCFramework

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2021-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -62,16 +62,16 @@ dependencies:
   name: cocoapods-bb-xcframework
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement