Skip to content

Commit cf54a94

Browse files
committed
Move extension service to XPCServices folder
1 parent 98faf16 commit cf54a94

3 files changed

Lines changed: 14 additions & 13 deletions

File tree

Copilot for Xcode.xcodeproj/project.pbxproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
C87F3E62293DD004008523E8 /* Styles.swift in Sources */ = {isa = PBXBuildFile; fileRef = C87F3E61293DD004008523E8 /* Styles.swift */; };
4646
C882175A294187E100A22FD3 /* Client in Frameworks */ = {isa = PBXBuildFile; productRef = C8821759294187E100A22FD3 /* Client */; };
4747
C882175C294187EF00A22FD3 /* Client in Frameworks */ = {isa = PBXBuildFile; productRef = C882175B294187EF00A22FD3 /* Client */; };
48-
C8E93DB429950C8A00E6D43D /* CopilotForXcodeExtensionService.app in Embed XPCService */ = {isa = PBXBuildFile; fileRef = C861E60E2994F6070056CB02 /* CopilotForXcodeExtensionService.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
48+
C8C8B60929AFA35F00034BEE /* CopilotForXcodeExtensionService.app in Embed Service */ = {isa = PBXBuildFile; fileRef = C861E60E2994F6070056CB02 /* CopilotForXcodeExtensionService.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
4949
/* End PBXBuildFile section */
5050

5151
/* Begin PBXContainerItemProxy section */
@@ -110,31 +110,31 @@
110110
dstPath = ../Applications;
111111
dstSubfolderSpec = 6;
112112
files = (
113-
C8E93DB429950C8A00E6D43D /* CopilotForXcodeExtensionService.app in Embed XPCService */,
114113
C8216B802980378300AD38C7 /* Helper in Embed XPCService */,
115114
);
116115
name = "Embed XPCService";
117116
runOnlyForDeploymentPostprocessing = 0;
118117
};
119-
C861E6062994F50D0056CB02 /* Embed Old XPCService Target */ = {
118+
C87B03AE293B2CF300C77EAE /* Embed Frameworks */ = {
120119
isa = PBXCopyFilesBuildPhase;
121120
buildActionMask = 2147483647;
122121
dstPath = "";
123-
dstSubfolderSpec = 6;
122+
dstSubfolderSpec = 10;
124123
files = (
124+
C87B03AD293B2CF300C77EAE /* XcodeKit.framework in Embed Frameworks */,
125125
);
126-
name = "Embed Old XPCService Target";
126+
name = "Embed Frameworks";
127127
runOnlyForDeploymentPostprocessing = 0;
128128
};
129-
C87B03AE293B2CF300C77EAE /* Embed Frameworks */ = {
129+
C8C8B60829AFA32800034BEE /* Embed Service */ = {
130130
isa = PBXCopyFilesBuildPhase;
131131
buildActionMask = 2147483647;
132-
dstPath = "";
133-
dstSubfolderSpec = 10;
132+
dstPath = "$(CONTENTS_FOLDER_PATH)/XPCServices";
133+
dstSubfolderSpec = 16;
134134
files = (
135-
C87B03AD293B2CF300C77EAE /* XcodeKit.framework in Embed Frameworks */,
135+
C8C8B60929AFA35F00034BEE /* CopilotForXcodeExtensionService.app in Embed Service */,
136136
);
137-
name = "Embed Frameworks";
137+
name = "Embed Service";
138138
runOnlyForDeploymentPostprocessing = 0;
139139
};
140140
/* End PBXCopyFilesBuildPhase section */
@@ -369,7 +369,7 @@
369369
C8189B142938972F00C9DCDA /* Resources */,
370370
C814589F2939EFDC00135263 /* Embed Foundation Extensions */,
371371
C8520306293CF0EF00460097 /* Embed XPCService */,
372-
C861E6062994F50D0056CB02 /* Embed Old XPCService Target */,
372+
C8C8B60829AFA32800034BEE /* Embed Service */,
373373
);
374374
buildRules = (
375375
);

Copilot for Xcode/LaunchAgentManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ extension LaunchAgentManager {
99
".ExtensionService",
1010
executablePath: Bundle.main.bundleURL
1111
.appendingPathComponent("Contents")
12-
.appendingPathComponent("Applications")
12+
.appendingPathComponent("XPCServices")
1313
.appendingPathComponent(
1414
"CopilotForXcodeExtensionService.app/Contents/MacOS/CopilotForXcodeExtensionService"
1515
)

Core/Sources/LaunchAgentManager/LaunchAgentManager.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public struct LaunchAgentManager {
1010
}
1111

1212
var launchAgentPath: String {
13-
launchAgentDirURL.appendingPathComponent("\(serviceIdentifier).plist").path
13+
launchAgentDirURL.appendingPathComponent("\(serviceIdentifier).1.plist").path
1414
}
1515

1616
public init(serviceIdentifier: String, executablePath: String) {
@@ -130,3 +130,4 @@ private func launchctl(_ args: String...) async throws {
130130
struct E: Error, LocalizedError {
131131
var errorDescription: String?
132132
}
133+

0 commit comments

Comments
 (0)