Skip to content

Commit e631705

Browse files
committed
Fix Xcode26 build errors
1 parent d7a0a70 commit e631705

File tree

7 files changed

+14
-12
lines changed

7 files changed

+14
-12
lines changed

ArchiveScript.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ echo '///-----------'
2626
xcodebuild \
2727
archive -workspace ${project_path}/${project_name}.xcworkspace \
2828
-scheme ${scheme_name} \
29-
-arch x86_64 \
30-
-arch arm64e \
29+
-destination 'generic/platform=macOS' \
3130
-configuration ${development_mode} \
3231
-skipPackagePluginValidation -skipMacroValidation \
33-
-archivePath ${build_path}/${project_name}.xcarchive -quiet || exit
32+
-archivePath ${build_path}/${project_name}.xcarchive \
33+
ARCHS="x86_64 arm64e" || exit
3434

3535
echo '///--------'
3636
echo '/// 编译完成'

BuildScript.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ development_mode="Release"
88

99
build_path=${project_path}/build
1010

11-
xcodebuild build -scheme ${scheme_name} -configuration ${development_mode} -destination 'generic/platform=macOS' CONFIGURATION_BUILD_DIR=${build_path} ARCHS="x86_64 arm64e"
11+
xcodebuild build -scheme ${scheme_name} -configuration ${development_mode} -destination 'generic/platform=macOS' CONFIGURATION_BUILD_DIR=${build_path} ARCHS="x86_64 arm64"
1212

1313
exit 0
1414

Core/Sources/RuntimeViewerCommunication/Connections/RuntimeXPCConnection.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ final class RuntimeXPCClientConnection: RuntimeXPCConnection {
136136
try await serviceConnection.sendMessage(request: LaunchCatalystHelperRequest(helperURL: RuntimeViewerCatalystHelperLauncher.helperURL))
137137
}
138138
// connection = try await withCheckedThrowingContinuation { continuation in
139-
listener.setMessageHandler(name: CommandIdentifiers.serverLaunched) { [weak self] (_: XPCConnection, endpoint: XPCEndpoint) in
139+
listener.setMessageHandler(name: CommandIdentifiers.serverLaunched) { [weak self] (_: XPCConnection, endpoint: SwiftyXPC.XPCEndpoint) in
140140
// do {
141141
guard let self else { return }
142142
let connection = try XPCConnection(type: .remoteServiceFromEndpoint(endpoint))

Core/Sources/RuntimeViewerCommunication/Requests/FetchEndpointRequest.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ public struct FetchEndpointRequest: Codable, RuntimeRequest {
1313
public static let identifier: String = "com.JH.RuntimeViewerService.FetchEndpoint"
1414

1515
public struct Response: RuntimeResponse, Codable {
16-
public let endpoint: XPCEndpoint
16+
public let endpoint: SwiftyXPC.XPCEndpoint
1717

18-
public init(endpoint: XPCEndpoint) {
18+
public init(endpoint: SwiftyXPC.XPCEndpoint) {
1919
self.endpoint = endpoint
2020
}
2121
}

Core/Sources/RuntimeViewerCommunication/Requests/RegisterEndpointRequest.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ public struct RegisterEndpointRequest: Codable, RuntimeRequest {
1616

1717
public let identifier: String
1818

19-
public let endpoint: XPCEndpoint
19+
public let endpoint: SwiftyXPC.XPCEndpoint
2020

21-
public init(identifier: String, endpoint: XPCEndpoint) {
21+
public init(identifier: String, endpoint: SwiftyXPC.XPCEndpoint) {
2222
self.identifier = identifier
2323
self.endpoint = endpoint
2424
}

RuntimeViewerPackages/Sources/RuntimeViewerService/RuntimeViewerService.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public final class RuntimeViewerService {
99

1010
private var catalystHelperApplication: NSRunningApplication?
1111

12-
private var endpointByIdentifier: [String: XPCEndpoint] = [:]
12+
private var endpointByIdentifier: [String: SwiftyXPC.XPCEndpoint] = [:]
1313

1414
private init() throws {
1515
self.listener = try .init(type: .machService(name: RuntimeViewerMachServiceName), codeSigningRequirement: nil)

RuntimeViewerUsingAppKit/RuntimeViewerUsingAppKit.xcodeproj/project.pbxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,7 @@
955955
CURRENT_PROJECT_VERSION = 1;
956956
DEAD_CODE_STRIPPING = YES;
957957
ENABLE_HARDENED_RUNTIME = YES;
958+
ENABLE_POINTER_AUTHENTICATION = NO;
958959
ENABLE_USER_SCRIPT_SANDBOXING = NO;
959960
FUSE_BUILD_SCRIPT_PHASES = NO;
960961
GENERATE_INFOPLIST_FILE = YES;
@@ -970,7 +971,7 @@
970971
"@executable_path/../Frameworks",
971972
);
972973
MACOSX_DEPLOYMENT_TARGET = 12.0;
973-
MARKETING_VERSION = 1.2.0;
974+
MARKETING_VERSION = 1.3.0;
974975
PRODUCT_BUNDLE_IDENTIFIER = com.JH.RuntimeViewer;
975976
PRODUCT_NAME = RuntimeViewer;
976977
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -992,6 +993,7 @@
992993
CURRENT_PROJECT_VERSION = 1;
993994
DEAD_CODE_STRIPPING = YES;
994995
ENABLE_HARDENED_RUNTIME = YES;
996+
ENABLE_POINTER_AUTHENTICATION = NO;
995997
ENABLE_USER_SCRIPT_SANDBOXING = NO;
996998
FUSE_BUILD_SCRIPT_PHASES = NO;
997999
GENERATE_INFOPLIST_FILE = YES;
@@ -1007,7 +1009,7 @@
10071009
"@executable_path/../Frameworks",
10081010
);
10091011
MACOSX_DEPLOYMENT_TARGET = 12.0;
1010-
MARKETING_VERSION = 1.2.0;
1012+
MARKETING_VERSION = 1.3.0;
10111013
PRODUCT_BUNDLE_IDENTIFIER = com.JH.RuntimeViewer;
10121014
PRODUCT_NAME = RuntimeViewer;
10131015
SWIFT_EMIT_LOC_STRINGS = YES;

0 commit comments

Comments
 (0)