Do some code clean up

- Use guard in validators

- Rename URL.openURL() to URL.open()

- Sort imports (SwiftLint)

- Drop unused VPNProtocolType.allTypes

- Drop unused imports

.swiftlint.yml

@@ -5,6 +5,8 @@ included:
 analyzer_rules:
   - unused_declaration
   - unused_import
+opt_in_rules:
+  - sorted_imports
 disabled_rules:
   - cyclomatic_complexity
   - file_length

Passepartout/App/AppDelegate.swift

@@ -24,8 +24,8 @@
 //
 
 import Foundation
-import UIKit
 import PassepartoutLibrary
+import UIKit
 
 class AppDelegate: UIResponder, UIApplicationDelegate, ObservableObject {
     private let mac = MacBundle.shared

Passepartout/App/Constants/Constants+App.swift

@@ -24,8 +24,8 @@
 //
 
 import Foundation
-import UniformTypeIdentifiers
 import SwiftyBeaver
+import UniformTypeIdentifiers
 
 extension Constants {
     enum App {

Passepartout/App/Constants/Theme.swift

@@ -23,9 +23,9 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
-import PassepartoutLibrary
 import LocalAuthentication
+import PassepartoutLibrary
+import SwiftUI
 
 extension View {
     var themeIdiom: UIUserInterfaceIdiom {

Passepartout/App/Context/AppContext.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import Combine
+import Foundation
 import PassepartoutLibrary
 
 @MainActor

Passepartout/App/InApp/LocalProduct.swift

@@ -24,8 +24,8 @@
 //
 
 import Foundation
-import StoreKit
 import PassepartoutLibrary
+import StoreKit
 
 struct LocalProduct: RawRepresentable, Equatable, Hashable {
     private static let bundleSubdomain = "ios"

Passepartout/App/InApp/ProductManager.swift

@@ -23,11 +23,11 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+import Combine
 import Foundation
+import Kvitto
 import PassepartoutLibrary
 import StoreKit
-import Kvitto
-import Combine
 
 enum ProductError: Error {
     case uneligible

Passepartout/App/Intents/IntentsManager.swift

@@ -23,10 +23,10 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+import Combine
 import Foundation
 import Intents
 import IntentsUI
-import Combine
 import PassepartoutLibrary
 
 @MainActor

Passepartout/App/Mac/Models/DefaultLightProfileManager.swift

@@ -23,9 +23,9 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+import Combine
 import Foundation
 import PassepartoutLibrary
-import Combine
 
 class DefaultLightProfile: LightProfile {
     let id: UUID

Passepartout/App/Mac/Models/DefaultLightProviderManager.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import Combine
+import Foundation
 import PassepartoutLibrary
 
 class DefaultLightProviderCategory: LightProviderCategory {

Passepartout/App/Mac/Models/DefaultLightVPNManager.swift

@@ -23,9 +23,9 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+import Combine
 import Foundation
 import PassepartoutLibrary
-import Combine
 
 class DefaultLightVPNManager: LightVPNManager {
     private let vpnManager = VPNManager.shared

Passepartout/App/PassepartoutApp.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 @main
 struct PassepartoutApp: App {

Passepartout/App/Reusable/ActivityView.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import UIKit
 import SwiftUI
+import UIKit
 
 struct ActivityView: UIViewControllerRepresentable {
     let activityItems: [Any]

Passepartout/App/Reusable/IntentAddView.swift

@@ -23,9 +23,9 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import Intents
 import IntentsUI
+import SwiftUI
 
 struct IntentAddView: UIViewControllerRepresentable {
     let shortcut: INShortcut

Passepartout/App/Reusable/IntentEditView.swift

@@ -23,9 +23,9 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import Intents
 import IntentsUI
+import SwiftUI
 
 struct IntentEditView: UIViewControllerRepresentable {
     let shortcut: Shortcut

Passepartout/App/Reusable/MailComposerView.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import MessageUI
+import SwiftUI
 
 struct MailComposerView: UIViewControllerRepresentable {
     class Coordinator: NSObject, MFMailComposeViewControllerDelegate {

Passepartout/App/Reusable/Reviewer.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import UIKit
 import StoreKit
+import UIKit
 
 public class Reviewer: ObservableObject {
     private struct Keys {

Passepartout/App/Reusable/Validators.swift

@@ -61,13 +61,12 @@ struct Validators {
         var sin = sockaddr_in()
         var sin6 = sockaddr_in6()
 
-        if string.withCString({ cstring in inet_pton(AF_INET6, cstring, &sin6.sin6_addr) }) == 1 {
+        guard string.withCString({ cstring in inet_pton(AF_INET6, cstring, &sin6.sin6_addr) }) == 1 else {
-            return
+            throw ValidationError.ipAddress
         }
         if string.withCString({ cstring in inet_pton(AF_INET, cstring, &sin.sin_addr) }) == 1 {
-            return
+            throw ValidationError.ipAddress
         }
-        throw ValidationError.ipAddress
     }
 
     static func domainName(_ string: String) throws {

Passepartout/App/SceneDelegate+Shortcuts.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 enum ShortcutType: String {
     case enableVPN

Passepartout/App/SceneDelegate.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     func sceneDidEnterBackground(_ scene: UIScene) {

Passepartout/App/Views/AboutView.swift

@@ -73,7 +73,7 @@ struct AboutView: View {
     private var supportSection: some View {
         Section {
             Button(L10n.About.Items.JoinCommunity.caption) {
-                URL.openURL(redditURL)
+                URL.open(redditURL)
             }
             Button(L10n.About.Items.ShareTwitter.caption, action: shareOnTwitter)
             Button(L10n.About.Items.WriteReview.caption, action: submitReview)
@@ -85,16 +85,16 @@ struct AboutView: View {
     private var webSection: some View {
         Section {
             Button(L10n.About.Items.Website.caption) {
-                URL.openURL(homeURL)
+                URL.open(homeURL)
             }
             Button(Unlocalized.About.faq) {
-                URL.openURL(faqURL)
+                URL.open(faqURL)
             }
             Button(L10n.About.Items.Disclaimer.caption) {
-                URL.openURL(disclaimerURL)
+                URL.open(disclaimerURL)
             }
             Button(L10n.About.Items.PrivacyPolicy.caption) {
-                URL.openURL(privacyURL)
+                URL.open(privacyURL)
             }
         } header: {
             Text(L10n.About.Sections.Web.header)
@@ -104,10 +104,10 @@ struct AboutView: View {
     private var githubSection: some View {
         Section {
             Button(Unlocalized.About.readme) {
-                URL.openURL(readmeURL)
+                URL.open(readmeURL)
             }
             Button(Unlocalized.About.changelog) {
-                URL.openURL(changelogURL)
+                URL.open(changelogURL)
             }
         } header: {
             Text(Unlocalized.About.github)
@@ -118,11 +118,11 @@ struct AboutView: View {
 extension AboutView {
     private func shareOnTwitter() {
         let url = Unlocalized.Social.twitterIntent(withMessage: shareMessage)
-        URL.openURL(url)
+        URL.open(url)
     }
 
     private func submitReview() {
         let reviewURL = Reviewer.urlForReview(withAppId: Constants.App.appStoreId)
-        URL.openURL(reviewURL)
+        URL.open(reviewURL)
     }
 }

Passepartout/App/Views/AccountView.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 struct AccountView: View {
     @ObservedObject private var providerManager: ProviderManager
@@ -116,7 +116,7 @@ struct AccountView: View {
     }
 
     private func openGuidanceURL(_ url: URL) {
-        URL.openURL(url)
+        URL.open(url)
     }
 }
 

Passepartout/App/Views/AddHostView+Name.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 import TunnelKitOpenVPN
 import TunnelKitWireGuard
 

Passepartout/App/Views/AddProfileMenu.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 struct AddProfileMenu: View {
     enum ModalType: Identifiable {

Passepartout/App/Views/AddProfileView.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 enum AddProfileView {
     struct Bindings {

Passepartout/App/Views/AddProviderView+Name.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 extension AddProviderView {
     struct NameView: View {

Passepartout/App/Views/AddProviderView.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 struct AddProviderView: View {
     @ObservedObject private var providerManager: ProviderManager

Passepartout/App/Views/DebugLogView.swift

@@ -23,9 +23,9 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import Combine
 import PassepartoutLibrary
+import SwiftUI
 
 struct DebugLogView: View {
     private let title: String

Passepartout/App/Views/DiagnosticsView+OpenVPN.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 import TunnelKitOpenVPN
 
 extension DiagnosticsView {
@@ -178,7 +178,7 @@ extension DiagnosticsView.OpenVPNView {
         guard let url = URL.mailto(to: V.recipient, subject: V.subject, body: body) else {
             return
         }
-        guard URL.openURL(url) else {
+        guard URL.open(url) else {
             alertType = .emailNotConfigured
             return
         }

Passepartout/App/Views/DiagnosticsView+WireGuard.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 import TunnelKitWireGuard
 
 extension DiagnosticsView {

Passepartout/App/Views/DiagnosticsView.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 struct DiagnosticsView: View {
     let vpnProtocol: VPNProtocolType

Passepartout/App/Views/DonateView.swift

@@ -23,9 +23,9 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
-import StoreKit
 import PassepartoutLibrary
+import StoreKit
+import SwiftUI
 
 struct DonateView: View {
     enum AlertType: Identifiable {

Passepartout/App/Views/EndpointAdvancedView+OpenVPN.swift

@@ -23,9 +23,9 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+import PassepartoutLibrary
 import SwiftUI
 import TunnelKitOpenVPN
-import PassepartoutLibrary
 
 extension EndpointAdvancedView {
     struct OpenVPNView: View {

Passepartout/App/Views/EndpointView+OpenVPN.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 import TunnelKitOpenVPN
 
 extension EndpointView {

Passepartout/App/Views/EndpointView+WireGuard.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 import TunnelKitWireGuard
 
 extension EndpointView {

Passepartout/App/Views/EndpointView.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 struct EndpointView: View {
     @ObservedObject private var currentProfile: ObservableProfile

Passepartout/App/Views/InteractiveConnectionView.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 struct InteractiveConnectionView: View {
     @Environment(\.presentationMode) private var presentationMode

Passepartout/App/Views/NetworkSettingsView.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 struct NetworkSettingsView: View {
     @ObservedObject private var currentProfile: ObservableProfile

Passepartout/App/Views/OnDemandView+SSID.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 extension OnDemandView {
     struct SSIDList: View {

Passepartout/App/Views/OnDemandView.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 struct OnDemandView: View {
     @ObservedObject private var productManager: ProductManager

Passepartout/App/Views/OrganizerView+ProfileRow.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 extension OrganizerView {
     struct ProfileRow: View {

Passepartout/App/Views/OrganizerView+Profiles.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 extension OrganizerView {
     struct ProfilesList: View {

Passepartout/App/Views/OrganizerView+Scene.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 extension OrganizerView {
     struct SceneView: View {

Passepartout/App/Views/OrganizerView.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 struct OrganizerView: View {
     enum ModalType: Identifiable {
@@ -151,7 +151,7 @@ extension OrganizerView {
                 message: Text(L10n.Organizer.Alerts.Reddit.message),
                 primaryButton: .default(Text(L10n.Organizer.Alerts.Reddit.Buttons.subscribe)) {
                     didHandleSubreddit = true
-                    URL.openURL(redditURL)
+                    URL.open(redditURL)
                 },
                 secondaryButton: .cancel(Text(L10n.Global.Alerts.Buttons.never)) {
                     didHandleSubreddit = true

Passepartout/App/Views/PaywallView+Purchase.swift

@@ -23,9 +23,9 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
-import StoreKit
 import PassepartoutLibrary
+import StoreKit
+import SwiftUI
 
 extension PaywallView {
     struct PurchaseView: View {

Passepartout/App/Views/ProfileView+Configuration.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 extension ProfileView {
     struct ConfigurationSection: View {

Passepartout/App/Views/ProfileView+Diagnostics.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 extension ProfileView {
     struct DiagnosticsSection: View {

Passepartout/App/Views/ProfileView+Extra.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 extension ProfileView {
     struct ExtraSection: View {

Passepartout/App/Views/ProfileView+MainMenu.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 extension ProfileView {
     struct MainMenu: View {

Passepartout/App/Views/ProfileView+Provider.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 extension ProfileView {
     struct ProviderSection: View, ProviderProfileAvailability {

Passepartout/App/Views/ProfileView+Rename.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 extension ProfileView {
     struct RenameView: View {

Passepartout/App/Views/ProfileView+VPN.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 extension ProfileView {
     struct VPNSection: View {

Passepartout/App/Views/ProfileView.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 struct ProfileView: View {
     enum ModalType: Int, Identifiable {

Passepartout/App/Views/ProviderLocationView.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 struct ProviderLocationView: View, ProviderProfileAvailability {
     @ObservedObject var providerManager: ProviderManager

Passepartout/App/Views/ProviderPresetView.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 struct ProviderPresetView: View {
     @Environment(\.presentationMode) private var presentationMode

Passepartout/App/Views/ReportIssueView.swift

@@ -23,9 +23,9 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import MessageUI
 import PassepartoutLibrary
+import SwiftUI
 
 struct ReportIssueView: View {
     @Binding private var isPresented: Bool

Passepartout/App/Views/SettingsButton.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 struct SettingsButton: View {
     @State private var isPresented = false

Passepartout/App/Views/SettingsView.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 struct SettingsView: View {
     @ObservedObject private var profileManager: ProfileManager

Passepartout/App/Views/ShortcutsView+Add.swift

@@ -23,9 +23,9 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import Intents
 import PassepartoutLibrary
+import SwiftUI
 
 extension ShortcutsView {
     struct AddView: View {

Passepartout/App/Views/ShortcutsView.swift

@@ -23,9 +23,9 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import Intents
 import PassepartoutLibrary
+import SwiftUI
 
 struct ShortcutsView: View {
     enum ModalType: Identifiable {

Passepartout/App/Views/VPNStatusText.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 struct VPNStatusText: View {
     @ObservedObject private var currentVPNState: ObservableVPNState

Passepartout/App/Views/VPNToggle.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 
 struct VPNToggle: View {
     @ObservedObject private var profileManager: ProfileManager

Passepartout/App/Views/View+Extensions.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import SwiftUI
 import PassepartoutLibrary
+import SwiftUI
 import SwiftyBeaver
 
 extension View {

Passepartout/AppShared/Context/CoreContext.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import Combine
+import Foundation
 import PassepartoutLibrary
 
 @MainActor

Passepartout/AppShared/L10n/TunnelKit+L10n.swift

@@ -24,11 +24,11 @@
 //
 
 import Foundation
+import NetworkExtension
+import PassepartoutLibrary
 import TunnelKitManager
 import TunnelKitOpenVPN
 import TunnelKitWireGuard
-import NetworkExtension
-import PassepartoutLibrary
 
 extension VPNStatus {
     var localizedDescription: String {

Passepartout/Launcher/AppDelegate.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
     private let appURL = Constants.Launcher.appURL

Passepartout/Mac/Constants/Theme.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 private let bundle = Constants.Mac.bundle
 

Passepartout/Mac/Mac/DefaultMacUtils.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 class DefaultMacUtils: MacUtils {
     private(set) lazy var isStartedByLauncher = NSApp.isHidden

Passepartout/Mac/Menu/HostProfileItem.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 struct HostProfileItem: Item {
     private let viewModel: ViewModel

Passepartout/Mac/Menu/LaunchOnLoginItem+ViewModel.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import Combine
+import Foundation
 import ServiceManagement
 
 extension LaunchOnLoginItem {

Passepartout/Mac/Menu/LaunchOnLoginItem.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 struct LaunchOnLoginItem: Item {
     private let viewModel: ViewModel

Passepartout/Mac/Menu/PassepartoutMenu+StatusButton.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 extension PassepartoutMenu {
 

Passepartout/Mac/Menu/PassepartoutMenu.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 @MainActor
 class PassepartoutMenu {

Passepartout/Mac/Menu/ProfileItemGroup.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 struct ProfileItemGroup: ItemGroup {
     private let profileManager: LightProfileManager

Passepartout/Mac/Menu/ProviderLocationItem.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 struct ProviderLocationItem: Item {
     private let profile: LightProfile

Passepartout/Mac/Menu/ProviderProfileItem.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 struct ProviderProfileItem: Item {
     private let viewModel: ViewModel

Passepartout/Mac/Menu/ProviderServerItem.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 struct ProviderServerItem: Item {
     private let profile: LightProfile

Passepartout/Mac/Menu/VPNItemGroup+ViewModel.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import Combine
+import Foundation
 
 extension VPNItemGroup {
 

Passepartout/Mac/Menu/VPNItemGroup.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 struct VPNItemGroup: ItemGroup {
     private let viewModel: ViewModel

Passepartout/Mac/Menu/VisibilityItem+ViewModel.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 extension VisibilityItem {
 

Passepartout/Mac/Menu/VisibilityItem.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 struct VisibilityItem: Item {
     private let title: String

Passepartout/Mac/Reusable/Item.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 protocol Item: ItemGroup {
     func asMenuItem(withParent parent: NSMenu) -> NSMenuItem

Passepartout/Mac/Reusable/ItemGroup.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 @MainActor
 protocol ItemGroup {

Passepartout/Mac/Reusable/ObservableProcessTransformer.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import Combine
+import Foundation
 
 class ObservableProcessTransformer: ObservableObject {
     static let shared = ObservableProcessTransformer()

Passepartout/Mac/Reusable/SeparatorItem.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 struct SeparatorItem: Item {
     func asMenuItem(withParent parent: NSMenu) -> NSMenuItem {

Passepartout/Mac/Reusable/StaticSystemMenu.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 struct StaticSystemMenu: SystemMenu {
     let children: [ItemGroup]

Passepartout/Mac/Reusable/SystemMenu.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 @MainActor
 protocol SystemMenu {

Passepartout/Mac/Reusable/TextItem+ViewModel.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import Combine
+import Foundation
 
 extension TextItem {
     class ViewModel {

Passepartout/Mac/Reusable/TextItem.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import AppKit
+import Foundation
 
 struct TextItem: Item {
     enum State {

PassepartoutLibrary/Sources/PassepartoutCore/Models/Profile+NetworkSettings.swift

@@ -24,7 +24,6 @@
 //
 
 import Foundation
-import TunnelKit
 
 extension Profile {
     public struct NetworkSettings: Codable, Equatable {

PassepartoutLibrary/Sources/PassepartoutCore/Models/VPNProtocolType.swift

@@ -25,7 +25,7 @@
 
 import Foundation
 
-public enum VPNProtocolType: String, Codable {
+public enum VPNProtocolType: String, CaseIterable, Codable {
     case openVPN = "ovpn"
 
     case wireGuard = "wg"

PassepartoutLibrary/Sources/PassepartoutLibrary/Exports.swift

@@ -1,8 +1,8 @@
-@_exported import PassepartoutVPN
+@_exported import PassepartoutCore
 @_exported import PassepartoutProfiles
 @_exported import PassepartoutProviders
 @_exported import PassepartoutServices
 @_exported import PassepartoutUtils
-@_exported import PassepartoutCore
+@_exported import PassepartoutVPN
 @_exported import TunnelKit
 @_exported import TunnelKitCore

PassepartoutLibrary/Sources/PassepartoutLibrary/Managers/UpgradeManager+Migrations.swift

@@ -25,11 +25,11 @@
 
 import Foundation
 import GenericJSON
-import TunnelKitCore
-import TunnelKitOpenVPNCore
-import TunnelKitManager
 import PassepartoutCore
 import PassepartoutUtils
+import TunnelKitCore
+import TunnelKitManager
+import TunnelKitOpenVPNCore
 
 private typealias Map = [String: Any]
 

PassepartoutLibrary/Sources/PassepartoutLibrary/Managers/UpgradeManager.swift

@@ -23,11 +23,11 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import CoreData
-import SwiftyBeaver
+import Foundation
 import PassepartoutCore
 import PassepartoutUtils
+import SwiftyBeaver
 
 @MainActor
 public final class UpgradeManager: ObservableObject {

PassepartoutLibrary/Sources/PassepartoutProfiles/DataModels/CDProfile+CoreDataClass.swift

@@ -7,8 +7,8 @@
 //  This file was automatically generated and should not be edited.
 //
 
-import Foundation
 import CoreData
+import Foundation
 
 @objc(CDProfile)
 public class CDProfile: NSManagedObject {

PassepartoutLibrary/Sources/PassepartoutProfiles/DataModels/CDProfile+CoreDataProperties.swift

@@ -7,8 +7,8 @@
 //  This file was automatically generated and should not be edited.
 //
 
-import Foundation
 import CoreData
+import Foundation
 
 extension CDProfile {
 

PassepartoutLibrary/Sources/PassepartoutProfiles/Extensions/OpenVPNSettings+Network.swift

@@ -24,9 +24,9 @@
 //
 
 import Foundation
+import PassepartoutCore
 import TunnelKitCore
 import TunnelKitOpenVPN
-import PassepartoutCore
 
 extension Profile.OpenVPNSettings: GatewaySettingsProviding {
 

PassepartoutLibrary/Sources/PassepartoutProfiles/Extensions/PassepartoutDataModels+Profiles.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import CoreData
+import Foundation
 import PassepartoutCore
 
 extension PassepartoutDataModels {

PassepartoutLibrary/Sources/PassepartoutProfiles/Extensions/PassepartoutProviders+TunnelKit.swift

@@ -23,12 +23,12 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import Combine
-import TunnelKitOpenVPN
+import Foundation
-import TunnelKitWireGuard
 import PassepartoutCore
 import PassepartoutUtils
+import TunnelKitOpenVPN
+import TunnelKitWireGuard
 
 extension ProviderServer.Preset {
     public var openVPNConfiguration: OpenVPN.Configuration? {

PassepartoutLibrary/Sources/PassepartoutProfiles/Extensions/ProviderManager+Extensions.swift

@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import Foundation
 import Combine
+import Foundation
 import PassepartoutCore
 import PassepartoutProviders