Update bundle names

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/WireGuard.xcodeproj/project.pbxproj b/WireGuard.xcodeproj/project.pbxproj
index d9be51120813087294397c00cd0abf047d8e8fb5..832b347b976fed9af3cf762496499d697dc33183 100644 (file)
--- a/WireGuard.xcodeproj/project.pbxproj
+++ b/WireGuard.xcodeproj/project.pbxproj
@@ -791,7 +791,7 @@
                                        "$(inherited)",
                                        "@executable_path/Frameworks",
                                );
-                               PRODUCT_BUNDLE_IDENTIFIER = com.wireguard.ios.WireGuard;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.wireguard.ios;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PROVISIONING_PROFILE_SPECIFIER = "";
                                SWIFT_OBJC_BRIDGING_HEADER = "WireGuard/WireGuard-Bridging-Header.h";
@@ -817,7 +817,7 @@
                                        "$(inherited)",
                                        "@executable_path/Frameworks",
                                );
-                               PRODUCT_BUNDLE_IDENTIFIER = com.wireguard.ios.WireGuard;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.wireguard.ios;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PROVISIONING_PROFILE_SPECIFIER = "";
                                SWIFT_OBJC_BRIDGING_HEADER = "WireGuard/WireGuard-Bridging-Header.h";
@@ -885,7 +885,7 @@
                                        "$(inherited)",
                                        "$(PROJECT_DIR)/wireguard-go-bridge",
                                );
-                               PRODUCT_BUNDLE_IDENTIFIER = com.wireguard.ios.WireGuard.WireGuardNetworkExtension;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.wireguard.ios.WireGuardNetworkExtension;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = YES;
                                SWIFT_OBJC_BRIDGING_HEADER = "WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
@@ -914,7 +914,7 @@
                                        "$(inherited)",
                                        "$(PROJECT_DIR)/wireguard-go-bridge",
                                );
-                               PRODUCT_BUNDLE_IDENTIFIER = com.wireguard.ios.WireGuard.WireGuardNetworkExtension;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.wireguard.ios.WireGuardNetworkExtension;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = YES;
                                SWIFT_OBJC_BRIDGING_HEADER = "WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";

diff --git a/WireGuard/Coordinators/AppCoordinator.swift b/WireGuard/Coordinators/AppCoordinator.swift
index 02ea4e88ed16c62eaea947c44e185da00036249e..7038053dc3b1fd1ae62ccaaaa3198def40ae498a 100644 (file)
--- a/WireGuard/Coordinators/AppCoordinator.swift
+++ b/WireGuard/Coordinators/AppCoordinator.swift
@@ -21,8 +21,8 @@ enum AppCoordinatorError: Error {
 
 extension UINavigationController: Identifyable {}
 
-let APPGROUP = "group.com.wireguard.ios.WireGuard"
-let VPNBUNDLE = "com.wireguard.ios.WireGuard.WireGuardNetworkExtension"
+let APPGROUP = "group.com.wireguard.ios"
+let VPNBUNDLE = "com.wireguard.ios.WireGuardNetworkExtension"
 
 class AppCoordinator: RootViewCoordinator {
 

diff --git a/WireGuard/Log.swift b/WireGuard/Log.swift
index 1739155a9503f90d6deb63ac02616ab124c19bbf..06823e8a32986701ff9abb66dde80eadd759918e 100644 (file)
--- a/WireGuard/Log.swift
+++ b/WireGuard/Log.swift
@@ -9,5 +9,5 @@
 import os.log
 
 struct Log {
-    static var general = OSLog(subsystem: "com.wireguard.ios.WireGuard", category: "general")
+    static var general = OSLog(subsystem: "com.wireguard.ios", category: "general")
 }

diff --git a/WireGuard/WireGuard.entitlements b/WireGuard/WireGuard.entitlements
index 001f4781959d0ffaf4faa73d3e4da4baa5ae35bd..a4774c6e06face5180cdaa732cac50a2accee2ae 100644 (file)
--- a/WireGuard/WireGuard.entitlements
+++ b/WireGuard/WireGuard.entitlements
@@ -8,11 +8,11 @@
        </array>
        <key>com.apple.security.application-groups</key>
        <array>
-               <string>group.com.wireguard.ios.WireGuard</string>
+               <string>group.com.wireguard.ios</string>
        </array>
        <key>keychain-access-groups</key>
        <array>
-               <string>$(AppIdentifierPrefix)com.wireguard.ios.WireGuard</string>
+               <string>$(AppIdentifierPrefix)com.wireguard.ios</string>
        </array>
 </dict>
 </plist>

diff --git a/WireGuardNetworkExtension/Log.swift b/WireGuardNetworkExtension/Log.swift
index 8b529ffafc51d826c875ba0e1719d4e3d72cf790..a35f3080ca4bf48a39c5e1d34883e601475808b3 100644 (file)
--- a/WireGuardNetworkExtension/Log.swift
+++ b/WireGuardNetworkExtension/Log.swift
@@ -9,5 +9,5 @@
 import os.log
 
 struct Log {
-    static var general = OSLog(subsystem: "com.wireguard.ios.WireGuard.WireGuardNetworkExtension", category: "general")
+    static var general = OSLog(subsystem: "com.wireguard.ios.WireGuardNetworkExtension", category: "general")
 }

diff --git a/WireGuardNetworkExtension/WireGuardNetworkExtension.entitlements b/WireGuardNetworkExtension/WireGuardNetworkExtension.entitlements
index 9022e8200ece495f7ca6f0082f64dd6b613f511a..a4774c6e06face5180cdaa732cac50a2accee2ae 100644 (file)
--- a/WireGuardNetworkExtension/WireGuardNetworkExtension.entitlements
+++ b/WireGuardNetworkExtension/WireGuardNetworkExtension.entitlements
@@ -8,11 +8,11 @@
        </array>
        <key>com.apple.security.application-groups</key>
        <array>
-               <string>com.wireguard.ios.WireGuard</string>
+               <string>group.com.wireguard.ios</string>
        </array>
        <key>keychain-access-groups</key>
        <array>
-               <string>$(AppIdentifierPrefix)com.wireguard.ios.WireGuard</string>
+               <string>$(AppIdentifierPrefix)com.wireguard.ios</string>
        </array>
 </dict>
 </plist>