From e091020692aa646303c302b781fad548efda75f6 Mon Sep 17 00:00:00 2001 From: Yaroslav Yashin Date: Mon, 10 Feb 2025 19:14:14 +0100 Subject: [PATCH] refactor: update ios build configuration to use automatic code signing and prebuilt OpenVPNAdapter framework --- client/cmake/ios.cmake | 6 +----- client/ios/networkextension/CMakeLists.txt | 7 +------ client/platforms/ios/HevSocksTunnel.swift | 1 + 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/client/cmake/ios.cmake b/client/cmake/ios.cmake index 5fda35061..6507ed974 100644 --- a/client/cmake/ios.cmake +++ b/client/cmake/ios.cmake @@ -76,11 +76,7 @@ set_target_properties(${PROJECT} PROPERTIES XCODE_LINK_BUILD_PHASE_MODE KNOWN_LOCATION XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/Frameworks" XCODE_EMBED_APP_EXTENSIONS networkextension - XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution" - XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development" - XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual - XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "match AppStore org.amnezia.AmneziaVPN" - XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "match Development org.amnezia.AmneziaVPN" + XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic ) set_target_properties(${PROJECT} PROPERTIES XCODE_ATTRIBUTE_SWIFT_VERSION "5.0" diff --git a/client/ios/networkextension/CMakeLists.txt b/client/ios/networkextension/CMakeLists.txt index c448ed08d..dde03b3b1 100644 --- a/client/ios/networkextension/CMakeLists.txt +++ b/client/ios/networkextension/CMakeLists.txt @@ -27,12 +27,7 @@ set_target_properties(networkextension PROPERTIES XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../../Frameworks" - XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution" - XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development" - - XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual - XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "match AppStore org.amnezia.AmneziaVPN.network-extension" - XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "match Development org.amnezia.AmneziaVPN.network-extension" + XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic ) set_target_properties(networkextension PROPERTIES diff --git a/client/platforms/ios/HevSocksTunnel.swift b/client/platforms/ios/HevSocksTunnel.swift index a86a07587..87d995e8d 100644 --- a/client/platforms/ios/HevSocksTunnel.swift +++ b/client/platforms/ios/HevSocksTunnel.swift @@ -1,4 +1,5 @@ import HevSocks5Tunnel +import NetworkExtension public enum Socks5Tunnel {