lib/run_loop/device.rb in run_loop-4.3.0 vs lib/run_loop/device.rb in run_loop-4.4.1

@@ -257,13 +257,16 @@
           end
         end
       end
 
       if ios_version.major == (xcode_version.major + 2)
-        return ios_version.minor <= xcode_version.minor
+        if xcode_version.major == 10 && xcode_version.minor == 3
+          return ios_version.minor <= 4
+        else
+          return ios_version.minor <= xcode_version.minor
+        end
       end
-
       false
     end
 
     # Return the instruction set for this device.
     #
@@ -775,18 +778,15 @@
       RunLoop::ProcessWaiter.pgrep_f(path)
     end
 
     # @!visibility private
     def simulator_running_system_app_pids
-      base_dir = xcode.developer_dir
-      if xcode.version_gte_110?
-        sim_apps_dir = "Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/Applications"
-      elsif xcode.version_gte_90?
-        sim_apps_dir = "Platforms/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/Applications"
+      if xcode.version_gte_90?
+        sim_apps_dir = File.join(xcode.core_simulator_dir, "Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/Applications")
       else
-        sim_apps_dir = "Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/Applications"
+        sim_apps_dir = File.join(xcode.developer_dir, "Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/Applications")
       end
-      path = File.expand_path(File.join(base_dir, sim_apps_dir))
+      path = File.expand_path(sim_apps_dir)
       RunLoop::ProcessWaiter.pgrep_f(path)
     end
   end
 end