Skip to content

Commit 90cb164

Browse files
legalbegal2121legalbegal2121
committed
feat: update build settings, add new Swift package dependencies, remove application group entitlement, and adjust ReviewComment mutability.
1 parent e344301 commit 90cb164

File tree

10 files changed

+104
-23
lines changed

10 files changed

+104
-23
lines changed

‎Copilot for Xcode.xcodeproj/project.pbxproj‎

Lines changed: 67 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
C8738B7F2BE5363900609E7F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C8738B7E2BE5363900609E7F /* Assets.xcassets */; };
5454
C8738B822BE5363900609E7F /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C8738B812BE5363900609E7F /* Preview Assets.xcassets */; };
5555
C8738B882BE5365000609E7F /* Client in Frameworks */ = {isa = PBXBuildFile; productRef = C8738B872BE5365000609E7F /* Client */; };
56-
C8738B8A2BE540D000609E7F /* bridgeLaunchAgent.plist in Copy Launch Agent */ = {isa = PBXBuildFile; fileRef = C8738B6D2BE4F3E800609E7F /* bridgeLaunchAgent.plist */; };
56+
C8738B8A2BE540D000609E7F /* bridgeLaunchAgent.plist in Copy Launch Agent */ = {isa = PBXBuildFile; fileRef = C8738B6D2BE4F3E800609E7F /* bridgeLaunchAgent.plist */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
5757
C8738B8B2BE540DD00609E7F /* CommunicationBridge in Embed XPCService */ = {isa = PBXBuildFile; fileRef = C8738B632BE4D4B900609E7F /* CommunicationBridge */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
5858
C8758E7029F04BFF00D29C1C /* CustomCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8758E6F29F04BFF00D29C1C /* CustomCommand.swift */; };
5959
C8758E7229F04CF100D29C1C /* SeparatorCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8758E7129F04CF100D29C1C /* SeparatorCommand.swift */; };
@@ -70,6 +70,21 @@
7070
C8DD9CB12BC673F80036641C /* CloseIdleTabsCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8DD9CB02BC673F80036641C /* CloseIdleTabsCommand.swift */; };
7171
/* End PBXBuildFile section */
7272

73+
/* Begin PBXBuildRule section */
74+
1034711F2E9E620100577B9C /* PBXBuildRule */ = {
75+
isa = PBXBuildRule;
76+
compilerSpec = com.apple.compilers.proxy.script;
77+
dependencyFile = "$(DERIVED_FILES_DIR)/$(INPUT_FILE_PATH).d";
78+
fileType = pattern.proxy;
79+
inputFiles = (
80+
);
81+
isEditable = 1;
82+
outputFiles = (
83+
);
84+
script = "# Type a script or drag a script file from your workspace to insert its path.\n";
85+
};
86+
/* End PBXBuildRule section */
87+
7388
/* Begin PBXContainerItemProxy section */
7489
C81291AF2994F92700196E12 /* PBXContainerItemProxy */ = {
7590
isa = PBXContainerItemProxy;
@@ -580,6 +595,7 @@
580595
C8738B612BE4D4B900609E7F /* CopyFiles */,
581596
);
582597
buildRules = (
598+
1034711F2E9E620100577B9C /* PBXBuildRule */,
583599
);
584600
dependencies = (
585601
);
@@ -652,6 +668,10 @@
652668
mainGroup = C8189B0D2938972F00C9DCDA;
653669
packageReferences = (
654670
C8216B792980373800AD38C7 /* XCRemoteSwiftPackageReference "swift-argument-parser" */,
671+
103471212E9E633300577B9C /* XCRemoteSwiftPackageReference "swift-algorithms" */,
672+
103471222E9E663000577B9C /* XCRemoteSwiftPackageReference "swift-system" */,
673+
103471232E9E752700577B9C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */,
674+
103471242E9E756B00577B9C /* XCRemoteSwiftPackageReference "claude-agent-sdk-python" */,
655675
);
656676
productRefGroup = C8189B172938972F00C9DCDA /* Products */;
657677
projectDirPath = "";
@@ -838,6 +858,7 @@
838858
isa = XCBuildConfiguration;
839859
buildSettings = {
840860
CODE_SIGN_ENTITLEMENTS = EditorExtension/EditorExtension.entitlements;
861+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
841862
CODE_SIGN_STYLE = Automatic;
842863
COMBINE_HIDPI_IMAGES = YES;
843864
CURRENT_PROJECT_VERSION = "$(APP_BUILD)";
@@ -928,6 +949,8 @@
928949
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
929950
CLANG_WARN_UNREACHABLE_CODE = YES;
930951
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
952+
"CODE_SIGN_ENTITLEMENTS[sdk=*]" = "";
953+
CODE_SIGN_IDENTITY = "-";
931954
COPY_PHASE_STRIP = NO;
932955
DEAD_CODE_STRIPPING = YES;
933956
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -991,11 +1014,14 @@
9911014
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
9921015
CLANG_WARN_UNREACHABLE_CODE = YES;
9931016
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1017+
"CODE_SIGN_ENTITLEMENTS[sdk=*]" = "";
1018+
CODE_SIGN_IDENTITY = "-";
9941019
COPY_PHASE_STRIP = NO;
9951020
DEAD_CODE_STRIPPING = YES;
9961021
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
9971022
ENABLE_NS_ASSERTIONS = NO;
9981023
ENABLE_STRICT_OBJC_MSGSEND = YES;
1024+
ENABLE_TESTABILITY = YES;
9991025
GCC_C_LANGUAGE_STANDARD = gnu11;
10001026
GCC_NO_COMMON_BLOCKS = YES;
10011027
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1007,6 +1033,7 @@
10071033
MACOSX_DEPLOYMENT_TARGET = 12.0;
10081034
MTL_ENABLE_DEBUG_INFO = NO;
10091035
MTL_FAST_MATH = YES;
1036+
ONLY_ACTIVE_ARCH = YES;
10101037
SDKROOT = macosx;
10111038
STRING_CATALOG_GENERATE_SYMBOLS = YES;
10121039
SWIFT_COMPILATION_MODE = wholemodule;
@@ -1021,7 +1048,7 @@
10211048
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
10221049
AUTOMATION_APPLE_EVENTS = YES;
10231050
CODE_SIGN_ENTITLEMENTS = "Copilot for Xcode/Copilot_for_Xcode.entitlements";
1024-
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
1051+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
10251052
CODE_SIGN_STYLE = Automatic;
10261053
COMBINE_HIDPI_IMAGES = YES;
10271054
CURRENT_PROJECT_VERSION = "$(APP_BUILD)";
@@ -1122,6 +1149,7 @@
11221149
isa = XCBuildConfiguration;
11231150
buildSettings = {
11241151
AUTOMATION_APPLE_EVENTS = NO;
1152+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
11251153
CODE_SIGN_STYLE = Automatic;
11261154
DEAD_CODE_STRIPPING = YES;
11271155
DEVELOPMENT_TEAM = 85XJ3N6338;
@@ -1182,7 +1210,7 @@
11821210
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
11831211
AUTOMATION_APPLE_EVENTS = NO;
11841212
CODE_SIGN_ENTITLEMENTS = ExtensionService/ExtensionService.entitlements;
1185-
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
1213+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
11861214
CODE_SIGN_STYLE = Automatic;
11871215
COMBINE_HIDPI_IMAGES = YES;
11881216
CURRENT_PROJECT_VERSION = "$(APP_BUILD)";
@@ -1277,9 +1305,10 @@
12771305
isa = XCBuildConfiguration;
12781306
buildSettings = {
12791307
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
1308+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
12801309
CODE_SIGN_STYLE = Automatic;
12811310
DEAD_CODE_STRIPPING = YES;
1282-
DEVELOPMENT_TEAM = VEKTX9H2N7;
1311+
DEVELOPMENT_TEAM = 85XJ3N6338;
12831312
ENABLE_HARDENED_RUNTIME = YES;
12841313
ENABLE_USER_SCRIPT_SANDBOXING = YES;
12851314
GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1322,12 +1351,13 @@
13221351
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
13231352
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
13241353
CODE_SIGN_ENTITLEMENTS = SandboxedClientTester/SandboxedClientTester.entitlements;
1354+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
13251355
CODE_SIGN_STYLE = Automatic;
13261356
COMBINE_HIDPI_IMAGES = YES;
13271357
CURRENT_PROJECT_VERSION = 1;
13281358
DEAD_CODE_STRIPPING = YES;
13291359
DEVELOPMENT_ASSET_PATHS = "\"SandboxedClientTester/Preview Content\"";
1330-
DEVELOPMENT_TEAM = VEKTX9H2N7;
1360+
DEVELOPMENT_TEAM = 85XJ3N6338;
13311361
ENABLE_APP_SANDBOX = YES;
13321362
ENABLE_HARDENED_RUNTIME = YES;
13331363
ENABLE_PREVIEWS = YES;
@@ -1458,6 +1488,38 @@
14581488
/* End XCConfigurationList section */
14591489

14601490
/* Begin XCRemoteSwiftPackageReference section */
1491+
103471212E9E633300577B9C /* XCRemoteSwiftPackageReference "swift-algorithms" */ = {
1492+
isa = XCRemoteSwiftPackageReference;
1493+
repositoryURL = "https://github.com/apple/swift-algorithms.git";
1494+
requirement = {
1495+
kind = upToNextMajorVersion;
1496+
minimumVersion = 1.2.1;
1497+
};
1498+
};
1499+
103471222E9E663000577B9C /* XCRemoteSwiftPackageReference "swift-system" */ = {
1500+
isa = XCRemoteSwiftPackageReference;
1501+
repositoryURL = "https://github.com/apple/swift-system.git";
1502+
requirement = {
1503+
kind = upToNextMajorVersion;
1504+
minimumVersion = 1.6.3;
1505+
};
1506+
};
1507+
103471232E9E752700577B9C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */ = {
1508+
isa = XCRemoteSwiftPackageReference;
1509+
repositoryURL = "https://github.com/apple/swift-async-algorithms.git";
1510+
requirement = {
1511+
kind = upToNextMajorVersion;
1512+
minimumVersion = 1.0.4;
1513+
};
1514+
};
1515+
103471242E9E756B00577B9C /* XCRemoteSwiftPackageReference "claude-agent-sdk-python" */ = {
1516+
isa = XCRemoteSwiftPackageReference;
1517+
repositoryURL = "https://github.com/anthropics/claude-agent-sdk-python";
1518+
requirement = {
1519+
branch = main;
1520+
kind = branch;
1521+
};
1522+
};
14611523
C8216B792980373800AD38C7 /* XCRemoteSwiftPackageReference "swift-argument-parser" */ = {
14621524
isa = XCRemoteSwiftPackageReference;
14631525
repositoryURL = "https://github.com/apple/swift-argument-parser.git";

‎Copilot for Xcode.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Copilot for Xcode/Copilot_for_Xcode.entitlements‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<plist version="1.0">
44
<dict>
55
<key>com.apple.security.application-groups</key>
6-
<array>
7-
<string>$(TeamIdentifierPrefix)group.$(BUNDLE_IDENTIFIER_BASE)</string>
8-
</array>
6+
<array/>
97
</dict>
108
</plist>

‎EditorExtension/EditorExtension.entitlements‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
<key>com.apple.security.app-sandbox</key>
66
<true/>
77
<key>com.apple.security.application-groups</key>
8-
<array>
9-
<string>$(TeamIdentifierPrefix)group.$(BUNDLE_IDENTIFIER_BASE)</string>
10-
</array>
8+
<array/>
119
<key>com.apple.security.temporary-exception.mach-lookup.global-name</key>
1210
<array>
1311
<string>$(BUNDLE_IDENTIFIER_BASE).CommunicationBridge</string>

‎ExtensionService/ExtensionService.entitlements‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<plist version="1.0">
44
<dict>
55
<key>com.apple.security.application-groups</key>
6-
<array>
7-
<string>$(TeamIdentifierPrefix)group.$(BUNDLE_IDENTIFIER_BASE)</string>
8-
</array>
6+
<array/>
97
</dict>
108
</plist>

‎Tool/Sources/AXExtension/AXUIElement.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,8 @@ public extension AXUIElement {
373373
}
374374

375375
#if hasFeature(RetroactiveAttribute)
376+
extension AXError: @retroactive _BridgedNSError {}
377+
extension AXError: @retroactive _ObjectiveCBridgeableError {}
376378
extension AXError: @retroactive Error {}
377379
#else
378380
extension AXError: Error {}

‎Tool/Sources/ChatTab/ChatTab.swift‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,6 @@ open class BaseChatTab {
126126
public init(store: StoreOf<ChatTabItem>) {
127127
chatTabStore = store
128128

129-
storeObserver.observe { [weak self] in
130-
guard let self else { return }
131-
self.title = store.title ?? ""
132-
self.id = store.id
133129
}
134130
}
135131

@@ -205,7 +201,7 @@ open class BaseChatTab {
205201
tab.start()
206202
}
207203
}
208-
}
204+
209205

210206
/// A factory of a chat tab.
211207
public protocol ChatTabBuilder {

‎Tool/Sources/ConversationServiceProvider/LSPTypes.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ public struct ReviewChangesParams: Codable, Equatable {
540540

541541
public struct ReviewComment: Codable, Equatable, Hashable {
542542
// Self-defined `id` for using in comment operation. Add an init value to bypass decoding
543-
public let id: String = UUID().uuidString
543+
public var id: String = UUID().uuidString
544544
public let uri: DocumentUri
545545
public let range: LSPRange
546546
public let message: String

‎Tool/Sources/Persist/Storage/ConversationStorage/ConversationStorage.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public final class ConversationStorage: ConversationStorageProtocol {
8080

8181
try withDBTransaction { db in
8282

83-
let now = Date().timeIntervalSince1970
83+
_ = Date().timeIntervalSince1970
8484

8585
for operation in request.operations {
8686
switch operation {
@@ -137,7 +137,7 @@ public final class ConversationStorage: ConversationStorageProtocol {
137137
let table = turnTable.table
138138
let column = turnTable.column
139139

140-
var query = table
140+
let query = table
141141
.filter(column.conversationID == conversationID)
142142
.order(column.rowID.asc)
143143
let rowIterator = try db.prepareRowIterator(query)

‎Tool/Sources/Preferences/UserDefaults.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ extension String: UserDefaultsStorable {}
8282
extension Data: UserDefaultsStorable {}
8383
extension URL: UserDefaultsStorable {}
8484

85-
extension Array: RawRepresentable where Element: Codable {
85+
extension Array: @retroactive RawRepresentable where Element: Codable {
8686
public init?(rawValue: String) {
8787
guard let data = rawValue.data(using: .utf8),
8888
let result = try? JSONDecoder().decode([Element].self, from: data)

0 commit comments

Comments
 (0)