Move model helpers to model directory

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

diff --git a/WireGuard/Shared/LegacyConfigMigration.swift b/WireGuard/Shared/Model/LegacyConfigMigration.swift
similarity index 100%
rename from WireGuard/Shared/LegacyConfigMigration.swift
rename to WireGuard/Shared/Model/LegacyConfigMigration.swift

diff --git a/WireGuard/Shared/NETunnelProviderProtocol+Extension.swift b/WireGuard/Shared/Model/NETunnelProviderProtocol+Extension.swift
similarity index 97%
rename from WireGuard/Shared/NETunnelProviderProtocol+Extension.swift
rename to WireGuard/Shared/Model/NETunnelProviderProtocol+Extension.swift
index 258c96816a6fa2d41a06139587668b64d01feeaa..98634fd2b3fb4684c667bca94598dd6434e2e165 100644 (file)
--- a/WireGuard/Shared/NETunnelProviderProtocol+Extension.swift
+++ b/WireGuard/Shared/Model/NETunnelProviderProtocol+Extension.swift
@@ -3,8 +3,6 @@
 
 import NetworkExtension
 
-private var tunnelNameKey: Void?
-
 extension NETunnelProviderProtocol {
 
     enum Keys: String {

diff --git a/WireGuard/Shared/String+ArrayConversion.swift b/WireGuard/Shared/Model/String+ArrayConversion.swift
similarity index 100%
rename from WireGuard/Shared/String+ArrayConversion.swift
rename to WireGuard/Shared/Model/String+ArrayConversion.swift

diff --git a/WireGuard/Shared/TunnelConfiguration+WgQuickConfig.swift b/WireGuard/Shared/Model/TunnelConfiguration+WgQuickConfig.swift
similarity index 100%
rename from WireGuard/Shared/TunnelConfiguration+WgQuickConfig.swift
rename to WireGuard/Shared/Model/TunnelConfiguration+WgQuickConfig.swift

diff --git a/WireGuard/WireGuard.xcodeproj/project.pbxproj b/WireGuard/WireGuard.xcodeproj/project.pbxproj
index cd04c0683c3efe4b173d8598173f8e982a49deaf..7bdc5e872c688da6ee7f7326f104451f821b3c6d 100644 (file)
--- a/WireGuard/WireGuard.xcodeproj/project.pbxproj
+++ b/WireGuard/WireGuard.xcodeproj/project.pbxproj
@@ -255,11 +255,7 @@
                        children = (
                                6FF3526A21C23F720008484E /* Logging */,
                                6F7774E6217201E0006A79B3 /* Model */,
-                               6FFA5D942194454A0001E2F7 /* NETunnelProviderProtocol+Extension.swift */,
                                6F5A2B4421AFDE020081EDD8 /* FileManager+Extension.swift */,
-                               5F9696A921CD6AE6008063FE /* LegacyConfigMigration.swift */,
-                               5F4541B121CBFAEE00994C13 /* String+ArrayConversion.swift */,
-                               5F9696AF21CD7128008063FE /* TunnelConfiguration+WgQuickConfig.swift */,
                        );
                        path = Shared;
                        sourceTree = "<group>";
@@ -298,6 +294,10 @@
                6F7774E6217201E0006A79B3 /* Model */ = {
                        isa = PBXGroup;
                        children = (
+                               5F9696AF21CD7128008063FE /* TunnelConfiguration+WgQuickConfig.swift */,
+                               6FFA5D942194454A0001E2F7 /* NETunnelProviderProtocol+Extension.swift */,
+                               5F4541B121CBFAEE00994C13 /* String+ArrayConversion.swift */,
+                               5F9696A921CD6AE6008063FE /* LegacyConfigMigration.swift */,
                                6F7774E72172020C006A79B3 /* TunnelConfiguration.swift */,
                                6F7774E9217229DB006A79B3 /* IPAddressRange.swift */,
                                6F693A552179E556008551C1 /* Endpoint.swift */,