cocoapods-bb-bin 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b89f001104ecdb85f0dd860945910ad39e9f571f6a6cf6bfb80d7dbcb3651b5
-  data.tar.gz: 7b8527d71339c4c3eb0e44037e96e402578c524abe32e4a6e5656a251acbf87c
+  metadata.gz: 92aac3b42f5f900aa8994380291b97a8794502bb6983d850ce3bf3dc4ef005ee
+  data.tar.gz: 7a103332b3845ba48a457b87a55e916afe4f8fe53e98e899a8f147e1785f90b7
 SHA512:
-  metadata.gz: 0efa752e40ced20e12331a10c9257b6af2699b3c113120f4fc03a1de0a232d0b4773ede729133bf420ad98f09c185a7a917356a969cf4206c9667eca01f609d6
-  data.tar.gz: f2c304f7f7cd5d8e547ddba78c00e2057d2c12de701c2699e700b94c1465bb65a97edb53d4d0b7e9d0bab1c348334d2ab9e0e88095290bb53ab7f0d31c1449c4
+  metadata.gz: 6236774e980f7e3455944cf3cc825a0c270cde86f489c60a294cef5308c0d35ebea030f7e1ff142cd9e7b7a07ccd2e623d97dde99852d5215d6e03ccedc91960
+  data.tar.gz: fd318d8fe2f1a9c6b8bf749ebc0e13df80996b48b7435e33b206638b2908a2403a0d88a343acac3d1c43201befecc5f286fdfd907d8393c34ba5db6b9279d2c5

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

@@ -221,6 +221,8 @@ module Pod
                     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
@@ -232,14 +234,14 @@ module Pod
           podfile_path = File.join(current_path,"Example/Podfile")
           if File.file?(podfile_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)
-          if File.file?(source_file)
-            system("ln -s #{source_file} #{dest_file}")
-            UI.puts "创建软链接 source:#{source_file} link:#{dest_file}"
-          end
+          system("ln -s #{source_file} #{dest_file}")
+          UI.puts "create link source:#{source_file} dest:#{dest_file}"
         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

@@ -27,7 +27,7 @@ module CBin
         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']

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.1.4'
+  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/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/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.4
+  version: 0.1.5
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2021-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel