diff --git a/TunnelKit.xcodeproj/project.pbxproj b/TunnelKit.xcodeproj/project.pbxproj index dc1ff18..79ad083 100644 --- a/TunnelKit.xcodeproj/project.pbxproj +++ b/TunnelKit.xcodeproj/project.pbxproj @@ -432,7 +432,7 @@ 0E6479E0212EACD6008E6888 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 0E749F612178911C00BB2701 /* pia-2048.pem */ = {isa = PBXFileReference; lastKnownFileType = text; path = "pia-2048.pem"; sourceTree = ""; }; 0E7F3F69246ABA0F006BE77F /* IPHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPHeader.swift; sourceTree = ""; }; - 0E85A25B202CCA3D0059E9F9 /* TunnelKitHost.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = TunnelKitHost.entitlements; sourceTree = ""; }; + 0E85A25B202CCA3D0059E9F9 /* Host.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Host.entitlements; sourceTree = ""; }; 0EA82A232190B220007960EB /* TunnelKitTests-macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "TunnelKitTests-macOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 0EAC57312494277A00D0FCE0 /* OpenVPNProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenVPNProvider.swift; sourceTree = ""; }; 0EAC57322494277A00D0FCE0 /* MockVPNProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockVPNProvider.swift; sourceTree = ""; }; @@ -560,7 +560,7 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0E11089B1F77B9E800A92462 /* TunnelKitTests */ = { + 0E11089B1F77B9E800A92462 /* Tests */ = { isa = PBXGroup; children = ( 0E23B3D52297451700304C30 /* OpenVPN */, @@ -576,13 +576,13 @@ 0ECEB1132252C8E900E9E551 /* tunnelbear.enc.8.ovpn */, 0E3B65712249247E00EFF4DA /* tunnelbear.key */, ); - path = TunnelKitTests; + path = Tests; sourceTree = ""; }; - 0E1108AA1F77B9F900A92462 /* TunnelKitHost */ = { + 0E1108AA1F77B9F900A92462 /* Host */ = { isa = PBXGroup; children = ( - 0E85A25B202CCA3D0059E9F9 /* TunnelKitHost.entitlements */, + 0E85A25B202CCA3D0059E9F9 /* Host.entitlements */, 0E1108AB1F77B9F900A92462 /* AppDelegate.swift */, 0E1108AD1F77B9F900A92462 /* ViewController.swift */, 0E1108AF1F77B9F900A92462 /* Main.storyboard */, @@ -590,15 +590,13 @@ 0E1108B41F77B9F900A92462 /* LaunchScreen.storyboard */, 0E1108B71F77B9F900A92462 /* Info.plist */, ); - path = TunnelKitHost; + path = Host; sourceTree = ""; }; 0E17D7EF1F730D9F009EE129 = { isa = PBXGroup; children = ( 0E17D7FB1F730D9F009EE129 /* TunnelKit */, - 0E11089B1F77B9E800A92462 /* TunnelKitTests */, - 0E1108AA1F77B9F900A92462 /* TunnelKitHost */, 0E17D7FA1F730D9F009EE129 /* Products */, 4A8A97836BAB183DA0A91902 /* Pods */, 1B27D1F0B446D5907FAF40E1 /* Frameworks */, @@ -621,7 +619,9 @@ isa = PBXGroup; children = ( 0E6479E0212EACD6008E6888 /* Info.plist */, + 0E1108AA1F77B9F900A92462 /* Host */, 0E17D8041F730DDD009EE129 /* Sources */, + 0E11089B1F77B9E800A92462 /* Tests */, ); path = TunnelKit; sourceTree = ""; @@ -1654,7 +1654,7 @@ baseConfigurationReference = 3DE692CD2FA087ED390CB9C6 /* Pods-TunnelKit-TunnelKitTests-iOS.debug.xcconfig */; buildSettings = { DEVELOPMENT_TEAM = DTDYD63ZX9; - INFOPLIST_FILE = TunnelKitTests/Info.plist; + INFOPLIST_FILE = TunnelKit/Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1668,7 +1668,7 @@ baseConfigurationReference = 82499AC779944BE0D1CA651C /* Pods-TunnelKit-TunnelKitTests-iOS.release.xcconfig */; buildSettings = { DEVELOPMENT_TEAM = DTDYD63ZX9; - INFOPLIST_FILE = TunnelKitTests/Info.plist; + INFOPLIST_FILE = TunnelKit/Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1682,10 +1682,10 @@ baseConfigurationReference = 358F3D1B9B9A8FEE29E522F6 /* Pods-TunnelKit-TunnelKitHost.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = TunnelKitHost/TunnelKitHost.entitlements; + CODE_SIGN_ENTITLEMENTS = TunnelKit/Host/Host.entitlements; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = DTDYD63ZX9; - INFOPLIST_FILE = TunnelKitHost/Info.plist; + INFOPLIST_FILE = TunnelKit/Host/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.ios.TunnelKitHost; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1699,10 +1699,10 @@ baseConfigurationReference = CED3394EFA1921EA509733F9 /* Pods-TunnelKit-TunnelKitHost.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = TunnelKitHost/TunnelKitHost.entitlements; + CODE_SIGN_ENTITLEMENTS = TunnelKit/Host/Host.entitlements; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = DTDYD63ZX9; - INFOPLIST_FILE = TunnelKitHost/Info.plist; + INFOPLIST_FILE = TunnelKit/Host/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.ios.TunnelKitHost; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1941,7 +1941,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = DTDYD63ZX9; - INFOPLIST_FILE = TunnelKitTests/Info.plist; + INFOPLIST_FILE = TunnelKit/Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -1961,7 +1961,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = DTDYD63ZX9; - INFOPLIST_FILE = TunnelKitTests/Info.plist; + INFOPLIST_FILE = TunnelKit/Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MTL_FAST_MATH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/TunnelKitHost/AppDelegate.swift b/TunnelKit/Host/AppDelegate.swift similarity index 100% rename from TunnelKitHost/AppDelegate.swift rename to TunnelKit/Host/AppDelegate.swift diff --git a/TunnelKitHost/Assets.xcassets/AppIcon.appiconset/Contents.json b/TunnelKit/Host/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from TunnelKitHost/Assets.xcassets/AppIcon.appiconset/Contents.json rename to TunnelKit/Host/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/TunnelKitHost/Base.lproj/LaunchScreen.storyboard b/TunnelKit/Host/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from TunnelKitHost/Base.lproj/LaunchScreen.storyboard rename to TunnelKit/Host/Base.lproj/LaunchScreen.storyboard diff --git a/TunnelKitHost/Base.lproj/Main.storyboard b/TunnelKit/Host/Base.lproj/Main.storyboard similarity index 100% rename from TunnelKitHost/Base.lproj/Main.storyboard rename to TunnelKit/Host/Base.lproj/Main.storyboard diff --git a/TunnelKitHost/TunnelKitHost.entitlements b/TunnelKit/Host/Host.entitlements similarity index 100% rename from TunnelKitHost/TunnelKitHost.entitlements rename to TunnelKit/Host/Host.entitlements diff --git a/TunnelKitHost/Info.plist b/TunnelKit/Host/Info.plist similarity index 100% rename from TunnelKitHost/Info.plist rename to TunnelKit/Host/Info.plist diff --git a/TunnelKitHost/ViewController.swift b/TunnelKit/Host/ViewController.swift similarity index 100% rename from TunnelKitHost/ViewController.swift rename to TunnelKit/Host/ViewController.swift diff --git a/TunnelKitTests/Core/DNSTests.swift b/TunnelKit/Tests/Core/DNSTests.swift similarity index 100% rename from TunnelKitTests/Core/DNSTests.swift rename to TunnelKit/Tests/Core/DNSTests.swift diff --git a/TunnelKitTests/Core/DataManipulationTests.swift b/TunnelKit/Tests/Core/DataManipulationTests.swift similarity index 100% rename from TunnelKitTests/Core/DataManipulationTests.swift rename to TunnelKit/Tests/Core/DataManipulationTests.swift diff --git a/TunnelKitTests/Core/RandomTests.swift b/TunnelKit/Tests/Core/RandomTests.swift similarity index 100% rename from TunnelKitTests/Core/RandomTests.swift rename to TunnelKit/Tests/Core/RandomTests.swift diff --git a/TunnelKitTests/Core/RawPerformanceTests.swift b/TunnelKit/Tests/Core/RawPerformanceTests.swift similarity index 100% rename from TunnelKitTests/Core/RawPerformanceTests.swift rename to TunnelKit/Tests/Core/RawPerformanceTests.swift diff --git a/TunnelKitTests/Core/RoutingTests.swift b/TunnelKit/Tests/Core/RoutingTests.swift similarity index 100% rename from TunnelKitTests/Core/RoutingTests.swift rename to TunnelKit/Tests/Core/RoutingTests.swift diff --git a/TunnelKitTests/Core/TestUtils+Core.swift b/TunnelKit/Tests/Core/TestUtils+Core.swift similarity index 100% rename from TunnelKitTests/Core/TestUtils+Core.swift rename to TunnelKit/Tests/Core/TestUtils+Core.swift diff --git a/TunnelKitTests/Info.plist b/TunnelKit/Tests/Info.plist similarity index 100% rename from TunnelKitTests/Info.plist rename to TunnelKit/Tests/Info.plist diff --git a/TunnelKitTests/LZO/CompressionTests.swift b/TunnelKit/Tests/LZO/CompressionTests.swift similarity index 100% rename from TunnelKitTests/LZO/CompressionTests.swift rename to TunnelKit/Tests/LZO/CompressionTests.swift diff --git a/TunnelKitTests/OpenVPN/AppExtensionTests.swift b/TunnelKit/Tests/OpenVPN/AppExtensionTests.swift similarity index 100% rename from TunnelKitTests/OpenVPN/AppExtensionTests.swift rename to TunnelKit/Tests/OpenVPN/AppExtensionTests.swift diff --git a/TunnelKitTests/OpenVPN/ConfigurationParserTests.swift b/TunnelKit/Tests/OpenVPN/ConfigurationParserTests.swift similarity index 100% rename from TunnelKitTests/OpenVPN/ConfigurationParserTests.swift rename to TunnelKit/Tests/OpenVPN/ConfigurationParserTests.swift diff --git a/TunnelKitTests/OpenVPN/ControlChannelTests.swift b/TunnelKit/Tests/OpenVPN/ControlChannelTests.swift similarity index 100% rename from TunnelKitTests/OpenVPN/ControlChannelTests.swift rename to TunnelKit/Tests/OpenVPN/ControlChannelTests.swift diff --git a/TunnelKitTests/OpenVPN/DataPathEncryptionTests.swift b/TunnelKit/Tests/OpenVPN/DataPathEncryptionTests.swift similarity index 100% rename from TunnelKitTests/OpenVPN/DataPathEncryptionTests.swift rename to TunnelKit/Tests/OpenVPN/DataPathEncryptionTests.swift diff --git a/TunnelKitTests/OpenVPN/DataPathPerformanceTests.swift b/TunnelKit/Tests/OpenVPN/DataPathPerformanceTests.swift similarity index 100% rename from TunnelKitTests/OpenVPN/DataPathPerformanceTests.swift rename to TunnelKit/Tests/OpenVPN/DataPathPerformanceTests.swift diff --git a/TunnelKitTests/OpenVPN/EncryptionPerformanceTests.swift b/TunnelKit/Tests/OpenVPN/EncryptionPerformanceTests.swift similarity index 100% rename from TunnelKitTests/OpenVPN/EncryptionPerformanceTests.swift rename to TunnelKit/Tests/OpenVPN/EncryptionPerformanceTests.swift diff --git a/TunnelKitTests/OpenVPN/EncryptionTests.swift b/TunnelKit/Tests/OpenVPN/EncryptionTests.swift similarity index 100% rename from TunnelKitTests/OpenVPN/EncryptionTests.swift rename to TunnelKit/Tests/OpenVPN/EncryptionTests.swift diff --git a/TunnelKitTests/OpenVPN/LinkTests.swift b/TunnelKit/Tests/OpenVPN/LinkTests.swift similarity index 100% rename from TunnelKitTests/OpenVPN/LinkTests.swift rename to TunnelKit/Tests/OpenVPN/LinkTests.swift diff --git a/TunnelKitTests/OpenVPN/PacketTests.swift b/TunnelKit/Tests/OpenVPN/PacketTests.swift similarity index 100% rename from TunnelKitTests/OpenVPN/PacketTests.swift rename to TunnelKit/Tests/OpenVPN/PacketTests.swift diff --git a/TunnelKitTests/OpenVPN/PushTests.swift b/TunnelKit/Tests/OpenVPN/PushTests.swift similarity index 100% rename from TunnelKitTests/OpenVPN/PushTests.swift rename to TunnelKit/Tests/OpenVPN/PushTests.swift diff --git a/TunnelKitTests/OpenVPN/StaticKeyTests.swift b/TunnelKit/Tests/OpenVPN/StaticKeyTests.swift similarity index 100% rename from TunnelKitTests/OpenVPN/StaticKeyTests.swift rename to TunnelKit/Tests/OpenVPN/StaticKeyTests.swift diff --git a/TunnelKitTests/OpenVPN/TestUtils+OpenVPN.swift b/TunnelKit/Tests/OpenVPN/TestUtils+OpenVPN.swift similarity index 100% rename from TunnelKitTests/OpenVPN/TestUtils+OpenVPN.swift rename to TunnelKit/Tests/OpenVPN/TestUtils+OpenVPN.swift diff --git a/TunnelKitTests/pia-2048.pem b/TunnelKit/Tests/pia-2048.pem similarity index 100% rename from TunnelKitTests/pia-2048.pem rename to TunnelKit/Tests/pia-2048.pem diff --git a/TunnelKitTests/pia-hungary.ovpn b/TunnelKit/Tests/pia-hungary.ovpn similarity index 100% rename from TunnelKitTests/pia-hungary.ovpn rename to TunnelKit/Tests/pia-hungary.ovpn diff --git a/TunnelKitTests/tunnelbear.crt b/TunnelKit/Tests/tunnelbear.crt similarity index 100% rename from TunnelKitTests/tunnelbear.crt rename to TunnelKit/Tests/tunnelbear.crt diff --git a/TunnelKitTests/tunnelbear.enc.1.key b/TunnelKit/Tests/tunnelbear.enc.1.key similarity index 100% rename from TunnelKitTests/tunnelbear.enc.1.key rename to TunnelKit/Tests/tunnelbear.enc.1.key diff --git a/TunnelKitTests/tunnelbear.enc.1.ovpn b/TunnelKit/Tests/tunnelbear.enc.1.ovpn similarity index 100% rename from TunnelKitTests/tunnelbear.enc.1.ovpn rename to TunnelKit/Tests/tunnelbear.enc.1.ovpn diff --git a/TunnelKitTests/tunnelbear.enc.8.key b/TunnelKit/Tests/tunnelbear.enc.8.key similarity index 100% rename from TunnelKitTests/tunnelbear.enc.8.key rename to TunnelKit/Tests/tunnelbear.enc.8.key diff --git a/TunnelKitTests/tunnelbear.enc.8.ovpn b/TunnelKit/Tests/tunnelbear.enc.8.ovpn similarity index 100% rename from TunnelKitTests/tunnelbear.enc.8.ovpn rename to TunnelKit/Tests/tunnelbear.enc.8.ovpn diff --git a/TunnelKitTests/tunnelbear.key b/TunnelKit/Tests/tunnelbear.key similarity index 100% rename from TunnelKitTests/tunnelbear.key rename to TunnelKit/Tests/tunnelbear.key