fastlane-plugin-fastci 0.0.16 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 474a6fea64b826122fa8115f06d5b25bef60aa13923d927c64ece25629aa83fb
-  data.tar.gz: 1c59927bbfebac589f18367195a01e17604d5ac6e5d04649153ac3e3d9d90f2b
+  metadata.gz: 2bc18fc84e8700a9de27b84d282b3fe7fb60bb504cdb0e5334b76e23a26f7842
+  data.tar.gz: ca0609bcf90695129d8ccd5f44713bf42b3f98f9235926f3639ab7da3f290f42
 SHA512:
-  metadata.gz: 5fd12daa82ecba9cc76a337ae316f26ed049badc1751761475150eb75d88c34f830e0a21e6596063c0610fc534782106fcfea53a65f14ae10c6ba3e95d22618e
-  data.tar.gz: 21ccf459cf5f1112a4d6a2c24175fc7dfadbc964fb87a486ab92961eb2ab0f4d698b19c05117816ee583b811d013e4f463ffbf69ae8adf590456e40a95308589
+  metadata.gz: 30138459bec64d1c98507dc3c0f49010954341268e021278ac45cb023139638a124d323d3afc691ac2e863e656599a8d0523357af424d324e3d0e71fb4d6700c
+  data.tar.gz: cb31239457057b3514d9204cc3f41df8790222a95ac19fd71db5f5997513b7bf2cc05486ed80d19ee839010e6078107c001211ed6c590b406a2095a02e182a1c

data/README.md

@@ -30,6 +30,7 @@
 然后终端进入项目根目录即可使用 ` fastlane `
 
 如果是同一个 xcworkspace 多 xcodeproj 的情况，可以采用多配置文件的方式。同样也是参考 [` .env.default `](fastlane/.env.default) 根据多个 xcodeproj 创建多个配置文件 ` .env.project1 ` 、 ` .env.project2 `，注意文件的隐藏扩展，名字不能是 ` .env.project1.default `；
+不同的配置文件配置不同的 ` PROJECT_NAME `；
 执行的时候指定环境文件 ` fastlane --env project1 package ` 来运行
 
 

data/lib/fastlane/plugin/fastci/actions/package_action.rb

@@ -35,17 +35,33 @@ module Fastlane
         scheme = params[:scheme] || Environment.scheme
 
         # 更改项目version
-        other_action.increment_version_number(
-          version_number: version
-        ) if CommonHelper.is_validate_string(version)
+        if CommonHelper.is_validate_string(version)
+          increment_options = { version_number: version }
+          if CommonHelper.is_validate_string(Environment.project)
+            increment_options[:xcodeproj] = Environment.project
+          end
+          other_action.increment_version_number(increment_options)
+        end
 
         # 更改项目build号
-        UpdateBuildNumberAction.run(
+        other_action.update_build_number(
           build: build
         )
         time = Time.new.strftime("%Y%m%d%H%M")
-        version = Actions::GetVersionNumberAction.run(target: scheme)
-        build = Actions::GetBuildNumberAction.run({})
+        
+        # 获取版本号
+        version_options = { target: scheme }
+        if CommonHelper.is_validate_string(Environment.project)
+          version_options[:xcodeproj] = Environment.project
+        end
+        version = other_action.get_version_number(version_options)
+        
+        # 获取 build 号
+        build_options = {}
+        if CommonHelper.is_validate_string(Environment.project)
+          build_options[:xcodeproj] = Environment.project
+        end
+        build = other_action.get_build_number(build_options)
         # 生成ipa包的名字格式
         ipaName = "#{scheme}_#{export_method}_#{version}_#{build}.ipa"
         

data/lib/fastlane/plugin/fastci/actions/update_build_number_action.rb

@@ -29,11 +29,13 @@ module Fastlane
         end
 
         UI.message("*************| 更新 build #{build} |*************")
+        
         # 更改项目 build 号
-        Actions::IncrementBuildNumberAction.run(
-          build_number: build,
-          xcodeproj: Environment.project
-        )
+        build_options = { build_number: build }
+        if CommonHelper.is_validate_string(Environment.project)
+          build_options[:xcodeproj] = Environment.project
+        end
+        other_action.increment_build_number(build_options)
         
       end
 

data/lib/fastlane/plugin/fastci/actions/upload_fir_action.rb

@@ -13,7 +13,7 @@ module Fastlane
           api_token: Environment.fir_api_token,
           password: Environment.fir_password,
           changelog: params[:changelog],
-          switch_to_qiniu: true
+          switch_to_qiniu: Environment.fir_switch_qiniu
         )
         
         return firinfo

data/lib/fastlane/plugin/fastci/helper/environment.rb

@@ -87,6 +87,9 @@ module Fastlane
       def self.fir_password
         ENV['FIR_PASSWORD']
       end
+      def self.fir_switch_qiniu
+        ENV['FIR_SWITCH_QINIU'] == "true"
+      end
 
       # 钉钉配置
       def self.dingdingToken

data/lib/fastlane/plugin/fastci/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Fastci
-    VERSION = "0.0.16"
+    VERSION = "0.0.18"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-fastci
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.18
 platform: ruby
 authors:
 - watermelon