From d02b0fd10ed7d499fff612dbe89a370fbe4052c1 Mon Sep 17 00:00:00 2001
From: Roopesh Chander <roop@roopc.net>
Date: Wed, 21 Nov 2018 19:35:47 +0530
Subject: xcconfig: Make app id platform-specific

Signed-off-by: Roopesh Chander <roop@roopc.net>
---
 WireGuard/WireGuard.xcodeproj/project.pbxproj                     | 8 ++++----
 WireGuard/WireGuard/Config/Developer.xcconfig.template            | 4 ++--
 WireGuard/WireGuard/Info.plist                                    | 2 +-
 WireGuard/WireGuard/WireGuard.entitlements                        | 2 +-
 WireGuard/WireGuardNetworkExtension/Info.plist                    | 2 +-
 .../WireGuardNetworkExtension.entitlements                        | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/WireGuard/WireGuard.xcodeproj/project.pbxproj b/WireGuard/WireGuard.xcodeproj/project.pbxproj
index 5b7efcf..bf7b2ff 100644
--- a/WireGuard/WireGuard.xcodeproj/project.pbxproj
+++ b/WireGuard/WireGuard.xcodeproj/project.pbxproj
@@ -790,7 +790,7 @@
 				);
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID).network-extension";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_IOS).network-extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
@@ -812,7 +812,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID).network-extension";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_IOS).network-extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
@@ -977,7 +977,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID)";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_IOS)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "WireGuard/WireGuard-Bridging-Header.h";
 				SWIFT_VERSION = 4.2;
@@ -996,7 +996,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID)";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_IOS)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "WireGuard/WireGuard-Bridging-Header.h";
 				SWIFT_VERSION = 4.2;
diff --git a/WireGuard/WireGuard/Config/Developer.xcconfig.template b/WireGuard/WireGuard/Config/Developer.xcconfig.template
index 961699a..816d47c 100644
--- a/WireGuard/WireGuard/Config/Developer.xcconfig.template
+++ b/WireGuard/WireGuard/Config/Developer.xcconfig.template
@@ -3,7 +3,7 @@
 // You Apple developer account's Team ID
 DEVELOPMENT_TEAM = <team_id>
 
-// The bundle identifier of this app.
+// The bundle identifier of the iOS app.
 // Should be an app id created at developer.apple.com
 // with Network Extensions capabilty.
-APP_ID = <app_id>
+APP_ID_IOS = <app_id>
diff --git a/WireGuard/WireGuard/Info.plist b/WireGuard/WireGuard/Info.plist
index eb25ec5..9b7bc07 100644
--- a/WireGuard/WireGuard/Info.plist
+++ b/WireGuard/WireGuard/Info.plist
@@ -123,6 +123,6 @@
 		</dict>
 	</array>
 	<key>com.wireguard.ios.app_group_id</key>
-    <string>group.$(APP_ID)</string>
+    <string>group.$(APP_ID_IOS)</string>
 </dict>
 </plist>
diff --git a/WireGuard/WireGuard/WireGuard.entitlements b/WireGuard/WireGuard/WireGuard.entitlements
index 4f46373..b5bbc16 100644
--- a/WireGuard/WireGuard/WireGuard.entitlements
+++ b/WireGuard/WireGuard/WireGuard.entitlements
@@ -8,7 +8,7 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-         <string>group.$(APP_ID)</string>
+         <string>group.$(APP_ID_IOS)</string>
     </array>
 </dict>
 </plist>
diff --git a/WireGuard/WireGuardNetworkExtension/Info.plist b/WireGuard/WireGuardNetworkExtension/Info.plist
index b749e34..1075c53 100644
--- a/WireGuard/WireGuardNetworkExtension/Info.plist
+++ b/WireGuard/WireGuardNetworkExtension/Info.plist
@@ -30,6 +30,6 @@
 		<string>$(PRODUCT_MODULE_NAME).PacketTunnelProvider</string>
 	</dict>
 	<key>com.wireguard.ios.app_group_id</key>
-    <string>group.$(APP_ID)</string>
+    <string>group.$(APP_ID_IOS)</string>
 </dict>
 </plist>
diff --git a/WireGuard/WireGuardNetworkExtension/WireGuardNetworkExtension.entitlements b/WireGuard/WireGuardNetworkExtension/WireGuardNetworkExtension.entitlements
index 4f46373..b5bbc16 100644
--- a/WireGuard/WireGuardNetworkExtension/WireGuardNetworkExtension.entitlements
+++ b/WireGuard/WireGuardNetworkExtension/WireGuardNetworkExtension.entitlements
@@ -8,7 +8,7 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-         <string>group.$(APP_ID)</string>
+         <string>group.$(APP_ID_IOS)</string>
     </array>
 </dict>
 </plist>
-- 
cgit v1.2.3-59-g8ed1b