pod-pipeline 0.1.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5860ce308879a433f573795aa43dbeb1d9a82f95aaf5cf7b9989835cd1d7f7c2
-  data.tar.gz: 500b65c92ce14bb91ff17fab25bbd8a972478d66f7b649ff4bda275a03b5cb7b
+  metadata.gz: 6140c3b739ebd8d6b85fe410608dd44f2f48a93801a9fc580a84d8ea9df074e3
+  data.tar.gz: 0425fadd95bf189281397c6b897046092ca84c64369f64f19a555c2d6f253cbc
 SHA512:
-  metadata.gz: 6a4256bd76d6c94eb67d5264e6a9a5ffd178af877e0c97dbad458805fe48c9c5ffba5cedd093fa6677e970f29d48ce1d82c17668210610c0c879691897dc3165
-  data.tar.gz: 131bee767504b3a169ed7b3709a514e13f297ea4059fd63efa8d1f9a908479cc4474376bcd0e6fef694d39ba39b33ce63819dcf0424fe81258e1ffef993b36f8
+  metadata.gz: 9b589f5479a468eff707cbe0da4d7f0b2e9131ba17bce3cdfcd9ebed2d32b46709457f3e72419a33fbd1c2199569f5f5178e36a88e9e619101ba790886a12c95
+  data.tar.gz: d4bf510165a56d4cf5a6e3e7989f51f9e07d0f7d6dabd1850c3c6819234e79f16bbeae837eed079955909fbaa2d0c2b145c5f54e6a5b80aaaae3eaeeccf0f19b

data/lib/pod-pipeline/command/build.rb

@@ -110,7 +110,9 @@ module PPL
             def combine_binarys(local_dependency, pod_dependency)
                 binary = "#{@framework_path}/#{@podspec.name}"
                 #添加 构建生成的二进制文件
-                inputs = ["#{@build_path}/**/lib#{@podspec.name}.a"]
+                inputs = []
+                inputs << "#{@build_path}/**/lib#{@podspec.name}.a"
+                inputs << "#{@build_path}/**/*.framework/#{@podspec.name}"
                 if local_dependency
                     #添加 本地依赖的二进制文件
                     inputs << "#{@output}/#{@podspec.name}/Libraries/**/*.a" 
@@ -119,6 +121,7 @@ module PPL
                 if pod_dependency
                     #添加 Pod依赖库构建生成的二进制文件
                     inputs << "#{@build_path}/**/lib*.a";
+                    inputs << "#{@build_path}/**/*.framework/*";
                     #添加 Pod依赖库预先构建的二进制文件
                     inputs << "#{@output}/Example/Pods/**/*SDK/*.framework/*"
                     #添加 Pod依赖库本地依赖的二进制文件

data/lib/pod-pipeline/extension/version-ppl.rb

@@ -2,17 +2,29 @@ module Pod
     class Version
         def increase_major
             numeric_segments[0] = numeric_segments[0].to_i + 1
-            archiving(numeric_segments.join('.'))
+            archiving(numeric_joint(numeric_segments))
         end
     
         def increase_minor
             numeric_segments[1] = numeric_segments[1].to_i + 1
-            archiving(numeric_segments.join('.'))
+            archiving(numeric_joint(numeric_segments))
         end
     
         def increase_patch
             numeric_segments[2] = numeric_segments[2].to_i + 1
-            archiving(numeric_segments.join('.'))
+            archiving(numeric_joint(numeric_segments))
+        end
+
+        def numeric_joint(numeric_segments)
+            archive = ""
+            numeric_segments.each {|numeric|
+                if numeric.nil?
+                    numeric = 0
+                end
+                archive += '.' + numeric.to_s
+            }
+            archive.slice!(0)
+            return archive
         end
 
         def archiving(new_version)

data/lib/pod-pipeline/util/binary.rb

@@ -55,7 +55,7 @@ module PPL
                 `lipo "#{binary}" -thin #{arch} -output "#{binary}-#{arch}" > /dev/null 2>&1
                 echo result:$?`
                 unless thin_log.include? 'result:0'
-                    puts "lipo -thin 异常"
+                    puts "lipo #{binary} -thin #{arch} 异常"
                     return 
                 end
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-pipeline
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.3.0
 platform: ruby
 authors:
 - 郑贤达
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2022-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.2
 - !ruby/object:Gem::Dependency
   name: cocoapods-trunk
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.17
 signing_key: 
 specification_version: 3
 summary: Cocoapods流水线工具