diff --git a/Package.resolved b/Package.resolved index 21e51788..aeda4546 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "e64a631d84155fa1dd47d1dbcfb085ffbdfbc60ee0792fee2a2320579e19f568", + "originHash" : "da11843ba7e29e33f591112f543436ce10d051f103b9cd34c43cbec663d3951e", "pins" : [ { "identity" : "aexml", @@ -33,8 +33,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/tuist/FileSystem.git", "state" : { - "revision" : "ed76b19034f6a04a266319ed5c460377e8e91fb8", - "version" : "0.14.25" + "revision" : "807653a9814c42cdfa5d555cc48a009fe0341797", + "version" : "0.14.36" } }, { @@ -51,8 +51,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Kolos65/Mockable.git", "state" : { - "revision" : "e969f8469667382af3cbf6e457b2e771e70745f3", - "version" : "0.6.0" + "revision" : "92523c3c0623402e9600dcf99f63603f52a889d8", + "version" : "0.6.1" } }, { @@ -114,8 +114,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swiftlang/swift-docc-plugin", "state" : { - "revision" : "3e4f133a77e644a5812911a0513aeb7288b07d06", - "version" : "1.4.5" + "revision" : "e977f65879f82b375a044c8837597f690c067da6", + "version" : "1.4.6" } }, { @@ -150,8 +150,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-log", "state" : { - "revision" : "2778fd4e5a12a8aaa30a3ee8285f4ce54c5f3181", - "version" : "1.9.1" + "revision" : "bbd81b6725ae874c69e9b8c8804d462356b55523", + "version" : "1.10.1" } }, { @@ -186,8 +186,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/tuist/XcodeProj", "state" : { - "revision" : "31712ec42e9cbc46e7fd25ea55c2730cb3476097", - "version" : "9.7.2" + "revision" : "a41b0637a995d81e086ce7ec9a50d469a542115c", + "version" : "9.8.0" } }, { diff --git a/Sources/XcodeGraph/Models/ProfileAction.swift b/Sources/XcodeGraph/Models/ProfileAction.swift index 1699b6df..675663ff 100644 --- a/Sources/XcodeGraph/Models/ProfileAction.swift +++ b/Sources/XcodeGraph/Models/ProfileAction.swift @@ -8,6 +8,7 @@ public struct ProfileAction: Equatable, Codable, Sendable { public let preActions: [ExecutionAction] public let postActions: [ExecutionAction] public let executable: TargetReference? + public let askForAppToLaunch: Bool public let arguments: Arguments? // MARK: - Init @@ -17,12 +18,14 @@ public struct ProfileAction: Equatable, Codable, Sendable { preActions: [ExecutionAction] = [], postActions: [ExecutionAction] = [], executable: TargetReference? = nil, + askForAppToLaunch: Bool = false, arguments: Arguments? = nil ) { self.configurationName = configurationName self.preActions = preActions self.postActions = postActions self.executable = executable + self.askForAppToLaunch = askForAppToLaunch self.arguments = arguments } } @@ -35,6 +38,7 @@ public struct ProfileAction: Equatable, Codable, Sendable { postActions: [ExecutionAction] = [], // swiftlint:disable:next force_try executable: TargetReference? = TargetReference(projectPath: try! AbsolutePath(validating: "/Project"), name: "App"), + askForAppToLaunch: Bool = false, arguments: Arguments? = Arguments.test() ) -> ProfileAction { ProfileAction( @@ -42,6 +46,7 @@ public struct ProfileAction: Equatable, Codable, Sendable { preActions: preActions, postActions: postActions, executable: executable, + askForAppToLaunch: askForAppToLaunch, arguments: arguments ) } diff --git a/Sources/XcodeGraph/Models/RunAction.swift b/Sources/XcodeGraph/Models/RunAction.swift index 400e9030..c4d91bc8 100644 --- a/Sources/XcodeGraph/Models/RunAction.swift +++ b/Sources/XcodeGraph/Models/RunAction.swift @@ -16,6 +16,7 @@ public struct RunAction: Equatable, Codable, Sendable { public let diagnosticsOptions: SchemeDiagnosticsOptions public let metalOptions: MetalOptions? public let expandVariableFromTarget: TargetReference? + public let askForAppToLaunch: Bool public let launchStyle: LaunchStyle public let appClipInvocationURL: URL? public var customWorkingDirectory: AbsolutePath? @@ -36,6 +37,7 @@ public struct RunAction: Equatable, Codable, Sendable { diagnosticsOptions: SchemeDiagnosticsOptions, metalOptions: MetalOptions? = nil, expandVariableFromTarget: TargetReference? = nil, + askForAppToLaunch: Bool = false, launchStyle: LaunchStyle = .automatically, appClipInvocationURL: URL? = nil, customWorkingDirectory: AbsolutePath? = nil, @@ -53,6 +55,7 @@ public struct RunAction: Equatable, Codable, Sendable { self.diagnosticsOptions = diagnosticsOptions self.metalOptions = metalOptions self.expandVariableFromTarget = expandVariableFromTarget + self.askForAppToLaunch = askForAppToLaunch self.launchStyle = launchStyle self.appClipInvocationURL = appClipInvocationURL self.customWorkingDirectory = customWorkingDirectory @@ -81,6 +84,7 @@ public struct RunAction: Equatable, Codable, Sendable { apiValidation: true ), expandVariableFromTarget: TargetReference? = nil, + askForAppToLaunch: Bool = false, launchStyle: LaunchStyle = .automatically, appClipInvocationURL: URL? = nil, customWorkingDirectory: AbsolutePath? = nil, @@ -99,6 +103,7 @@ public struct RunAction: Equatable, Codable, Sendable { diagnosticsOptions: diagnosticsOptions, metalOptions: metalOptions, expandVariableFromTarget: expandVariableFromTarget, + askForAppToLaunch: askForAppToLaunch, launchStyle: launchStyle, appClipInvocationURL: appClipInvocationURL, customWorkingDirectory: customWorkingDirectory, diff --git a/Tests/XcodeGraphTests/Models/ProfileActionTests.swift b/Tests/XcodeGraphTests/Models/ProfileActionTests.swift index 8cc98350..3eb0c6b2 100644 --- a/Tests/XcodeGraphTests/Models/ProfileActionTests.swift +++ b/Tests/XcodeGraphTests/Models/ProfileActionTests.swift @@ -12,6 +12,7 @@ final class ProfileActionTests: XCTestCase { projectPath: try AbsolutePath(validating: "/path/to/project"), name: "name" ), + askForAppToLaunch: true, arguments: .init( environmentVariables: [ "key": EnvironmentVariable(value: "value", isEnabled: true), diff --git a/Tests/XcodeGraphTests/Models/RunActionTests.swift b/Tests/XcodeGraphTests/Models/RunActionTests.swift index 3ac0bd03..9f7184e0 100644 --- a/Tests/XcodeGraphTests/Models/RunActionTests.swift +++ b/Tests/XcodeGraphTests/Models/RunActionTests.swift @@ -31,6 +31,7 @@ final class RunActionTests: XCTestCase { mainThreadCheckerEnabled: true, performanceAntipatternCheckerEnabled: true ), + askForAppToLaunch: true, appClipInvocationURL: URL(string: "https://app-clips-url.com/example") )