xcconfig: Make app id platform-specific

Signed-off-by: Roopesh Chander <roop@roopc.net>

diff --git a/WireGuard/WireGuard.xcodeproj/project.pbxproj b/WireGuard/WireGuard.xcodeproj/project.pbxproj
index 5b7efcf08290270c6258433298acfe74afaa1409..bf7b2ffde950c56047a0ced40b89334f73a41728 100644 (file)
--- 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 961699a576dc971d7905592bc435fb97fcceba5d..816d47c569460701b9d1e60ae32dfc4b2a0ac653 100644 (file)
--- 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 eb25ec5e46101e73e7a0b27333c8d7e615d574aa..9b7bc07d70d3af411d004ae7e1815f6344fe78be 100644 (file)
--- 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 4f46373f7734eaa6c20845b5d5d34dc0aeceb4c2..b5bbc1606d50db4d8922ca57d6582e1a273e1e73 100644 (file)
--- 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 b749e34a95250780691e8f8a2c3fc786e62c80e5..1075c539bedef447a84f205ddc4ba1b6c5b67925 100644 (file)
--- 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 4f46373f7734eaa6c20845b5d5d34dc0aeceb4c2..b5bbc1606d50db4d8922ca57d6582e1a273e1e73 100644 (file)
--- 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>