From a754c4d7abcdf7f8d2ce2f7eed8d84257f6fa1eb Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Thu, 27 Dec 2018 19:25:14 +0530 Subject: iOS: Fix WireGuardiOS target - Move Info.plist and entitlements to WireGuard/UI/iOS/ Signed-off-by: Roopesh Chander --- WireGuard/WireGuard.xcodeproj/project.pbxproj | 12 +- WireGuard/WireGuard/Info.plist | 128 ---------------------- WireGuard/WireGuard/UI/iOS/Info.plist | 128 ++++++++++++++++++++++ WireGuard/WireGuard/UI/iOS/WireGuard.entitlements | 14 +++ WireGuard/WireGuard/WireGuard.entitlements | 14 --- 5 files changed, 148 insertions(+), 148 deletions(-) delete mode 100644 WireGuard/WireGuard/Info.plist create mode 100644 WireGuard/WireGuard/UI/iOS/Info.plist create mode 100644 WireGuard/WireGuard/UI/iOS/WireGuard.entitlements delete mode 100644 WireGuard/WireGuard/WireGuard.entitlements diff --git a/WireGuard/WireGuard.xcodeproj/project.pbxproj b/WireGuard/WireGuard.xcodeproj/project.pbxproj index c4bce8f..12581db 100644 --- a/WireGuard/WireGuard.xcodeproj/project.pbxproj +++ b/WireGuard/WireGuard.xcodeproj/project.pbxproj @@ -393,6 +393,8 @@ 6F7774E0217181B1006A79B3 /* AppDelegate.swift */, 6F919EC2218A2AE90023B400 /* ErrorPresenter.swift */, 5F45417C21C1B23600994C13 /* UITableViewCell+Reuse.swift */, + 6FF4AC23211EC472002C96EB /* Info.plist */, + 6FF4AC482120B9E0002C96EB /* WireGuard.entitlements */, ); path = iOS; sourceTree = ""; @@ -533,8 +535,6 @@ 6F61F1E821B932F700483816 /* WireGuardAppError.swift */, 6F61F1EA21B937EF00483816 /* WireGuardResult.swift */, 6FE1765921C90E87002690EA /* LocalizationHelper.swift */, - 6FF4AC482120B9E0002C96EB /* WireGuard.entitlements */, - 6FF4AC23211EC472002C96EB /* Info.plist */, 6FF4AC2B211EC776002C96EB /* Config.xcconfig */, 6F689999218043390012E523 /* WireGuard-Bridging-Header.h */, ); @@ -1480,9 +1480,9 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = WireGuard/WireGuard.entitlements; + CODE_SIGN_ENTITLEMENTS = WireGuard/UI/iOS/WireGuard.entitlements; CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = WireGuard/Info.plist; + INFOPLIST_FILE = WireGuard/UI/iOS/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1499,9 +1499,9 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = WireGuard/WireGuard.entitlements; + CODE_SIGN_ENTITLEMENTS = WireGuard/UI/iOS/WireGuard.entitlements; CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = WireGuard/Info.plist; + INFOPLIST_FILE = WireGuard/UI/iOS/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/WireGuard/WireGuard/Info.plist b/WireGuard/WireGuard/Info.plist deleted file mode 100644 index 9b7bc07..0000000 --- a/WireGuard/WireGuard/Info.plist +++ /dev/null @@ -1,128 +0,0 @@ - - - - - ITSAppUsesNonExemptEncryption - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDocumentTypes - - - CFBundleTypeExtensions - - conf - - CFBundleTypeIconFiles - - wireguard_doc_logo_22x29.png - wireguard_doc_logo_44x58.png - wireguard_doc_logo_64x64.png - wireguard_doc_logo_320x320.png - - CFBundleTypeName - WireGuard wg-quick configuration file - CFBundleTypeRole - Viewer - LSHandlerRank - Default - LSItemContentTypes - - com.wireguard.config.quick - - - - CFBundleTypeName - Zip file - CFBundleTypeRole - Viewer - LSHandlerRank - Alternate - LSItemContentTypes - - com.pkware.zip-archive - - - - CFBundleTypeIconFiles - - CFBundleTypeName - Text file - CFBundleTypeRole - Viewer - LSHandlerRank - Alternate - LSItemContentTypes - - public.text - - - - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - $(VERSION_NAME) - CFBundleVersion - $(VERSION_ID) - LSRequiresIPhoneOS - - LSSupportsOpeningDocumentsInPlace - - NSCameraUsageDescription - Camera is used for scanning QR codes for importing WireGuard configurations - UILaunchStoryboardName - LaunchScreen - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UTExportedTypeDeclarations - - - UTTypeConformsTo - - public.text - - UTTypeDescription - WireGuard wg-quick configuration file - UTTypeIconFiles - - wireguard_doc_logo_22x29.png - wireguard_doc_logo_44x58.png - wireguard_doc_logo_64x64.png - wireguard_doc_logo_320x320.png - - UTTypeIdentifier - com.wireguard.config.quick - UTTypeTagSpecification - - public.filename-extension - conf - - - - com.wireguard.ios.app_group_id - group.$(APP_ID_IOS) - - diff --git a/WireGuard/WireGuard/UI/iOS/Info.plist b/WireGuard/WireGuard/UI/iOS/Info.plist new file mode 100644 index 0000000..9b7bc07 --- /dev/null +++ b/WireGuard/WireGuard/UI/iOS/Info.plist @@ -0,0 +1,128 @@ + + + + + ITSAppUsesNonExemptEncryption + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDocumentTypes + + + CFBundleTypeExtensions + + conf + + CFBundleTypeIconFiles + + wireguard_doc_logo_22x29.png + wireguard_doc_logo_44x58.png + wireguard_doc_logo_64x64.png + wireguard_doc_logo_320x320.png + + CFBundleTypeName + WireGuard wg-quick configuration file + CFBundleTypeRole + Viewer + LSHandlerRank + Default + LSItemContentTypes + + com.wireguard.config.quick + + + + CFBundleTypeName + Zip file + CFBundleTypeRole + Viewer + LSHandlerRank + Alternate + LSItemContentTypes + + com.pkware.zip-archive + + + + CFBundleTypeIconFiles + + CFBundleTypeName + Text file + CFBundleTypeRole + Viewer + LSHandlerRank + Alternate + LSItemContentTypes + + public.text + + + + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(VERSION_NAME) + CFBundleVersion + $(VERSION_ID) + LSRequiresIPhoneOS + + LSSupportsOpeningDocumentsInPlace + + NSCameraUsageDescription + Camera is used for scanning QR codes for importing WireGuard configurations + UILaunchStoryboardName + LaunchScreen + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UTExportedTypeDeclarations + + + UTTypeConformsTo + + public.text + + UTTypeDescription + WireGuard wg-quick configuration file + UTTypeIconFiles + + wireguard_doc_logo_22x29.png + wireguard_doc_logo_44x58.png + wireguard_doc_logo_64x64.png + wireguard_doc_logo_320x320.png + + UTTypeIdentifier + com.wireguard.config.quick + UTTypeTagSpecification + + public.filename-extension + conf + + + + com.wireguard.ios.app_group_id + group.$(APP_ID_IOS) + + diff --git a/WireGuard/WireGuard/UI/iOS/WireGuard.entitlements b/WireGuard/WireGuard/UI/iOS/WireGuard.entitlements new file mode 100644 index 0000000..b5bbc16 --- /dev/null +++ b/WireGuard/WireGuard/UI/iOS/WireGuard.entitlements @@ -0,0 +1,14 @@ + + + + + com.apple.developer.networking.networkextension + + packet-tunnel-provider + + com.apple.security.application-groups + + group.$(APP_ID_IOS) + + + diff --git a/WireGuard/WireGuard/WireGuard.entitlements b/WireGuard/WireGuard/WireGuard.entitlements deleted file mode 100644 index b5bbc16..0000000 --- a/WireGuard/WireGuard/WireGuard.entitlements +++ /dev/null @@ -1,14 +0,0 @@ - - - - - com.apple.developer.networking.networkextension - - packet-tunnel-provider - - com.apple.security.application-groups - - group.$(APP_ID_IOS) - - - -- cgit v1.2.3-59-g8ed1b