cocoapods-bb-bin 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35aca7dea61c61142b1eacf128996c1f165ef093cf13bb78b258c8db0405789c
-  data.tar.gz: 190ae0e9bb158819c764b8da68fe71af4b3c18f369a2889f47ebf45470d08f19
+  metadata.gz: 9a0b3904ae69693b6a4e16d57411ad5593eb0a1631a59481fc438dd608173c91
+  data.tar.gz: a6e88bbb26fe868817172d8bcfc695180833a2c56a456187e32f8b4fadb23b40
 SHA512:
-  metadata.gz: d238db6291137bf5c11e007cbd8fe34878bc5825c287c0b90367e22e1813a9cd290cd8f743a141fc2d5df1fa99a0a7d28b8bf8fc598093c3a0f11bb0d2e9fb18
-  data.tar.gz: 9dd33e6134e4eb707d7e0468cb8655881b9b89affa0027c1dc33b9b53fcc59d776e349cdede9fc02086ff7bb5dca8068c83afbdcd8cf08ed3c818b56fa4538f2
+  metadata.gz: 9850aca45f033aba865d7f5aaca8b266c9ab158b27073a08fc11f035227f6b1b83e50903c1672c8141f2f2ec53beaa8b47c61c759852f78ceca8a29e06d56e59
+  data.tar.gz: 27d5e05acad74ff8173460a507ddcba00c7d61f8eb00fac82e3ab8db10233a631485bee04f2186c72550c2dc2644c1a6ff44b263a899bf029a4515b5bc8005f0

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

@@ -175,7 +175,7 @@ module Pod
                 end
 
                 argvs << spec_file if spec_file
-                UI.puts "argvs:#{argvs}"
+                # 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

@@ -29,7 +29,6 @@ module Pod
           @help = argv.flag?('help', false )
           if @help
           else
-            puts "开始执行自动推送操作，"
             @env = argv.option('env') || 'dev'
             CBin.config.set_configuration_env(@env)
   
@@ -132,7 +131,7 @@ module Pod
             argvs += ["--env=#{@env}"]
           end
           argvs += ["--configuration=#{@config}"]
-          puts "===auto argvs: #{argvs}"
+          # puts "===auto argvs: #{argvs}"
           archive = Pod::Command::Bin::Archive.new(CLAide::ARGV.new(argvs))
           archive.validate!
           sources_sepc = archive.run
@@ -189,7 +188,7 @@ module Pod
         def find_podspec
           name = nil
           Pathname.pwd.children.each do |child|
-            puts child
+            # puts child
             if File.file?(child)
               if child.extname == '.podspec'
                 name = File.basename(child)
@@ -221,8 +220,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)
+                      # pods_path = File.join(filepath,"Pods")
+                      # create_link(pods_path, current_path)
                       return podfile_path
                     end
                   end
@@ -234,8 +233,8 @@ 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)
+            # pods_path = File.join(current_path,"Example/Pods")
+            # create_link(pods_path, current_path)
           end
         end
 

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

@@ -24,12 +24,12 @@ module CBin
       file = config_dev_file
       if configuration_env == "release_iphoneos"
         file = config_release_iphoneos_file
-        puts "\n======  #{configuration_env} 环境 ========"
+        # puts "\n======  #{configuration_env} 环境 ========"
       elsif configuration_env == "debug_iphoneos"
         file = config_debug_iphoneos_file
-        puts "\n======  #{configuration_env} 环境 ========"
+        # puts "\n======  #{configuration_env} 环境 ========"
       elsif configuration_env == "dev"
-        puts "\n======  #{configuration_env} 环境 ========"
+        # puts "\n======  #{configuration_env} 环境 ========"
       else
         raise "\n=====  #{configuration_env} 参数有误，请检查%w[dev debug_iphoneos release_iphoneos]===="
       end

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

@@ -143,6 +143,10 @@ module CBin
 
       #编译target名，如 seeyou
       def target_name
+        podfile_path = Pod::Config.instance.podfile_path
+        unless podfile_path
+          return ""
+        end
         @target_name ||= begin
                            target_name_str =  Pod::Config.instance.podfile.root_target_definitions.first.children.first.to_s
                            target_name_str[5,target_name_str.length]

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end
 
 module Pod

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

@@ -266,14 +266,33 @@ module CBin
             module_map = File.read(module_map_file)
           end
         elsif public_headers.map(&:basename).map(&:to_s).include?("#{@spec.name}-umbrella.h")
-          module_map = <<-MAP
-          framework module #{@spec.name} {
-            umbrella header "#{@spec.name}-umbrella.h"
-
-            export *
-            module * { export * }
-          }
-          MAP
+          archs = ios_architectures + ios_architectures_sim
+          swift_Compatibility_Header = "build-#{archs.first}/Swift\ Compatibility\ Header/#{@spec.name}-Swift.h"
+          # 策略：针对混编组件，modulemap写入-Swift.h by hm 21.11.15
+          if File.exist?(swift_Compatibility_Header) # swift或swift与oc混编工程
+            module_map = <<-MAP
+framework module #{@spec.name} {
+  umbrella header "#{@spec.name}-umbrella.h"
+
+  export *
+  module * { export * }
+}
+
+module #{@spec.name}.Swift {
+    header "#{@spec.name}-Swift.h"
+    requires objc
+}
+MAP
+          else
+            module_map = <<-MAP
+framework module #{@spec.name} {
+  umbrella header "#{@spec.name}-umbrella.h"
+
+  export *
+  module * { export * }
+}
+MAP
+          end
         end
 
         unless module_map.nil?

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

@@ -35,7 +35,7 @@ module Pod
           generator.podfile_plugins.each do |name, options|
             plugin(*[name, options].compact)
           end
-          Pod::UI::puts "====use_frameworks:#{generator.configuration.use_frameworks?}"
+          # Pod::UI::puts "====use_frameworks:#{generator.configuration.use_frameworks?}"
           use_frameworks!(generator.configuration.use_frameworks?)
 
           if (supported_swift_versions = generator.supported_swift_versions)
@@ -104,7 +104,7 @@ module Pod
           inhibit_all_warnings! if generator.inhibit_all_warnings?
           # use_modular_headers! if generator.use_modular_headers?
           # podfile 配置 use_frameworks! :linkage => :static 支持modulemap by hm 21/10/19
-          Pod::UI::puts "====use_frameworks_value:#{generator.use_frameworks_value}"
+          # Pod::UI::puts "====use_frameworks_value:#{generator.use_frameworks_value}"
           unless generator.use_frameworks_value
             use_modular_headers! # 默认组件没有配置或者没有podfile，支持modulemap by hm 21/10/20
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -62,6 +62,9 @@ dependencies:
   name: cocoapods-bb-xcframework
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -69,6 +72,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -190,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.30
 signing_key:
 specification_version: 4
 summary: cocoapods-bb-bin is a plugin which helps develpers switching pods between