Skip to content

refactor: Update PathRunnable so that it subclasses Runnable #883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pepicrft merged 8 commits into from
Dec 3, 2024
Merged

refactor: Update PathRunnable so that it subclasses Runnable #883

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cb186a9
Made the buildableReference parameter of Runnable's init an optional …
georgenavarro Nov 24, 2024
8c4f164
Refactored PathRunnable to subclass from Runnable.
georgenavarro Nov 24, 2024
50f4d28
Removed pathRunnable property from LaunchAction
georgenavarro Nov 24, 2024
3c07bf5
Brought back pathRunnable var on LaunchAction as a computed var for b…
georgenavarro Nov 29, 2024
c6d73d9
Removed excessive isEqual check in PathRunnable's == implementation
georgenavarro Nov 29, 2024
7d90c53
Added support for PathRunnable in ProfileAction
georgenavarro Nov 29, 2024
e656f7d
Added a convenience init method to LaunchAction with a PathRunnable p…
georgenavarro Nov 29, 2024
ad3e91b
Make the inits non-breaking
pepicrft Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions Sources/XcodeProj/Scheme/XCScheme+LaunchAction.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,15 @@ public extension XCScheme {
public var launchStyle: Style
public var askForAppToLaunch: Bool?
public var pathRunnable: PathRunnable? {
// For backwards compatibility
runnable as? PathRunnable
// For backwards compatibility
get {
runnable as? PathRunnable
}
set {
self.pathRunnable = newValue
Copy link
Contributor Author

@georgenavarro georgenavarro Dec 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pepicrft Looks like this was supposed to be self.runnable = newValue. Xcode is warning about infinite recursion since it is essentially calling it's own setter.

}
}

public var customWorkingDirectory: String?
public var useCustomWorkingDirectory: Bool
public var ignoresPersistentStateOnLaunch: Bool
Expand Down Expand Up @@ -81,6 +87,7 @@ public extension XCScheme {

// MARK: - Init

@available(*, deprecated, message: "Use the init() that consolidates pathRunnable and runnable into a single parameter.")
Copy link
Contributor Author

@georgenavarro georgenavarro Dec 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pepicrft I think this deprecation warning was attached to the wrong init since the other convenience init now only accepts a PathRunnable

public init(runnable: Runnable?,
buildConfiguration: String,
preActions: [ExecutionAction] = [],
Expand All @@ -90,6 +97,7 @@ public extension XCScheme {
selectedLauncherIdentifier: String = XCScheme.defaultLauncher,
launchStyle: Style = .auto,
askForAppToLaunch: Bool? = nil,
pathRunnable _: PathRunnable? = nil,
customWorkingDirectory: String? = nil,
useCustomWorkingDirectory: Bool = false,
ignoresPersistentStateOnLaunch: Bool = false,
Expand Down Expand Up @@ -163,7 +171,7 @@ public extension XCScheme {
}

public convenience init(
runnable: Runnable?,
pathRunnable: PathRunnable?,
buildConfiguration: String,
preActions: [ExecutionAction] = [],
postActions: [ExecutionAction] = [],
Expand All @@ -172,7 +180,6 @@ public extension XCScheme {
selectedLauncherIdentifier: String = XCScheme.defaultLauncher,
launchStyle: Style = .auto,
askForAppToLaunch: Bool? = nil,
pathRunnable: PathRunnable? = nil,
customWorkingDirectory: String? = nil,
useCustomWorkingDirectory: Bool = false,
ignoresPersistentStateOnLaunch: Bool = false,
Expand Down Expand Up @@ -206,7 +213,7 @@ public extension XCScheme {
customLLDBInitFile: String? = nil
) {
self.init(
runnable: pathRunnable ?? runnable,
runnable: pathRunnable,
buildConfiguration: buildConfiguration,
preActions: preActions,
postActions: postActions,
Expand All @@ -215,6 +222,7 @@ public extension XCScheme {
selectedLauncherIdentifier: selectedLauncherIdentifier,
launchStyle: launchStyle,
askForAppToLaunch: askForAppToLaunch,
pathRunnable: pathRunnable,
customWorkingDirectory: customWorkingDirectory,
useCustomWorkingDirectory: useCustomWorkingDirectory,
ignoresPersistentStateOnLaunch: ignoresPersistentStateOnLaunch,
Expand Down
Loading