cocoapods-bb-bin 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe2934d8f1194dc059fd28f6f72965ae1770b1d818dbfa21859fdb81d11bf750
-  data.tar.gz: e23974f0b469458fb2cf9082c3aeba560395cef6bf69656070ad86aecae5e3db
+  metadata.gz: 92aac3b42f5f900aa8994380291b97a8794502bb6983d850ce3bf3dc4ef005ee
+  data.tar.gz: 7a103332b3845ba48a457b87a55e916afe4f8fe53e98e899a8f147e1785f90b7
 SHA512:
-  metadata.gz: 77b296493acbe2d184ee3b5958a4c90e28cf88fec7d81675126d5291b9ee324980d363084f6b66180c59661e944aa9c9e383860ff46e326a15b15516c8d5288d
-  data.tar.gz: 9496462c8286ce8f1535ca84387950328d0c27646fb7e3c884a514ee1b2ce912b0ae7258bb3c0bebcf93f27b05387e539d130e9bf76e1389dbf2ae3f60be3f76
+  metadata.gz: 6236774e980f7e3455944cf3cc825a0c270cde86f489c60a294cef5308c0d35ebea030f7e1ff142cd9e7b7a07ccd2e623d97dde99852d5215d6e03ccedc91960
+  data.tar.gz: fd318d8fe2f1a9c6b8bf749ebc0e13df80996b48b7435e33b206638b2908a2403a0d88a343acac3d1c43201befecc5f286fdfd907d8393c34ba5db6b9279d2c5

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,37 @@ 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)
+                      pods_path = File.join(filepath,"Pods")
+                      create_link(pods_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)
+            pods_path = File.join(current_path,"Example/Pods")
+            create_link(pods_path, current_path)
           end
         end
-    
+
+        def create_link(source_file, dest_file)
+          system("ln -s #{source_file} #{dest_file}")
+          UI.puts "create link source:#{source_file} dest:#{dest_file}"
+        end
       end
     end
   end

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

@@ -94,7 +94,7 @@ module CBin
 
     def config
       @config ||= begin
-                    @config = OpenStruct.new load_config
+        @config = OpenStruct.new load_config
         validate!
         @config
       end
@@ -131,6 +131,4 @@ module CBin
   def self.config
     @config ||= Config.new
   end
-
-
 end

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

@@ -20,17 +20,18 @@ 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')
 
         if File.exist?(path)
           config = JSON.parse(File.read(path))
           @white_pod_list = config['archive-white-pod-list']
-          UI.warn "====== archive-white-pod-list = #{@white_pod_list}" if @white_pod_list
+          UI.warn "====== white_pod_list = #{@white_pod_list}" if @white_pod_list
           @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.1'
+  VERSION = '0.1.5'
 end
 
 module Pod

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

@@ -56,6 +56,7 @@ module CBin
             build_static_framework
             unless @skip_archive
               unless  CBin::Build::Utils.is_framework(@spec)
+                UI.puts "build static library"
                 build_static_library
                 zip_static_library
               else

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/framework.rb

@@ -10,9 +10,10 @@ module CBin
     attr_reader :swift_module_path
     attr_reader :fwk_path
 
-    def initialize(name, platform)
+    def initialize(name, platform, embedded=false)
       @name = name
       @platform = platform
+      @embedded = embedded
     end
 
     def make
@@ -79,6 +80,11 @@ module CBin
 
     def make_root
       @root_path = Pathname.new(@platform)
+
+      if @embedded
+        @root_path += Pathname.new(@name + '.embeddedframework')
+      end
+      
       @root_path.mkpath unless @root_path.exist?
     end
   end

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

@@ -42,10 +42,11 @@ module CBin
 
         UI.puts "framework lipo build"
 
-        if CBin::Build::Utils.is_swift_module(@spec) || !CBin::Build::Utils.uses_frameworks?
+        # if CBin::Build::Utils.is_swift_module(@spec) || !CBin::Build::Utils.uses_frameworks?
+        if CBin::Build::Utils.is_framework(@spec) # 默认生成framework为静态库.a
           UI.section("Building static Library #{@spec}") do
             # defines = compile
-            UI.puts "swift framework lipo build"
+            UI.puts "static framework lipo build"
             # build_sim_libraries(defines)
             output = framework.versions_path + Pathname.new(@spec.name)
 

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/native/podfile_generator.rb

@@ -22,9 +22,10 @@ module Pod
       def podfile_for_spec(spec)
         generator = self
         dir = configuration.gen_dir_for_pod(spec.name)
+        project_name = configuration.project_name_for_spec(spec)
 
         Pod::Podfile.new do
-          project "#{spec.name}.xcodeproj"
+          project "#{project_name}.xcodeproj"
           workspace "#{spec.name}.xcworkspace"
 
           plugin 'cocoapods-generate'
@@ -101,16 +102,16 @@ module Pod
 
 
           inhibit_all_warnings! if generator.inhibit_all_warnings?
-          use_modular_headers! if generator.use_modular_headers?
+          # use_modular_headers! if generator.use_modular_headers?
+          # podfile 配置 use_frameworks! :linkage => :static 支持modulemap by hm 21/10/19
+          if generator.use_modular_headers? || generator.use_frameworks_value.to_s == '{:linkage=>:static}'
+            use_modular_headers!
+          end
 
           # This is the pod declaration for the local pod,
           # it will be inherited by the concrete target definitions below
-
           pod_options = generator.dependency_compilation_kwargs(spec.name)
           pod_options[:path] = spec.defined_in_file.relative_path_from(dir).to_s
-          # generator.configuration.podfile.dependencies[0].external_source
-
-
           { testspecs: test_specs, appspecs: app_specs }.each do |key, specs|
             pod_options[key] = specs.map { |s| s.name.sub(%r{^#{Regexp.escape spec.root.name}/}, '') }.sort unless specs.empty?
           end
@@ -196,4 +197,3 @@ module Pod
     end
   end
 end
-

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

@@ -6,7 +6,7 @@ Pod::HooksManager.register('cocoapods-bb-bin', :pre_install) do |_context, _|
   require 'cocoapods-bb-bin/native'
 
   #pod bin update || install  不走这里
-  if $ARGV[1] = 'update' || $ARGV[1] != 'install'
+  if $ARGV[1] == 'update' || $ARGV[1] != 'install'
 
   else
     # pod bin repo update 更新二进制私有源

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.5
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2021-10-19 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