fastlane-plugin-android_reporter 0.1.20 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf79bdfee34c7b7840dcf3d0a9dd3c4f3f9417f2cd27bf73646f2d4488e5c579
-  data.tar.gz: 0c29d86e3aa9ebdbc394ace6a4ed6300dcab42090a4b9d03441022120d9336d2
+  metadata.gz: 3ff2cc9b5f89313105fad1f9b71ad518b26fca3ae709b4ec2360f2a4c4a220ae
+  data.tar.gz: 50cda79b62bfaa525b7d700ea8252c30fbe4edd5de69522fa6b78f66e1a857db
 SHA512:
-  metadata.gz: 72c96860dd83ad7576bb2a15bebaf32ca5188ca464c9cfa6061c5f03c74153311f5f1035842882a382f65fd8b49c932a9946f04230cad017c9f7dac801876326
-  data.tar.gz: ba9f8b3aaac0ddb48eab3303cd86c2676c478d696be5e9e2efb06f044925796e72a1f4b1d5e1be6e61071c778d9c470cf7759a2f41f55501d41890e50eff89b2
+  metadata.gz: b7bd569619369358b7a7641d23cf864634b7faca99780cc1807dabcfe0ed7cf5e86ea5dc0003114ce105d7d2ee7d659b737bc741b69f1eb11f8d9e6377b54243
+  data.tar.gz: 1d797d9de9112dabd5f3ef2f347a1954329f63df25878df77be872d0037458015292f2c6b4a7868f59ccb3e6e04dba59065f16839d6210790c48f18d1400ba9f

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
@@ -87,19 +89,15 @@ module Fastlane
         # 2. List All Available AVD's in The Device
         # 3. Run the Target AVD Name From Params
         if params[:avd_name].to_s.length > 0
-            Thread.new do
-               UI.message("Android Reporting Started to Run AVD : (" + avd_name + ")")
-               sh(android_sdk_path + "/tools/bin/avdmanager", "list", "avd")
-               sh("cd", android_sdk_path)
-               sh(android_sdk_path + "/emulator/emulator", "-avd", avd_name)
-            end
+            UI.message("Android Reporting Started to Run AVD : (" + avd_name + ")")
+            sh(android_sdk_path + "/tools/bin/avdmanager", "list", "avd")
+            sh("cd", android_sdk_path)
+            sh(android_sdk_path + "/emulator/emulator", "-avd", avd_name)
         end
 
         # 4. Clear the Logcat Server Before Start
         if params[:generate_adb_file]
-            Process.fork do
-               sh("adb logcat -c")
-            end
+            sh("adb logcat -c")
         end
 
         # 5. Start Clean Task with Target UI Task
@@ -123,6 +121,7 @@ module Fastlane
 
                           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")
@@ -137,38 +136,35 @@ module Fastlane
         rescue
           UI.error("Gradle Task Finished With Error ...")
           if params[:generate_adb_file]
-               Process.fork do
-                   begin
-                    sh("adb logcat -e > logcat.txt kill-server")
-                   rescue => error
-                     if error
-                        UI.error("Something Error with Logcat Error Report File")
-                     end
-                        puts error.message
-                        puts error.backtrace
-                   end
+               begin
+                  sh("adb logcat -e > logcat.txt kill-server")
+               rescue => error
+                  if error
+                     UI.error("Something Error with Logcat Error Report File")
+                  end
+                     puts error.message
+                     puts error.backtrace
                end
           end
         end
 
         # 7. Generate Gradle Tasks (Failed and Success Files)
         if params[:generate_gradle_files]
-             Process.fork do
-                UI.message([
-                   "Android Reporting Started to Generate Gradle Reports Files",
-                   "Gradle Success Debug File : android-logs.txt",
-                   "Gradle Failed Debug File : android-error-logs.txt"
-                ])
-
-                begin
-                    sh("./gradlew build > android-logs.txt 2> android-error-logs.txt")
-                rescue => error
-                    if error
-                      UI.error("Something Error with Generate Gradle Files")
-                    end
-                      puts error.message
-                      puts error.backtrace
-                 end
+             UI.message([
+                  "Android Reporting Started to Generate Gradle Reports Files",
+                  "Gradle Success Debug File : android-logs.txt",
+                  "Gradle Failed Debug File : android-error-logs.txt"
+             ])
+
+             begin
+                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")
+                end
+                   puts error.message
+                   puts error.backtrace
              end
         end
 
@@ -344,6 +340,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.20"
+    VERSION = "0.1.25"
   end
 end

metadata

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