From 4bd1ea63c692ac216cd146488ba3a0ff42e5d3af Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 4 Nov 2018 04:16:13 +0100 Subject: XCode: use old network extension ID Signed-off-by: Jason A. Donenfeld --- WireGuard/WireGuard.xcodeproj/project.pbxproj | 4 ++-- WireGuard/WireGuard/Config/Version.xcconfig | 2 +- WireGuard/WireGuard/VPN/TunnelsManager.swift | 2 +- WireGuard/WireGuardNetworkExtension/Log.swift | 9 --------- 4 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 WireGuard/WireGuardNetworkExtension/Log.swift diff --git a/WireGuard/WireGuard.xcodeproj/project.pbxproj b/WireGuard/WireGuard.xcodeproj/project.pbxproj index 99d65ac..69a1383 100644 --- 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 3e53688..a9da30d 100644 --- 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 2ea3377..f2d02d4 100644 --- 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 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") -} -- cgit v1.2.3-59-g8ed1b