WireGuardApp: Remove backend version call in Logger.swift & extract wireguard-go...

Signed-off-by: Andrej Mihajlov <and@mullvad.net>

diff --git a/Sources/Shared/Logging/Logger.swift b/Sources/Shared/Logging/Logger.swift
index 6be2bfd5e82f2a583008fb8b6d7716162197ff3f..cfab82d99dd8238bfcf7ce494eae6a718ca8ab21 100644 (file)
--- a/Sources/Shared/Logging/Logger.swift
+++ b/Sources/Shared/Logging/Logger.swift
@@ -49,7 +49,8 @@ public class Logger {
         if let appBuild = Bundle.main.infoDictionary?["CFBundleVersion"] as? String {
             appVersion += " (\(appBuild))"
         }
-        Logger.global?.log(message: "App version: \(appVersion); Go backend version: \(WIREGUARD_GO_VERSION)")
+
+        Logger.global?.log(message: "App version: \(appVersion)")
     }
 }
 

diff --git a/Sources/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h b/Sources/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h
index 3bf09562db4c60ed1f63e1f6dc3a91b937158fc5..e6051cec94cfb6acdcc53eb3032091cfb6b5d45e 100644 (file)
--- a/Sources/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h
+++ b/Sources/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h
@@ -1,4 +1,3 @@
 #include "../WireGuardKitC/WireGuardKitC.h"
 #include "../WireGuardKitGo/wireguard.h"
-#include "wireguard-go-version.h"
 #include "ringlogger.h"

diff --git a/WireGuard.xcodeproj/project.pbxproj b/WireGuard.xcodeproj/project.pbxproj
index 6df4021106fd26db112cc18f3d2545b79b1af685..7373520ad1695f0cfc08f7b9690db8738ff41706 100644 (file)
--- a/WireGuard.xcodeproj/project.pbxproj
+++ b/WireGuard.xcodeproj/project.pbxproj
@@ -839,7 +839,6 @@
                        buildConfigurationList = 6F5D0C25218352EF000F85AD /* Build configuration list for PBXNativeTarget "WireGuardNetworkExtensioniOS" */;
                        buildPhases = (
                                5F45417B21C0906F00994C13 /* Swiftlint */,
-                               58BA78EC2577FBDB006FAEA0 /* Extract wireguard-go Version */,
                                6F5D0C16218352EF000F85AD /* Sources */,
                                6F5D0C17218352EF000F85AD /* Frameworks */,
                                6F5D0C18218352EF000F85AD /* Resources */,
@@ -902,7 +901,6 @@
                        buildConfigurationList = 6FB1BD9C21D4BFE700A991BF /* Build configuration list for PBXNativeTarget "WireGuardNetworkExtensionmacOS" */;
                        buildPhases = (
                                6FB1BDB421D4F5CF00A991BF /* Swiftlint */,
-                               58BA78ED2577FBF4006FAEA0 /* Extract wireguard-go Version */,
                                6FB1BD8D21D4BFE600A991BF /* Sources */,
                                6FB1BD8E21D4BFE600A991BF /* Frameworks */,
                                6FB1BD8F21D4BFE600A991BF /* Resources */,
@@ -1116,42 +1114,6 @@
                        shellPath = /bin/sh;
                        shellScript = "exec make -C \"$PROJECT_DIR/Sources/WireGuardKitGo\" version-header\n";
                };
-               58BA78EC2577FBDB006FAEA0 /* Extract wireguard-go Version */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       inputFileListPaths = (
-                       );
-                       inputPaths = (
-                       );
-                       name = "Extract wireguard-go Version";
-                       outputFileListPaths = (
-                       );
-                       outputPaths = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-                       shellPath = /bin/sh;
-                       shellScript = "exec make -C \"$PROJECT_DIR/Sources/WireGuardKitGo\" version-header\n";
-               };
-               58BA78ED2577FBF4006FAEA0 /* Extract wireguard-go Version */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       inputFileListPaths = (
-                       );
-                       inputPaths = (
-                       );
-                       name = "Extract wireguard-go Version";
-                       outputFileListPaths = (
-                       );
-                       outputPaths = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-                       shellPath = /bin/sh;
-                       shellScript = "exec make -C \"$PROJECT_DIR/Sources/WireGuardKitGo\" version-header\n";
-               };
                5F45417A21C0902400994C13 /* Swiftlint */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;