Fix: Remove bridging header and restore import Libbox - try module import approach
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
|
import Libbox
|
||||||
|
|
||||||
public extension Profile {
|
public extension Profile {
|
||||||
var shareLink: URL {
|
var shareLink: URL {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
import UniformTypeIdentifiers
|
import UniformTypeIdentifiers
|
||||||
|
import Libbox
|
||||||
|
|
||||||
public extension Profile {
|
public extension Profile {
|
||||||
func toContent() throws -> LibboxProfileContent {
|
func toContent() throws -> LibboxProfileContent {
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
import GRDB
|
import GRDB
|
||||||
|
import Libbox
|
||||||
|
|
||||||
public extension Profile {
|
public extension Profile {
|
||||||
nonisolated func updateRemoteProfile() async throws {
|
nonisolated func updateRemoteProfile() async throws {
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
import Network
|
import Network
|
||||||
|
import Libbox
|
||||||
|
|
||||||
public class NWSocket {
|
public class NWSocket {
|
||||||
private let connection: NWConnection
|
private let connection: NWConnection
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
import Network
|
import Network
|
||||||
|
import Libbox
|
||||||
|
|
||||||
public class ProfileServer {
|
public class ProfileServer {
|
||||||
private var listener: NWListener
|
private var listener: NWListener
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
//
|
|
||||||
// Library-Bridging-Header.h
|
|
||||||
// Library
|
|
||||||
//
|
|
||||||
// Bridging header for Libbox.xcframework
|
|
||||||
//
|
|
||||||
|
|
||||||
// Import Libbox framework header
|
|
||||||
#import <Libbox/Libbox.h>
|
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
|
import Libbox
|
||||||
|
|
||||||
public class CommandClient: ObservableObject {
|
public class CommandClient: ObservableObject {
|
||||||
public enum ConnectionType {
|
public enum ConnectionType {
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
|
import Libbox
|
||||||
|
|
||||||
extension LibboxStringIteratorProtocol {
|
extension LibboxStringIteratorProtocol {
|
||||||
func toArray() -> [String] {
|
func toArray() -> [String] {
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
import NetworkExtension
|
import NetworkExtension
|
||||||
|
import Libbox
|
||||||
|
|
||||||
func runBlocking<T>(_ block: @escaping () async -> T) -> T {
|
func runBlocking<T>(_ block: @escaping () async -> T) -> T {
|
||||||
let semaphore = DispatchSemaphore(value: 0)
|
let semaphore = DispatchSemaphore(value: 0)
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import NetworkExtension
|
|||||||
#if canImport(CoreWLAN)
|
#if canImport(CoreWLAN)
|
||||||
import CoreWLAN
|
import CoreWLAN
|
||||||
#endif
|
#endif
|
||||||
|
import Libbox
|
||||||
|
|
||||||
public class ExtensionPlatformInterface: NSObject, LibboxPlatformInterfaceProtocol, LibboxCommandServerHandlerProtocol {
|
public class ExtensionPlatformInterface: NSObject, LibboxPlatformInterfaceProtocol, LibboxCommandServerHandlerProtocol {
|
||||||
private let tunnel: ExtensionProvider
|
private let tunnel: ExtensionProvider
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
import NetworkExtension
|
import NetworkExtension
|
||||||
|
import Libbox
|
||||||
|
|
||||||
public class ExtensionProfile: ObservableObject {
|
public class ExtensionProfile: ObservableObject {
|
||||||
private let manager: NEVPNManager
|
private let manager: NEVPNManager
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
import NetworkExtension
|
import NetworkExtension
|
||||||
|
import Libbox
|
||||||
|
|
||||||
open class ExtensionProvider: NEPacketTunnelProvider {
|
open class ExtensionProvider: NEPacketTunnelProvider {
|
||||||
public var username: String? = nil
|
public var username: String? = nil
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
|
import Libbox
|
||||||
|
|
||||||
public class HTTPClient {
|
public class HTTPClient {
|
||||||
private static var userAgent: String {
|
private static var userAgent: String {
|
||||||
|
|||||||
@@ -470,7 +470,6 @@
|
|||||||
C0DDD67A2CB908B200AE1C0A /* 12c853b3.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = 12c853b3.json; sourceTree = "<group>"; };
|
C0DDD67A2CB908B200AE1C0A /* 12c853b3.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = 12c853b3.json; sourceTree = "<group>"; };
|
||||||
C0DDD6882CB9110900AE1C0A /* View+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "View+Extensions.swift"; sourceTree = "<group>"; };
|
C0DDD6882CB9110900AE1C0A /* View+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "View+Extensions.swift"; sourceTree = "<group>"; };
|
||||||
C0E540142CA17EBF0054BC97 /* Libbox.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = Libbox.xcframework; sourceTree = "<group>"; };
|
C0E540142CA17EBF0054BC97 /* Libbox.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = Libbox.xcframework; sourceTree = "<group>"; };
|
||||||
C0E54020CA17EC200054BCA0 /* Library-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Library-Bridging-Header.h"; sourceTree = "<group>"; };
|
|
||||||
/* End PBXFileReference section */
|
/* End PBXFileReference section */
|
||||||
|
|
||||||
/* Begin PBXFrameworksBuildPhase section */
|
/* Begin PBXFrameworksBuildPhase section */
|
||||||
@@ -765,7 +764,6 @@
|
|||||||
3AEC21462A45A9CE00A63465 /* Shared */,
|
3AEC21462A45A9CE00A63465 /* Shared */,
|
||||||
3AEC21432A45A92B00A63465 /* Network */,
|
3AEC21432A45A92B00A63465 /* Network */,
|
||||||
3AEC213A2A459FD200A63465 /* Database */,
|
3AEC213A2A459FD200A63465 /* Database */,
|
||||||
C0E54020CA17EC200054BCA0 /* Library-Bridging-Header.h */,
|
|
||||||
3A648D2C2A4EEAA600D95A12 /* Library.swift */,
|
3A648D2C2A4EEAA600D95A12 /* Library.swift */,
|
||||||
);
|
);
|
||||||
path = Library;
|
path = Library;
|
||||||
@@ -1801,7 +1799,6 @@
|
|||||||
ONLY_ACTIVE_ARCH = YES;
|
ONLY_ACTIVE_ARCH = YES;
|
||||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
|
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
|
||||||
SWIFT_EMIT_LOC_STRINGS = NO;
|
SWIFT_EMIT_LOC_STRINGS = NO;
|
||||||
SWIFT_OBJC_BRIDGING_HEADER = "Library/Library-Bridging-Header.h";
|
|
||||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||||
VERSIONING_SYSTEM = "apple-generic";
|
VERSIONING_SYSTEM = "apple-generic";
|
||||||
VERSION_INFO_PREFIX = "";
|
VERSION_INFO_PREFIX = "";
|
||||||
@@ -2018,7 +2015,6 @@
|
|||||||
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
|
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
|
||||||
SWIFT_EMIT_LOC_STRINGS = NO;
|
SWIFT_EMIT_LOC_STRINGS = NO;
|
||||||
SWIFT_ENABLE_EXPLICIT_MODULES = NO;
|
SWIFT_ENABLE_EXPLICIT_MODULES = NO;
|
||||||
SWIFT_OBJC_BRIDGING_HEADER = "Library/Library-Bridging-Header.h";
|
|
||||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||||
SWIFT_VERSION = 5.0;
|
SWIFT_VERSION = 5.0;
|
||||||
TARGETED_DEVICE_FAMILY = "1,2,3";
|
TARGETED_DEVICE_FAMILY = "1,2,3";
|
||||||
@@ -2073,7 +2069,6 @@
|
|||||||
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
|
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
|
||||||
SWIFT_EMIT_LOC_STRINGS = NO;
|
SWIFT_EMIT_LOC_STRINGS = NO;
|
||||||
SWIFT_ENABLE_EXPLICIT_MODULES = NO;
|
SWIFT_ENABLE_EXPLICIT_MODULES = NO;
|
||||||
SWIFT_OBJC_BRIDGING_HEADER = "Library/Library-Bridging-Header.h";
|
|
||||||
SWIFT_VERSION = 5.0;
|
SWIFT_VERSION = 5.0;
|
||||||
TARGETED_DEVICE_FAMILY = "1,2,3";
|
TARGETED_DEVICE_FAMILY = "1,2,3";
|
||||||
TVOS_DEPLOYMENT_TARGET = 17.0;
|
TVOS_DEPLOYMENT_TARGET = 17.0;
|
||||||
|
|||||||
Reference in New Issue
Block a user