From 999ee48e6b22b8c23983d6676bf5b71dc5c23518 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 2 Jul 2026 20:01:59 +0800 Subject: [PATCH] Fix: Remove bridging header and restore import Libbox - try module import approach --- iOS-SwiftUI-Code/Library/Database/Profile+Share.swift | 1 + .../Library/Database/Profile+Transferable.swift | 1 + iOS-SwiftUI-Code/Library/Database/Profile+Update.swift | 1 + iOS-SwiftUI-Code/Library/Discovery/NWSocket.swift | 1 + iOS-SwiftUI-Code/Library/Discovery/ProfileServer.swift | 1 + iOS-SwiftUI-Code/Library/Library-Bridging-Header.h | 9 --------- iOS-SwiftUI-Code/Library/Network/CommandClient.swift | 1 + .../Library/Network/Extension+Iterator.swift | 1 + .../Library/Network/Extension+RunBlocking.swift | 1 + .../Library/Network/ExtensionPlatformInterface.swift | 1 + iOS-SwiftUI-Code/Library/Network/ExtensionProfile.swift | 1 + iOS-SwiftUI-Code/Library/Network/ExtensionProvider.swift | 1 + iOS-SwiftUI-Code/Library/Network/HTTPClient.swift | 1 + iOS-SwiftUI-Code/uuvpn.xcodeproj/project.pbxproj | 5 ----- 14 files changed, 12 insertions(+), 14 deletions(-) delete mode 100644 iOS-SwiftUI-Code/Library/Library-Bridging-Header.h diff --git a/iOS-SwiftUI-Code/Library/Database/Profile+Share.swift b/iOS-SwiftUI-Code/Library/Database/Profile+Share.swift index 95cde6b..e276b93 100644 --- a/iOS-SwiftUI-Code/Library/Database/Profile+Share.swift +++ b/iOS-SwiftUI-Code/Library/Database/Profile+Share.swift @@ -1,4 +1,5 @@ import Foundation +import Libbox public extension Profile { var shareLink: URL { diff --git a/iOS-SwiftUI-Code/Library/Database/Profile+Transferable.swift b/iOS-SwiftUI-Code/Library/Database/Profile+Transferable.swift index 2130c00..2a4591e 100644 --- a/iOS-SwiftUI-Code/Library/Database/Profile+Transferable.swift +++ b/iOS-SwiftUI-Code/Library/Database/Profile+Transferable.swift @@ -1,6 +1,7 @@ import Foundation import SwiftUI import UniformTypeIdentifiers +import Libbox public extension Profile { func toContent() throws -> LibboxProfileContent { diff --git a/iOS-SwiftUI-Code/Library/Database/Profile+Update.swift b/iOS-SwiftUI-Code/Library/Database/Profile+Update.swift index 052ee3b..c3bed66 100644 --- a/iOS-SwiftUI-Code/Library/Database/Profile+Update.swift +++ b/iOS-SwiftUI-Code/Library/Database/Profile+Update.swift @@ -1,5 +1,6 @@ import Foundation import GRDB +import Libbox public extension Profile { nonisolated func updateRemoteProfile() async throws { diff --git a/iOS-SwiftUI-Code/Library/Discovery/NWSocket.swift b/iOS-SwiftUI-Code/Library/Discovery/NWSocket.swift index 0923c5d..abc9105 100644 --- a/iOS-SwiftUI-Code/Library/Discovery/NWSocket.swift +++ b/iOS-SwiftUI-Code/Library/Discovery/NWSocket.swift @@ -1,5 +1,6 @@ import Foundation import Network +import Libbox public class NWSocket { private let connection: NWConnection diff --git a/iOS-SwiftUI-Code/Library/Discovery/ProfileServer.swift b/iOS-SwiftUI-Code/Library/Discovery/ProfileServer.swift index 204f84d..ad99bdc 100644 --- a/iOS-SwiftUI-Code/Library/Discovery/ProfileServer.swift +++ b/iOS-SwiftUI-Code/Library/Discovery/ProfileServer.swift @@ -1,5 +1,6 @@ import Foundation import Network +import Libbox public class ProfileServer { private var listener: NWListener diff --git a/iOS-SwiftUI-Code/Library/Library-Bridging-Header.h b/iOS-SwiftUI-Code/Library/Library-Bridging-Header.h deleted file mode 100644 index 2253424..0000000 --- a/iOS-SwiftUI-Code/Library/Library-Bridging-Header.h +++ /dev/null @@ -1,9 +0,0 @@ -// -// Library-Bridging-Header.h -// Library -// -// Bridging header for Libbox.xcframework -// - -// Import Libbox framework header -#import \ No newline at end of file diff --git a/iOS-SwiftUI-Code/Library/Network/CommandClient.swift b/iOS-SwiftUI-Code/Library/Network/CommandClient.swift index 55a4eca..c627d5f 100644 --- a/iOS-SwiftUI-Code/Library/Network/CommandClient.swift +++ b/iOS-SwiftUI-Code/Library/Network/CommandClient.swift @@ -1,4 +1,5 @@ import Foundation +import Libbox public class CommandClient: ObservableObject { public enum ConnectionType { diff --git a/iOS-SwiftUI-Code/Library/Network/Extension+Iterator.swift b/iOS-SwiftUI-Code/Library/Network/Extension+Iterator.swift index 37ef355..b7d57bb 100644 --- a/iOS-SwiftUI-Code/Library/Network/Extension+Iterator.swift +++ b/iOS-SwiftUI-Code/Library/Network/Extension+Iterator.swift @@ -1,4 +1,5 @@ import Foundation +import Libbox extension LibboxStringIteratorProtocol { func toArray() -> [String] { diff --git a/iOS-SwiftUI-Code/Library/Network/Extension+RunBlocking.swift b/iOS-SwiftUI-Code/Library/Network/Extension+RunBlocking.swift index 3cb1443..b3eb3d8 100644 --- a/iOS-SwiftUI-Code/Library/Network/Extension+RunBlocking.swift +++ b/iOS-SwiftUI-Code/Library/Network/Extension+RunBlocking.swift @@ -1,5 +1,6 @@ import Foundation import NetworkExtension +import Libbox func runBlocking(_ block: @escaping () async -> T) -> T { let semaphore = DispatchSemaphore(value: 0) diff --git a/iOS-SwiftUI-Code/Library/Network/ExtensionPlatformInterface.swift b/iOS-SwiftUI-Code/Library/Network/ExtensionPlatformInterface.swift index 037ba82..ab1b66e 100644 --- a/iOS-SwiftUI-Code/Library/Network/ExtensionPlatformInterface.swift +++ b/iOS-SwiftUI-Code/Library/Network/ExtensionPlatformInterface.swift @@ -3,6 +3,7 @@ import NetworkExtension #if canImport(CoreWLAN) import CoreWLAN #endif +import Libbox public class ExtensionPlatformInterface: NSObject, LibboxPlatformInterfaceProtocol, LibboxCommandServerHandlerProtocol { private let tunnel: ExtensionProvider diff --git a/iOS-SwiftUI-Code/Library/Network/ExtensionProfile.swift b/iOS-SwiftUI-Code/Library/Network/ExtensionProfile.swift index aed7807..c923378 100644 --- a/iOS-SwiftUI-Code/Library/Network/ExtensionProfile.swift +++ b/iOS-SwiftUI-Code/Library/Network/ExtensionProfile.swift @@ -1,5 +1,6 @@ import Foundation import NetworkExtension +import Libbox public class ExtensionProfile: ObservableObject { private let manager: NEVPNManager diff --git a/iOS-SwiftUI-Code/Library/Network/ExtensionProvider.swift b/iOS-SwiftUI-Code/Library/Network/ExtensionProvider.swift index ab634ea..6a82dbb 100644 --- a/iOS-SwiftUI-Code/Library/Network/ExtensionProvider.swift +++ b/iOS-SwiftUI-Code/Library/Network/ExtensionProvider.swift @@ -1,5 +1,6 @@ import Foundation import NetworkExtension +import Libbox open class ExtensionProvider: NEPacketTunnelProvider { public var username: String? = nil diff --git a/iOS-SwiftUI-Code/Library/Network/HTTPClient.swift b/iOS-SwiftUI-Code/Library/Network/HTTPClient.swift index bd7585f..5355b6e 100644 --- a/iOS-SwiftUI-Code/Library/Network/HTTPClient.swift +++ b/iOS-SwiftUI-Code/Library/Network/HTTPClient.swift @@ -1,4 +1,5 @@ import Foundation +import Libbox public class HTTPClient { private static var userAgent: String { diff --git a/iOS-SwiftUI-Code/uuvpn.xcodeproj/project.pbxproj b/iOS-SwiftUI-Code/uuvpn.xcodeproj/project.pbxproj index 94b8996..872f46d 100644 --- a/iOS-SwiftUI-Code/uuvpn.xcodeproj/project.pbxproj +++ b/iOS-SwiftUI-Code/uuvpn.xcodeproj/project.pbxproj @@ -470,7 +470,6 @@ C0DDD67A2CB908B200AE1C0A /* 12c853b3.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = 12c853b3.json; sourceTree = ""; }; C0DDD6882CB9110900AE1C0A /* View+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "View+Extensions.swift"; sourceTree = ""; }; C0E540142CA17EBF0054BC97 /* Libbox.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = Libbox.xcframework; sourceTree = ""; }; - C0E54020CA17EC200054BCA0 /* Library-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Library-Bridging-Header.h"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -765,7 +764,6 @@ 3AEC21462A45A9CE00A63465 /* Shared */, 3AEC21432A45A92B00A63465 /* Network */, 3AEC213A2A459FD200A63465 /* Database */, - C0E54020CA17EC200054BCA0 /* Library-Bridging-Header.h */, 3A648D2C2A4EEAA600D95A12 /* Library.swift */, ); path = Library; @@ -1801,7 +1799,6 @@ ONLY_ACTIVE_ARCH = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_OBJC_BRIDGING_HEADER = "Library/Library-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -2018,7 +2015,6 @@ SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_ENABLE_EXPLICIT_MODULES = NO; - SWIFT_OBJC_BRIDGING_HEADER = "Library/Library-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; @@ -2073,7 +2069,6 @@ SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_ENABLE_EXPLICIT_MODULES = NO; - SWIFT_OBJC_BRIDGING_HEADER = "Library/Library-Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; TVOS_DEPLOYMENT_TARGET = 17.0;