cocoapods-bb-bin 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92aac3b42f5f900aa8994380291b97a8794502bb6983d850ce3bf3dc4ef005ee
-  data.tar.gz: 7a103332b3845ba48a457b87a55e916afe4f8fe53e98e899a8f147e1785f90b7
+  metadata.gz: 35aca7dea61c61142b1eacf128996c1f165ef093cf13bb78b258c8db0405789c
+  data.tar.gz: 190ae0e9bb158819c764b8da68fe71af4b3c18f369a2889f47ebf45470d08f19
 SHA512:
-  metadata.gz: 6236774e980f7e3455944cf3cc825a0c270cde86f489c60a294cef5308c0d35ebea030f7e1ff142cd9e7b7a07ccd2e623d97dde99852d5215d6e03ccedc91960
-  data.tar.gz: fd318d8fe2f1a9c6b8bf749ebc0e13df80996b48b7435e33b206638b2908a2403a0d88a343acac3d1c43201befecc5f286fdfd907d8393c34ba5db6b9279d2c5
+  metadata.gz: d238db6291137bf5c11e007cbd8fe34878bc5825c287c0b90367e22e1813a9cd290cd8f743a141fc2d5df1fa99a0a7d28b8bf8fc598093c3a0f11bb0d2e9fb18
+  data.tar.gz: 9dd33e6134e4eb707d7e0468cb8655881b9b89affa0027c1dc33b9b53fcc59d776e349cdede9fc02086ff7bb5dca8068c83afbdcd8cf08ed3c818b56fa4538f2

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

@@ -165,8 +165,8 @@ module Pod
                   "--verbose",
                   *@additional_args
                 ]
-
-                if File.exist?(Pod::Config.instance.podfile_path)
+                podfile_path = Pod::Config.instance.podfile_path
+                if podfile_path && File.exist?(podfile_path)
                   argvs += ['--use-podfile']
                 end
 

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

@@ -30,11 +30,10 @@ module Pod
           if @help
           else
             puts "开始执行自动推送操作，"
-            podfile_path = link_podfile # 创建软链接
-  
             @env = argv.option('env') || 'dev'
             CBin.config.set_configuration_env(@env)
   
+            podfile_path = link_podfile # 创建软链接
             @podspec = argv.shift_argument || find_podspec
             @specification = Specification.from_file(@podspec)
   
@@ -200,6 +199,7 @@ module Pod
               end
             end
           end
+          raise Informative,  "podspec File no exist, please check" unless name
           return name
         end
 

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

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

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

@@ -48,6 +48,10 @@ module CBin
 
       def Utils.uses_frameworks?
         uses_frameworks = false
+        podfile_path = Pod::Config.instance.podfile_path
+        unless podfile_path
+          return true
+        end
         Pod::Config.instance.podfile.target_definitions.each do |key,value|
           if key != "Pods"
             uses_frameworks = value.uses_frameworks?

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

@@ -186,7 +186,8 @@ module CBin
           archs = ios_architectures
           # archs = %w[arm64 armv7 armv7s]
           archs.map do |arch|
-            xcodebuild(defines, "ARCHS=\'#{arch}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'","build-#{arch}",@build_model)
+            xcodebuild(defines, "-sdk iphoneos ARCHS=\'#{arch}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'","build-#{arch}",@build_model)
+            # xcodebuild(defines, "-sdk iphoneos ARCHS=\'#{arch}\' ","build-#{arch}",@build_model)
           end
         # else
           # xcodebuild(defines,options)
@@ -209,12 +210,12 @@ module CBin
          end
       end
 
-      def xcodebuild(defines = '', args = '', build_dir = 'build', build_model = 'Debug')
-
+      def xcodebuild(defines = '', args = '', build_dir = 'build', build_model = 'Debug', configuration = 'Release')
+        
         unless File.exist?("Pods.xcodeproj") #cocoapods-generate v2.0.0
-          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{File.join(File.expand_path("..", build_dir), File.basename(build_dir))} clean build -configuration #{build_model} -target #{target_name} -project ./Pods/Pods.xcodeproj 2>&1"
+          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{File.join(File.expand_path("..", build_dir), File.basename(build_dir))} clean build -configuration #{configuration} -target #{target_name} -project ./Pods/Pods.xcodeproj 2>&1"
         else
-          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{build_model} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
+          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{configuration} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
         end
 
         UI.message "command = #{command}"
@@ -333,6 +334,8 @@ module CBin
         if bundles.count > 0
           UI.message "Copying bundle files #{bundles}"
           bundle_files = bundles.join(' ')
+          raise Informative,  "source resource bundle no exist #{bundle_files}" unless File.exist?(bundle_files)
+          UI.message "[build dir]Copying resources current_path:#{Dir.pwd} bundle_files:#{bundle_files} res_path:#{framework.resources_path}"
           `cp -rp #{bundle_files} #{framework.resources_path} 2>&1`
         end
 
@@ -344,7 +347,7 @@ module CBin
           end
           raise "copy_resources #{spec_source_dir} no exist " unless File.exist?(spec_source_dir)
 
-          spec_source_dir = File.join(Dir.pwd,"#{@spec.name}")
+          # spec_source_dir = File.join(Dir.pwd,"#{@spec.name}") # 去除重复赋值，有些资源放在pods/组件目录下
           real_source_dir = spec_source_dir
         end
 
@@ -363,8 +366,10 @@ module CBin
           resources.each do |source|
             escape_resource << Shellwords.join(source)
           end
-          UI.message "Copying resources #{escape_resource}"
-          `cp -rp #{escape_resource.join(' ')} #{framework.resources_path}`
+          bundle_files = escape_resource.join(' ')
+          raise Informative,  "source resource bundle no exist #{bundle_files}" unless File.exist?(bundle_files)
+          UI.message "[search dir]Copying resources current_path:#{Dir.pwd} bundle_files:#{bundle_files} res_path:#{framework.resources_path}"
+          `cp -rp #{bundle_files} #{framework.resources_path} 2>&1`
         end
       end
 

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?}"
           use_frameworks!(generator.configuration.use_frameworks?)
 
           if (supported_swift_versions = generator.supported_swift_versions)
@@ -104,6 +104,10 @@ 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}"
+          unless generator.use_frameworks_value
+            use_modular_headers! # 默认组件没有配置或者没有podfile，支持modulemap by hm 21/10/20
+          end
           if generator.use_modular_headers? || generator.use_frameworks_value.to_s == '{:linkage=>:static}'
             use_modular_headers!
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel