WireGuardKit: Change getWireGuardVersion() -> wireGuardVersion

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

diff --git a/WireGuard/Shared/Logging/Logger.swift b/WireGuard/Shared/Logging/Logger.swift
index eb144dc633acc12c1d0509983f5306131ed3b24d..f80be3c6f00708e9f6460977bf5f15db5dff2256 100644 (file)
--- a/WireGuard/Shared/Logging/Logger.swift
+++ b/WireGuard/Shared/Logging/Logger.swift
@@ -50,8 +50,7 @@ public class Logger {
         if let appBuild = Bundle.main.infoDictionary?["CFBundleVersion"] as? String {
             appVersion += " (\(appBuild))"
         }
-        let goBackendVersion = getWireGuardVersion()
-        Logger.global?.log(message: "App version: \(appVersion); Go backend version: \(goBackendVersion)")
+        Logger.global?.log(message: "App version: \(appVersion); Go backend version: \(wireGuardVersion)")
     }
 }
 

diff --git a/WireGuard/WireGuard/UI/macOS/AppDelegate.swift b/WireGuard/WireGuard/UI/macOS/AppDelegate.swift
index 39a9469fb4d4baaf2c762426009888cb043de3aa..6e3783a999b6c957117f0bb5de6bfed8f3a0b641 100644 (file)
--- a/WireGuard/WireGuard/UI/macOS/AppDelegate.swift
+++ b/WireGuard/WireGuard/UI/macOS/AppDelegate.swift
@@ -209,7 +209,7 @@ extension AppDelegate {
         }
         let appVersionString = [
             tr(format: "macAppVersion (%@)", appVersion),
-            tr(format: "macGoBackendVersion (%@)", getWireGuardVersion())
+            tr(format: "macGoBackendVersion (%@)", wireGuardVersion)
         ].joined(separator: "\n")
         let donateString = NSMutableAttributedString(string: tr("donateLink"))
         donateString.addAttribute(.link, value: "https://www.wireguard.com/donations/", range: NSRange(location: 0, length: donateString.length))

diff --git a/WireGuardKit/Sources/WireGuardKit/WireGuardAdapter.swift b/WireGuardKit/Sources/WireGuardKit/WireGuardAdapter.swift
index ef7214d58215cebf49e05f492d7f2123500863d9..505b62f8469ebee95e6c8d84d23b752a42e3df14 100644 (file)
--- a/WireGuardKit/Sources/WireGuardKit/WireGuardAdapter.swift
+++ b/WireGuardKit/Sources/WireGuardKit/WireGuardAdapter.swift
@@ -55,7 +55,7 @@ public class WireGuardAdapter {
         return self.packetTunnelProvider?.packetFlow.value(forKeyPath: "socket.fileDescriptor") as? Int32
     }
 
-    /// Returns a Wireguard version.
+    /// Returns a WireGuard version.
     class var version: String {
         return String(cString: wgVersion())
     }

diff --git a/WireGuardKit/Sources/WireGuardKit/WireGuardKit.swift b/WireGuardKit/Sources/WireGuardKit/WireGuardKit.swift
index 7e5b2c93346090c9e0722a905b11a69aaaebee72..64ad1927700a22e71a271c027202b058777f3ef0 100644 (file)
--- a/WireGuardKit/Sources/WireGuardKit/WireGuardKit.swift
+++ b/WireGuardKit/Sources/WireGuardKit/WireGuardKit.swift
@@ -3,6 +3,6 @@
 
 import Foundation
 
-public func getWireGuardVersion() -> String {
+public var wireGuardVersion: String {
     return WireGuardAdapter.version
 }