runner.rb in gym-1.6.3

- old
+ new

@@ -14,10 +14,11 @@
       verify_archive
 
       FileUtils.mkdir_p(Gym.config[:output_directory])
 
       if Gym.project.ios? || Gym.project.tvos?
+        fix_generic_archive # See https://github.com/fastlane/fastlane/pull/4325
         package_app
         fix_package
         compress_and_move_dsym
         path = move_ipa
         move_manifest
@@ -70,10 +71,15 @@
       if File.exist?(PackageCommandGenerator.ipa_path)
         File.delete(PackageCommandGenerator.ipa_path)
       end
     end
 
+    def fix_generic_archive
+      return if ENV["GYM_USE_GENERIC_ARCHIVE_FIX"].nil?
+      Gym::XcodebuildFixes.generic_archive_fix
+    end
+
     def fix_package
       return unless Gym.config[:use_legacy_build_api]
       Gym::XcodebuildFixes.swift_library_fix
       Gym::XcodebuildFixes.watchkit_fix
       Gym::XcodebuildFixes.watchkit2_fix
@@ -94,11 +100,11 @@
                                               error: proc do |output|
                                                 ErrorHandler.handle_build_error(output)
                                               end)
 
       mark_archive_as_built_by_gym(BuildCommandGenerator.archive_path)
-      UI.success "Successfully stored the archive. You can find it in the Xcode Organizer."
+      UI.success "Successfully stored the archive. You can find it in the Xcode Organizer." unless Gym.config[:archive_path].nil?
       UI.verbose("Stored the archive in: " + BuildCommandGenerator.archive_path)
     end
 
     # Makes sure the archive is there and valid
     def verify_archive
@@ -207,11 +213,9 @@
         UI.success "Successfully exported Apps folder:"
         UI.message apps_path
         apps_path
       end
     end
-
-    private
 
     def find_archive_path
       if Gym.config[:use_legacy_build_api]
         BuildCommandGenerator.archive_path
       else