XCode: use old network extension ID

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

diff --git a/WireGuard/WireGuard.xcodeproj/project.pbxproj b/WireGuard/WireGuard.xcodeproj/project.pbxproj
index 99d65aca6076e098dddadcc0cb49f7c5bc000394..69a13836df22f4d2aa5fddb6358bf732a779e77e 100644 (file)
--- a/WireGuard/WireGuard.xcodeproj/project.pbxproj
+++ b/WireGuard/WireGuard.xcodeproj/project.pbxproj
@@ -564,7 +564,7 @@
                                );
                                MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
                                MTL_FAST_MATH = YES;
-                               PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID).WireGuardNetworkExtension";
+                               PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID).network-extension";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = YES;
                                SWIFT_OBJC_BRIDGING_HEADER = "WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
@@ -586,7 +586,7 @@
                                        "@executable_path/../../Frameworks",
                                );
                                MTL_FAST_MATH = YES;
-                               PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID).WireGuardNetworkExtension";
+                               PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID).network-extension";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = YES;
                                SWIFT_OBJC_BRIDGING_HEADER = "WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";

diff --git a/WireGuard/WireGuard/Config/Version.xcconfig b/WireGuard/WireGuard/Config/Version.xcconfig
index 3e53688d527fe5f8af696aa27411a1b854e3b045..a9da30d51bc6bf37505aed9aa8885a4e8e25c79f 100644 (file)
--- a/WireGuard/WireGuard/Config/Version.xcconfig
+++ b/WireGuard/WireGuard/Config/Version.xcconfig
@@ -1,2 +1,2 @@
-VERSION_NAME = 0.0.20181103
+VERSION_NAME = 0.0.20181104
 VERSION_ID = 1

diff --git a/WireGuard/WireGuard/VPN/TunnelsManager.swift b/WireGuard/WireGuard/VPN/TunnelsManager.swift
index 2ea33771aa1272b2840e4bfa3ea02fa4ead56154..f2d02d4ddfd8d82faaa66ae9878b12e422865835 100644 (file)
--- a/WireGuard/WireGuard/VPN/TunnelsManager.swift
+++ b/WireGuard/WireGuard/VPN/TunnelsManager.swift
@@ -216,7 +216,7 @@ extension NETunnelProviderProtocol {
         let appId = Bundle.main.bundleIdentifier!
         let firstValidEndpoint = tunnelConfiguration.peers.first(where: { $0.endpoint != nil })?.endpoint
 
-        providerBundleIdentifier = "\(appId).WireGuardNetworkExtension"
+        providerBundleIdentifier = "\(appId).network-extension"
         providerConfiguration = [
             "tunnelConfiguration": serializedTunnelConfiguration,
             "tunnelConfigurationVersion": 1

diff --git a/WireGuard/WireGuardNetworkExtension/Log.swift b/WireGuard/WireGuardNetworkExtension/Log.swift
deleted file mode 100644 (file)
index 54162b5..0000000
--- a/WireGuard/WireGuardNetworkExtension/Log.swift
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-//  Copyright © 2018 WireGuard LLC. All Rights Reserved.
-//
-
-import os.log
-
-struct Log {
-    static var general = OSLog(subsystem: "com.wireguard.ios.network-extension", category: "general")
-}