github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(apple/iOS): Use separate Info.plist for iOS and macOS Network Extensions (#7609)

Browse Source 
macOS and iOS require slightly different Info.plist values for the
Network Extension.

Fixes a regression introduced in #7602
This commit is contained in:
Jamil
2024-12-30 10:04:10 -08:00
committed by GitHub
parent 99b97ad261
commit 019d9b6749
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
swift/apple/Firezone.xcodeproj/project.pbxproj
View File

@@ -101,7 +101,6 @@
6FFECD5B2AD6998400E00273 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
8D1D405C2CFF6F5200E669F9 /* Firezone.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Firezone.entitlements; sourceTree = "<group>"; };
8D1D405D2CFF6F5D00E669F9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8D1D40602CFF6F7400E669F9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8D41B9A42D15DD6800D16065 /* TunnelLogArchive.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelLogArchive.swift; sourceTree = "<group>"; };
8D5047E32CE6A8F4009802E9 /* dev.firezone.firezone.network-extension.systemextension */ = {isa = PBXFileReference; explicitFileType = "wrapper.system-extension"; includeInIndex = 0; path = "dev.firezone.firezone.network-extension.systemextension"; sourceTree = BUILT_PRODUCTS_DIR; };
8D5047E82CE6A8F4009802E9 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
@@ -121,6 +120,8 @@
8DCC022928D512AE007E12D2 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
8DD2C4C3297B37BA00F984BF /* FirezoneKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = FirezoneKit; sourceTree = "<group>"; };
8DDD0E8B2ADC6657001FA7E9 /* config.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = config.xcconfig; path = xcconfig/config.xcconfig; sourceTree = "<group>"; };
8DE1077A2D2313EB00DB5A45 /* Info.iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.iOS.plist; sourceTree = "<group>"; };
8DE1077B2D2313EB00DB5A45 /* Info.macOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.macOS.plist; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -162,7 +163,8 @@
05833DF928F73B070008FAB0 /* FirezoneNetworkExtension */ = {
isa = PBXGroup;
children = (
8D1D40602CFF6F7400E669F9 /* Info.plist */,
8DE1077A2D2313EB00DB5A45 /* Info.iOS.plist */,
8DE1077B2D2313EB00DB5A45 /* Info.macOS.plist */,
8D6939312BA2521A00AF4396 /* SystemConfigurationResolvers.swift */,
8D69392B2BA24FE600AF4396 /* BindResolvers.swift */,
05CF1CF6290B1CEE00CF4755 /* FirezoneNetworkExtension.entitlements */,
@@ -579,7 +581,7 @@
DEVELOPMENT_TEAM = "$(inherited)";
FRAMEWORK_SEARCH_PATHS = "";
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = FirezoneNetworkExtension/Info.plist;
INFOPLIST_FILE = FirezoneNetworkExtension/Info.iOS.plist;
INFOPLIST_KEY_CFBundleDisplayName = FirezoneNetworkExtension;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
INFOPLIST_KEY_NSSystemExtensionUsageDescription = "Firezone tunnel service";
@@ -621,7 +623,7 @@
DEVELOPMENT_TEAM = "$(inherited)";
FRAMEWORK_SEARCH_PATHS = "";
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = FirezoneNetworkExtension/Info.plist;
INFOPLIST_FILE = FirezoneNetworkExtension/Info.iOS.plist;
INFOPLIST_KEY_CFBundleDisplayName = FirezoneNetworkExtension;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
INFOPLIST_KEY_NSSystemExtensionUsageDescription = "Firezone tunnel service";
@@ -661,7 +663,7 @@
DEVELOPMENT_TEAM = "$(inherited)";
ENABLE_HARDENED_RUNTIME = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = FirezoneNetworkExtension/Info.plist;
INFOPLIST_FILE = FirezoneNetworkExtension/Info.macOS.plist;
INFOPLIST_KEY_CFBundleDisplayName = FirezoneNetworkExtension;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = "";
@@ -699,7 +701,7 @@
DEVELOPMENT_TEAM = "$(inherited)";
ENABLE_HARDENED_RUNTIME = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = FirezoneNetworkExtension/Info.plist;
INFOPLIST_FILE = FirezoneNetworkExtension/Info.macOS.plist;
INFOPLIST_KEY_CFBundleDisplayName = FirezoneNetworkExtension;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = "";

15
swift/apple/FirezoneNetworkExtension/Info.iOS.plist Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
<string>com.apple.networkextension.packet-tunnel</string>
<key>NSExtensionPrincipalClass</key>
<string>$(PRODUCT_MODULE_NAME).PacketTunnelProvider</string>
</dict>
<key>AppGroupIdentifier</key>
<string>$(APP_GROUP_ID)</string>
</dict>
</plist>

0
swift/apple/FirezoneNetworkExtension/Info.plist → swift/apple/FirezoneNetworkExtension/Info.macOS.plist
View File