fastlane-plugin-upload_dsym_to_bugly 2.0.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b688fde25af37f186763b15245e410a3334265fba920193bbb4d30ec368cba2
-  data.tar.gz: f986bb43300e8c476a9da3bffa08fa6de4879c8abf9df3a390ec8159c2e6046b
+  metadata.gz: 56b6c1ae16243dc8d62132b246f37f3e83c328894dadbbd0e807051b40dcc536
+  data.tar.gz: 6bbdce12bca8794a7d4c6db7173a945473fb7b95ae3d84e9860cb288da0da70e
 SHA512:
-  metadata.gz: 0f411f834fee0cabd1958edac2ceb580faba48a75916cf5ffdb635ca1ceb6af6f5299876f56a28ac8b696fa0034296a1729ebc2c5fa88604d5d231fe9a264fab
-  data.tar.gz: e21ec9bf95eed1d556a34a44ef9d4c0e9b0610069505c423fcda3468440e1140ae5bde47356fa10b118f2d80c13c4c4d7eab1ed146f995891113a005c4526364
+  metadata.gz: feda282ea6961d845cc7c9315169431a7e44179ceb9f7e18a4c4af1eaba39fbd810489e9cc724e1e95fe05fdb6490571d6c497810725e3da64766fc6080d2ea2
+  data.tar.gz: ad01ca189463cdc7a7ba8e885a71227df28afeaba8d0789da3fd224afa75132ff7bbf35b90605ebea3df4213f70cfba99e146bb87fb32f1aec911332052c0366

data/lib/fastlane/plugin/upload_dsym_to_bugly/actions/upload_dsym_to_bugly_action.rb

@@ -10,7 +10,7 @@ module Fastlane
     class UploadDsymToBuglyAction < Action
       def self.run(params)
 
-        jar_path = File.expand_path('../../jars/buglyqq-upload-symbol-3.3.4.jar', __FILE__)
+        jar_path = File.expand_path('../../jars/buglyqq-upload-symbol.jar', __FILE__)
         UI.message "jar path: #{jar_path}"
 
         file_path = File.expand_path("#{params[:file_path]}")
@@ -30,20 +30,22 @@ module Fastlane
           Actions.lane_context[SharedValues::UPLOAD_DSYM_TO_BUGLY_RESULT] = false
           raise if params[:raise_if_error]
         end
-        cmd = "java -jar \"#{jar_path}\" -appid \"#{params[:app_id]}\" -appkey \"#{params[:app_key]}\" -bundleid \"#{params[:bundle_id]}\" -version \"#{params[:version]}\" -platform \"#{params[:platform]}\" -inputSymbol \"#{unzip_path}\""
+
+        java_path = params[:java_path] || 'java'
+        cmd = "#{java_path} -jar \"#{jar_path}\" -appid \"#{params[:app_id]}\" -appkey \"#{params[:app_key]}\" -bundleid \"#{params[:bundle_id]}\" -version \"#{params[:version]}\" -platform \"#{params[:platform]}\" -inputSymbol \"#{unzip_path}\""
 
         log_file = "dSYM_upload_result.log"
 
         begin
           sh("#{cmd} > #{log_file}")
-          last_line = sh("tail -n 1 \"#{log_file}\"")
+          log_content = File.read("#{log_file}")
 
-          success = last_line.include?("retCode: 200") and last_line.include?("\"msg\":\"success\"")
+          success = log_content.include?("retCode: 200") and log_content.include?("\"msg\":\"所有符号表都已经上传过。\"")
           if success
-            UI.message "dSYM upload successfully 🎉 "            
+            UI.success " 🎉 🎉 🎉 dSYM upload successfully (づ｡◕‿‿◕｡)づ"            
             Actions.lane_context[SharedValues::UPLOAD_DSYM_TO_BUGLY_RESULT] = true
           else
-            UI.message "dSYM upload failed: #{last_line}"
+            UI.error "┭┮﹏┭┮ dSYM upload failed ┭┮﹏┭┮"
             Actions.lane_context[SharedValues::UPLOAD_DSYM_TO_BUGLY_RESULT] = false
             raise if params[:raise_if_error]        
           end
@@ -123,7 +125,13 @@ module Fastlane
                                        default_value: true,
                                        is_string: false,
                                        type: Boolean,
-                                       optional: false)
+                                       optional: false),
+          FastlaneCore::ConfigItem.new(key: :java_path,
+                                       env_name: "FL_UPLOAD_DSYM_TO_BUGLY_JAVA_PATH",
+                                       description: "Use specific Java, instead of system one",
+                                       default_value: nil,
+                                       is_string: true,
+                                       optional: true),
         ]
       end
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module UploadDsymToBugly
-    VERSION = "2.0.1"
+    VERSION = "2.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-upload_dsym_to_bugly
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.2.0
 platform: ruby
 authors:
 - liubo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-22 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -147,7 +147,7 @@ files:
 - lib/fastlane/plugin/upload_dsym_to_bugly.rb
 - lib/fastlane/plugin/upload_dsym_to_bugly/actions/upload_dsym_to_bugly_action.rb
 - lib/fastlane/plugin/upload_dsym_to_bugly/helper/upload_dsym_to_bugly_helper.rb
-- lib/fastlane/plugin/upload_dsym_to_bugly/jars/buglyqq-upload-symbol-3.3.4.jar
+- lib/fastlane/plugin/upload_dsym_to_bugly/jars/buglyqq-upload-symbol.jar
 - lib/fastlane/plugin/upload_dsym_to_bugly/version.rb
 homepage: https://github.com/srv7/fastlane-plugin-upload_dsym_to_bugly
 licenses:
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: upload_dsym_to_bugly