fastlane-plugin-android_reporter 0.1.19 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99783da5a4f565f0c46cd7cd51e86dd1a1400714dbe718974effb18f4825ab98
-  data.tar.gz: d83bae299e30424501e730a3b85952335b71dce0159a3e0b77baa60cf144dac4
+  metadata.gz: 0451006bf47a58d94b7976f47cb1c070e4db889891ed7f77c83d11721b1aafc3
+  data.tar.gz: b9a9c6e5084253702d25309e7fdc51a42caa98d7282e908d6bb3cfbc103a21ac
 SHA512:
-  metadata.gz: 9d6be1db0338ca3b286e9c64355c99eae212de0303a8e19b9bec2e9c3ddbe059d90406df55f73fe72b283c5234c5a538d707a7195165a504f553880c611a1882
-  data.tar.gz: 4eaaf966e0cb993aa1b9d13f7455af33861ccf97a89323de16f37ad216e7409962e6fc58d0c3271a7683d684613cd42f3c73dc4b48bd9f8ca0977a0e3a0e7e67
+  metadata.gz: 309deeb73d55bb8930f2e9fae51d4c97d3ad6b73b805bbf64906be4feed8a5bbbf51db80bd9c9e1a8ae147825feab71f6b7c7c82bd1fc071726f9a2e272e40c7
+  data.tar.gz: 6fb8db30ddd6537be8845d7b4597211f4555cacc5274c8f20482efaaaa6e148f4552fe52ea4796ad0ec653dd4568eade39b3f1eba3db47d4768f9648c847c461

data/lib/fastlane/plugin/android_reporter/actions/android_reporter_action.rb

@@ -26,28 +26,30 @@ module Fastlane
         isGradleErrorFileUploaded = false
 
         # 1. Delete Previus Generated Files
-        begin
-          File.open('logcat.txt', 'r') do |f|
-            File.delete(f)
-          end
-        rescue Errno::ENOENT
-            UI.message("Something Wrong When Delete Previus File [logcat.txt]")
-        end
+        if params[:is_delete_prev_files_enabled]
+            begin
+              File.open('logcat.txt', 'r') do |f|
+                File.delete(f)
+              end
+            rescue Errno::ENOENT
+                UI.message("Something Wrong When Delete Previus File [logcat.txt]")
+            end
 
-        begin
-          File.open('android-logs.txt', 'r') do |f|
-              File.delete(f)
-          end
-        rescue Errno::ENOENT
-            UI.message("Something Wrong When Delete Previus File [android-logs.txt]")
-        end
+            begin
+              File.open('android-logs.txt', 'r') do |f|
+                  File.delete(f)
+              end
+            rescue Errno::ENOENT
+                UI.message("Something Wrong When Delete Previus File [android-logs.txt]")
+            end
 
-        begin
-          File.open('android-error-logs.txt', 'r') do |f|
-            File.delete(f)
-          end
-        rescue Errno::ENOENT
-            UI.message("Something Wrong When Delete Previus File [android-error-logs.txt]")
+            begin
+              File.open('android-error-logs.txt', 'r') do |f|
+                File.delete(f)
+              end
+            rescue Errno::ENOENT
+                UI.message("Something Wrong When Delete Previus File [android-error-logs.txt]")
+            end
         end
 
         # 0. Checkout git to Current Branch to Run Tests on the Current Branch
@@ -110,33 +112,30 @@ module Fastlane
                "Gradle Tasks : [Clean , Build , " + gradle_task_testing_name + "]"
           ])
           if params[:gradle_task_testing_name].to_s.length > 0
-              gradleGeneratedFileThread = Thread.new {
-                sh("./gradlew clean")
-                gradle_task_result = sh("./gradlew " + gradle_task_testing_name)
-                if gradle_task_result
-                      UI.message("Gradle Task Finished Successfully ...")
-                      if params[:generate_adb_file]
-                           Process.fork do
-                              UI.message([
-                                 "Android Reporter Started to Save Logcat Logs From ADB Connection Server",
-                                 "ADB Reporting File : [logcat.txt]"
-                              ])
-
-                              begin
-                                 sh("adb logcat -d > logcat.txt kill-server")
-                              rescue => error
-                                  if error
-                                      UI.error("Something Error with Logcat Debug Report File")
-                                  end
-                                      puts error.message
-                                      puts error.backtrace
-                              end
+              sh("./gradlew clean")
+              gradle_task_result = sh("./gradlew " + gradle_task_testing_name)
+              if gradle_task_result
+                  UI.message("Gradle Task Finished Successfully ...")
+                  if params[:generate_adb_file]
+                      Process.fork do
+                          UI.message([
+                            "Android Reporter Started to Save Logcat Logs From ADB Connection Server",
+                            "ADB Reporting File : [logcat.txt]"
+                          ])
+
+                          begin
+                            sh("adb logcat -d > logcat.txt kill-server")
+                            sh("adb kill-server")
+                          rescue => error
+                            if error
+                               UI.error("Something Error with Logcat Debug Report File")
+                            end
+                               puts error.message
+                               puts error.backtrace
+                          end
                       end
-                end
+                  end
               end
-              }
-
-              gradleGeneratedFileThread.join
         end
         rescue
           UI.error("Gradle Task Finished With Error ...")
@@ -165,7 +164,8 @@ module Fastlane
                 ])
 
                 begin
-                    sh("./gradlew build > android-logs.txt 2> android-error-logs.txt")
+                    sh("./gradlew build > android-logs.txt 2> android-error-logs.txt -Dhttp.socketTimeout=60000 -Dhttp.connectionTimeout=60000 -Dorg.gradle.daemon.idletimeout=60000")
+                    sh("./gradlew --stop")
                 rescue => error
                     if error
                       UI.error("Something Error with Generate Gradle Files")
@@ -183,6 +183,7 @@ module Fastlane
             UI.message("Slack Configuration Status : Disabled ...")
         end
 
+        sleep(60000)
         # 9. Upload Files to Slack
         if is_slack_enabled
             begin
@@ -347,6 +348,13 @@ module Fastlane
               optional: true,
               type: Boolean
           ),
+          FastlaneCore::ConfigItem.new(
+               key: :is_delete_prev_files_enabled,
+               env_name: "ANDROID_GENERATED_PREV_FILES_ENABLED",
+               description: "",
+               optional: true,
+               type: Boolean
+          ),
           FastlaneCore::ConfigItem.new(
               key: :slack_api_key,
               env_name: "SLACK_API_TOKEN",

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

@@ -1,5 +1,5 @@
 module Fastlane
   module AndroidReporter
-    VERSION = "0.1.19"
+    VERSION = "0.1.24"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-android_reporter
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.24
 platform: ruby
 authors:
 - Yazan Tarifi