fastlane-plugin-alioss 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 981fe34e7c62cfb03bd85a920e1ae094474f3f222f2d11b072574c87606fbaad
-  data.tar.gz: 517a60e29e26ee0a9a88d3c60f3d008fc91ab71169c1838562b0e933f0b8256d
+  metadata.gz: 261fcb55a1dccb4f42cc77382b70bab1a48332fa847d16bd37f4dda4914ec6b3
+  data.tar.gz: 365601c71eea52452f546d72898b9664121e86af0328dbf41bdfd2883c0ffad6
 SHA512:
-  metadata.gz: 55774636d73d5b0db4ae66a3c8e92edf26e6696b878c892650748d33c8aea6733c39635b3cabba496cde32c638fbd3eb45696c57ca379a2399410ba7f485e2f9
-  data.tar.gz: 29e9041568666684a4744ec000c178015019fb3bf2ff56adb6000baab9d0c690a715cc1946611b76632a742eac524699368ffb59c61a074c5431acaa3fcb3995
+  metadata.gz: c4ad8c3e99eddc89300e439c581064946cd3ff1eaa7e1d0e104b7640e69319ecdd5149f661073c22040bb669c03a52154b51338f0b0e871192e1eb8e311ceaf4
+  data.tar.gz: 9bdcb756f8bde9a059f48fcf82c646b4b0ee4f531794265702dc0d166bc14484ce3308972001748e3af0c2b3b15140b476badf2c4c6ec5065339e4e5ed03cb2e

data/lib/fastlane/plugin/alioss/actions/alioss_action.rb

@@ -95,10 +95,21 @@ module Fastlane
           bucket_path = "#{path_for_app_name}/iOS"
         when ".apk"
           bucket_path = "#{path_for_app_name}/Android"
-          build_number = Actions.lane_context[SharedValues::ANDROID_VERSION_CODE]
-          version_number = Actions.lane_context[SharedValues::ANDROID_VERSION_NAME]
-          if build_number.nil || version_number.nil?
-            UI.important "ANDROID_VERSION_CODE & ANDROID_VERSION_NAME is nil，请设置 Actions.lane_context[SharedValues::ANDROID_VERSION_NAME] = version_name，推荐在fastlane中配置fastlane-plugin-versioning_android。"
+          # versionName、versionCode先从output.json文件里取
+          apk_output_json_path = File.join(File.dirname(build_file), "output.json")
+          if File.readable?(apk_output_json_path)
+            apk_output_json = JSON.parse(File.read(apk_output_json_path))
+            build_number = apk_output_json.first["apkInfo"]["versionCode"]
+            version_number = apk_output_json.first["apkInfo"]["versionName"]
+          end
+          # 如果output.json文件里取不到则从Actions.lane_context中取
+          if build_number.nil? || version_number.nil
+            if Actions.lane_context[:ANDROID_VERSION_NAME].nil? || Actions.lane_context[:ANDROID_VERSION_CODE].nil?
+              UI.important "Actions.lane_context 不包含[ANDROID_VERSION_NAME, ANDROID_VERSION_CODE]，请配置fastlane env，推荐使用fastlane-plugin-versioning_android。"
+            else
+              build_number = Actions.lane_context[SharedValues::ANDROID_VERSION_CODE]
+              version_number = Actions.lane_context[SharedValues::ANDROID_VERSION_NAME]
+            end
           end
         when ".app"
           bucket_path = "#{path_for_app_name}/Mac"

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Alioss
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-alioss
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - woodwu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2019-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry