diff --git a/Lib/ios/arm64/ck-ovpn-plugin.a b/Lib/ios/arm64/ck-ovpn-plugin.a index cbc5ff0..dd5d571 100644 Binary files a/Lib/ios/arm64/ck-ovpn-plugin.a and b/Lib/ios/arm64/ck-ovpn-plugin.a differ diff --git a/Lib/ios/arm64/ck-ovpn-plugin.a.sha256 b/Lib/ios/arm64/ck-ovpn-plugin.a.sha256 index fc0b787..e5a0ace 100644 --- a/Lib/ios/arm64/ck-ovpn-plugin.a.sha256 +++ b/Lib/ios/arm64/ck-ovpn-plugin.a.sha256 @@ -1 +1 @@ -34d8fa038ad8b1de03c31574a98a227673a3e52cbe1e1a607bcb5fb260e542f0 +7822e1d5e504f32fa99c7298ec203bbcd3d810347cc7bc2c0e2bc17ec94ff671 diff --git a/Lib/macos/arm64/ck-ovpn-plugin-arm64.a.sha256 b/Lib/macos/arm64/ck-ovpn-plugin-arm64.a.sha256 new file mode 100644 index 0000000..7c2dd14 --- /dev/null +++ b/Lib/macos/arm64/ck-ovpn-plugin-arm64.a.sha256 @@ -0,0 +1 @@ +1aff4be0dde992098e0f00c42a7facfaad41fb801180aaa6d725f79e90d81c0d diff --git a/Lib/macos/arm64/ck-ovpn-plugin.a b/Lib/macos/arm64/ck-ovpn-plugin.a new file mode 100644 index 0000000..3b11ac2 Binary files /dev/null and b/Lib/macos/arm64/ck-ovpn-plugin.a differ diff --git a/Lib/macos/x86_64/ck-ovpn-plugin-x86-64.a.sha256 b/Lib/macos/x86_64/ck-ovpn-plugin-x86-64.a.sha256 new file mode 100644 index 0000000..676d17a --- /dev/null +++ b/Lib/macos/x86_64/ck-ovpn-plugin-x86-64.a.sha256 @@ -0,0 +1 @@ +1da9065e09a794d95256b74e082d4df61ba1744351def28baa43f9aceeaf7a3b diff --git a/Lib/macos/x86_64/ck-ovpn-plugin.a b/Lib/macos/x86_64/ck-ovpn-plugin.a new file mode 100644 index 0000000..e84b521 Binary files /dev/null and b/Lib/macos/x86_64/ck-ovpn-plugin.a differ diff --git a/OpenVPNAdapter.xcodeproj/project.pbxproj b/OpenVPNAdapter.xcodeproj/project.pbxproj index 9392907..417f92b 100644 --- a/OpenVPNAdapter.xcodeproj/project.pbxproj +++ b/OpenVPNAdapter.xcodeproj/project.pbxproj @@ -8,8 +8,8 @@ /* Begin PBXBuildFile section */ 4E51D4962BCE7A63006977DA /* ck-ovpn-plugin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B7795A329DC896200D15D50 /* ck-ovpn-plugin.a */; }; - 7B7E1EA129E70FB400E76E6D /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B7E1EA029E70FB400E76E6D /* UIKit.framework */; }; 7BFD7A8029E5BEF90066D7CC /* ovpncli.mm in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_73 /* ovpncli.mm */; }; + C34ADCE62C41D3180051DA04 /* ck-ovpn-plugin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B7795A329DC896200D15D50 /* ck-ovpn-plugin.a */; }; C910EAE524EBB1DA0081AF13 /* OpenVPNReachabilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97E5FD624123F48005C2EBC /* OpenVPNReachabilityTests.swift */; }; C910EAE724EBB5210081AF13 /* OpenVPNConfigurationEvaluation.h in Headers */ = {isa = PBXBuildFile; fileRef = C910EAE624EBB5210081AF13 /* OpenVPNConfigurationEvaluation.h */; settings = {ATTRIBUTES = (Public, ); }; }; C910EAEE24EBBFB60081AF13 /* client.crt in Resources */ = {isa = PBXBuildFile; fileRef = C910EAEB24EBBFB60081AF13 /* client.crt */; }; @@ -60,8 +60,8 @@ C97E5FE024123F48005C2EBC /* VPNProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97E5FDA24123F48005C2EBC /* VPNProfile.swift */; }; C97E5FE124123F48005C2EBC /* Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97E5FDB24123F48005C2EBC /* Bundle.swift */; }; C97E5FE624124B0E005C2EBC /* Umbrella-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5FBA2412344D005C2EBC /* Umbrella-Header.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C97E5FE724124B6F005C2EBC /* LZ4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "OpenVPNAdapter::LZ4::Product" /* LZ4.framework */; platformFilter = ios; }; - C97E5FEC24124B73005C2EBC /* mbedTLS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "OpenVPNAdapter::mbedTLS::Product" /* mbedTLS.framework */; platformFilter = ios; }; + C97E5FE724124B6F005C2EBC /* LZ4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "OpenVPNAdapter::LZ4::Product" /* LZ4.framework */; }; + C97E5FEC24124B73005C2EBC /* mbedTLS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "OpenVPNAdapter::mbedTLS::Product" /* mbedTLS.framework */; }; C9EABF3124110BE200D828D4 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9EABF3024110BE200D828D4 /* SystemConfiguration.framework */; }; OBJ_250 /* lz4.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_16 /* lz4.c */; }; OBJ_251 /* lz4frame.c in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_17 /* lz4frame.c */; }; @@ -232,6 +232,8 @@ /* Begin PBXFileReference section */ 7B7795A329DC896200D15D50 /* ck-ovpn-plugin.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "ck-ovpn-plugin.a"; path = "Lib/ios/arm64/ck-ovpn-plugin.a"; sourceTree = ""; }; 7B7E1EA029E70FB400E76E6D /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS15.2.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; + C34ADCE32C41D2A40051DA04 /* ck-ovpn-plugin.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "ck-ovpn-plugin.a"; path = "Lib/macos/x86_64/ck-ovpn-plugin.a"; sourceTree = ""; }; + C34ADCE52C41D3080051DA04 /* ios */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ios; path = Lib/ios; sourceTree = ""; }; C910EAE624EBB5210081AF13 /* OpenVPNConfigurationEvaluation.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = OpenVPNConfigurationEvaluation.h; sourceTree = ""; }; C910EAEB24EBBFB60081AF13 /* client.crt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = client.crt; sourceTree = ""; }; C910EAEC24EBBFB60081AF13 /* ca.crt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ca.crt; sourceTree = ""; }; @@ -512,9 +514,9 @@ OBJ_304 /* OpenVPNClient.framework in Frameworks */, 7B7E1EA129E70FB400E76E6D /* UIKit.framework in Frameworks */, C9EABF3124110BE200D828D4 /* SystemConfiguration.framework in Frameworks */, - 4E51D4962BCE7A63006977DA /* ck-ovpn-plugin.a in Frameworks */, C97E5FEC24124B73005C2EBC /* mbedTLS.framework in Frameworks */, C97E5FE724124B6F005C2EBC /* LZ4.framework in Frameworks */, + C34ADCE62C41D3180051DA04 /* ck-ovpn-plugin.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -566,7 +568,9 @@ isa = PBXGroup; children = ( 7B7E1EA029E70FB400E76E6D /* UIKit.framework */, + C34ADCE52C41D3080051DA04 /* ios */, 7B7795A329DC896200D15D50 /* ck-ovpn-plugin.a */, + C34ADCE32C41D2A40051DA04 /* ck-ovpn-plugin.a */, C9EABF3024110BE200D828D4 /* SystemConfiguration.framework */, ); name = Frameworks; @@ -1416,6 +1420,7 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -1474,6 +1479,7 @@ SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; + VALID_ARCHS = x86_64; }; name = Release; }; @@ -1504,6 +1510,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = LZ4; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -1534,6 +1541,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = LZ4; + VALID_ARCHS = x86_64; }; name = Release; }; @@ -1562,6 +1570,7 @@ "$(inherited)", "$(PROJECT_DIR)", "$(PROJECT_DIR)/Lib/ios/arm64", + "$(PROJECT_DIR)/Lib/macos/x86_64", ); MARKETING_VERSION = 0.8.0; OPENVPN_PLUGGABLE_TRANSPORTS = 1; @@ -1577,9 +1586,9 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGETED_DEVICE_FAMILY = "1,2"; TARGET_NAME = OpenVPNAdapter; - VALID_ARCHS = arm64; - "VALID_ARCHS[arch=*]" = arm64; - "VALID_ARCHS[sdk=iphoneos*]" = arm64; + VALID_ARCHS = x86_64; + "VALID_ARCHS[arch=*]" = x86_64; + "VALID_ARCHS[sdk=iphoneos*]" = x86_64; }; name = Debug; }; @@ -1608,6 +1617,7 @@ "$(inherited)", "$(PROJECT_DIR)", "$(PROJECT_DIR)/Lib/ios/arm64", + "$(PROJECT_DIR)/Lib/macos/x86_64", ); MARKETING_VERSION = 0.8.0; OPENVPN_PLUGGABLE_TRANSPORTS = 1; @@ -1623,8 +1633,8 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGETED_DEVICE_FAMILY = "1,2"; TARGET_NAME = OpenVPNAdapter; - VALID_ARCHS = arm64; - "VALID_ARCHS[arch=*]" = arm64; + VALID_ARCHS = x86_64; + "VALID_ARCHS[arch=*]" = x86_64; "VALID_ARCHS[sdk=iphoneos*]" = arm64; }; name = Release; @@ -1770,6 +1780,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = mbedTLS; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -1803,6 +1814,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)"; TARGET_NAME = mbedTLS; + VALID_ARCHS = x86_64; }; name = Release; };