passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge AppLibrary into CommonLibrary (#806) 

CommonLibrary barely used as standalone, almost always together with
AppLibrary.
This commit is contained in:
Davide 2024-11-03 13:16:13 +01:00 committed by GitHub
parent 1d2de39d49
commit 2790a2aac2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
87 changed files with 263 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/AppLibraryTests.xcscheme
View File

@ -1,53 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1540"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AppLibraryTests"
BuildableName = "AppLibraryTests"
BlueprintName = "AppLibraryTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

37
Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/AppUITests.xcscheme → Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/CommonLibrary.xcscheme
View File

@ -6,6 +6,22 @@
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "CommonLibrary"
BuildableName = "CommonLibrary"
BlueprintName = "CommonLibrary"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
@ -13,18 +29,6 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AppUITests"
BuildableName = "AppUITests"
BlueprintName = "AppUITests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@ -43,6 +47,15 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "CommonLibrary"
BuildableName = "CommonLibrary"
BlueprintName = "CommonLibrary"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">

169
Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/Library-Package.xcscheme Normal file
View File

@ -0,0 +1,169 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1540"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AppUI"
BuildableName = "AppUI"
BlueprintName = "AppUI"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AppUIMain"
BuildableName = "AppUIMain"
BlueprintName = "AppUIMain"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AppUITV"
BuildableName = "AppUITV"
BlueprintName = "AppUITV"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "CommonLibrary"
BuildableName = "CommonLibrary"
BlueprintName = "CommonLibrary"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "TunnelLibrary"
BuildableName = "TunnelLibrary"
BlueprintName = "TunnelLibrary"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "UILibrary"
BuildableName = "UILibrary"
BlueprintName = "UILibrary"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AppUIMainTests"
BuildableName = "AppUIMainTests"
BlueprintName = "AppUIMainTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "CommonLibraryTests"
BuildableName = "CommonLibraryTests"
BlueprintName = "CommonLibraryTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "UILibraryTests"
BuildableName = "UILibraryTests"
BlueprintName = "UILibraryTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AppUI"
BuildableName = "AppUI"
BlueprintName = "AppUI"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

12
Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/AppLibrary.xcscheme → Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/UILibrary.xcscheme
View File

@ -15,9 +15,9 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AppLibrary"
BuildableName = "AppLibrary"
BlueprintName = "AppLibrary"
BlueprintIdentifier = "UILibrary"
BuildableName = "UILibrary"
BlueprintName = "UILibrary"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
@ -50,9 +50,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AppLibrary"
BuildableName = "AppLibrary"
BlueprintName = "AppLibrary"
BlueprintIdentifier = "UILibrary"
BuildableName = "UILibrary"
BlueprintName = "UILibrary"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>

2
Passepartout/Library/Package.resolved
View File

@ -41,7 +41,7 @@
"kind" : "remoteSourceControl",
"location" : "git@github.com:passepartoutvpn/passepartoutkit-source",
"state" : {
"revision" : "e95c7b54dc11e744d9b40a722fccf752436ac0ef"
"revision" : "b32b63ab8e09883f965737bb6214dfb81e38283a"
}
},
{

34
Passepartout/Library/Package.swift
View File

@ -13,10 +13,6 @@ let package = Package(
],
products: [
// Products define the executables and libraries a package produces, making them visible to other packages.
.library(
name: "AppLibrary",
targets: ["AppLibrary"]
),
.library(
name: "AppUI",
targets: ["AppUI"]
@ -29,6 +25,10 @@ let package = Package(
name: "AppUITV",
targets: ["AppUITV"]
),
.library(
name: "CommonLibrary",
targets: ["CommonLibrary"]
),
.library(
name: "TunnelLibrary",
targets: ["CommonLibrary"]
@ -61,7 +61,7 @@ let package = Package(
name: "AppDataProfiles",
dependencies: [
"AppData",
"AppLibrary"
"CommonLibrary"
],
resources: [
.process("Profiles.xcdatamodeld")
@ -71,20 +71,12 @@ let package = Package(
name: "AppDataProviders",
dependencies: [
"AppData",
"AppLibrary"
"CommonLibrary"
],
resources: [
.process("Providers.xcdatamodeld")
]
),
.target(
name: "AppLibrary",
dependencies: [
"CommonLibrary",
"CommonUtils",
"Kvitto"
]
),
.target(
name: "AppUI",
dependencies: [
@ -116,6 +108,8 @@ let package = Package(
.target(
name: "CommonLibrary",
dependencies: [
"CommonUtils",
"Kvitto",
.product(name: "PassepartoutKit", package: "passepartoutkit-source"),
.product(name: "PassepartoutOpenVPNOpenSSL", package: "passepartoutkit-source-openvpn-openssl"),
.product(name: "PassepartoutWireGuardGo", package: "passepartoutkit-source-wireguard-go")
@ -142,21 +136,21 @@ let package = Package(
dependencies: [
"AppDataProfiles",
"AppDataProviders",
"AppLibrary",
"CommonAPI"
"CommonAPI",
"CommonLibrary"
],
resources: [
.process("Resources")
]
),
.testTarget(
name: "AppLibraryTests",
dependencies: ["AppLibrary"]
),
.testTarget(
name: "AppUIMainTests",
dependencies: ["AppUIMain"]
),
.testTarget(
name: "CommonLibraryTests",
dependencies: ["CommonLibrary"]
),
.testTarget(
name: "UILibraryTests",
dependencies: ["UILibrary"]

2
Passepartout/Library/Sources/AppDataProfiles/CDProfileRepositoryV3.swift
View File

@ -24,8 +24,8 @@
//
import AppData
import AppLibrary
import Combine
import CommonLibrary
import CommonUtils
import CoreData
import Foundation

2
Passepartout/Library/Sources/AppUIMain/Business/ProfileImporter.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import Foundation
import PassepartoutKit

1
Passepartout/Library/Sources/AppUIMain/Domain/Issue+Metadata.swift
View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import Foundation
import PassepartoutKit

2
Passepartout/Library/Sources/AppUIMain/Domain/Issue.swift
View File

@ -25,7 +25,6 @@
#if os(iOS)
import AppLibrary
import CommonLibrary
import Foundation
import PassepartoutKit
@ -34,7 +33,6 @@ import UIKit
#else
import AppKit
import AppLibrary
import CommonLibrary
import Foundation
import PassepartoutKit

2
Passepartout/Library/Sources/AppUIMain/Extensions/ProfileManager+Extensions.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import Foundation
import PassepartoutKit

1
Passepartout/Library/Sources/AppUIMain/Views/About/AboutRouterView.swift
View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import PassepartoutKit
import SwiftUI

1
Passepartout/Library/Sources/AppUIMain/Views/About/AboutView.swift
View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit

2
Passepartout/Library/Sources/AppUIMain/Views/App/AddProfileMenu.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import PassepartoutKit
import SwiftUI

1
Passepartout/Library/Sources/AppUIMain/Views/App/AppCoordinator.swift
View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit

2
Passepartout/Library/Sources/AppUIMain/Views/App/AppToolbar.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/App/InstalledProfileView.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/App/ProfileCardView.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/App/ProfileContainerView.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/App/ProfileContextMenu.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/App/ProfileDuplicateButton.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/App/ProfileGridView.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/App/ProfileImporterModifier.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/App/ProfileListView.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/App/ProfileRemoveButton.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/App/ProfileRowView.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/App/ProviderEntitySelector.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/App/TunnelRestartButton.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/AppMenu/macOS/AppMenu.swift
View File

@ -25,8 +25,8 @@
#if os(macOS)
import AppLibrary
import Combine
import CommonLibrary
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/AppMenu/macOS/AppMenuImage.swift
View File

@ -25,7 +25,7 @@
#if os(macOS)
import AppLibrary
import CommonLibrary
import PassepartoutKit
import SwiftUI

1
Passepartout/Library/Sources/AppUIMain/Views/Diagnostics/DebugLogView.swift
View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit

1
Passepartout/Library/Sources/AppUIMain/Views/Diagnostics/DiagnosticsView.swift
View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/Diagnostics/ReportIssueButton.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/Modules/OnDemandView.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/Modules/OpenVPNView.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import CPassepartoutOpenVPNOpenSSL
import PassepartoutKit

2
Passepartout/Library/Sources/AppUIMain/Views/Paywall/PaywallModifier.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import SwiftUI
struct PaywallModifier: ViewModifier {

2
Passepartout/Library/Sources/AppUIMain/Views/Paywall/PaywallView.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import SwiftUI
struct PaywallView: View {

2
Passepartout/Library/Sources/AppUIMain/Views/Profile/ProfileCoordinator.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/Profile/StorageSection.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import SwiftUI
struct StorageSection: View {

2
Passepartout/Library/Sources/AppUIMain/Views/Profile/iOS/ProfileEditView+iOS.swift
View File

@ -25,7 +25,7 @@
#if os(iOS)
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/Provider/ProviderContentModifier.swift
View File

@ -23,8 +23,8 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonAPI
import CommonLibrary
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNFiltersView.swift
View File

@ -23,8 +23,8 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import Combine
import CommonLibrary
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderContentModifier.swift
View File

@ -23,8 +23,8 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonAPI
import CommonLibrary
import PassepartoutKit
import SwiftUI

1
Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderServerView.swift
View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonAPI
import CommonLibrary
import CommonUtils

1
Passepartout/Library/Sources/AppUIMain/Views/Provider/iOS/VPNProviderServerView+iOS.swift
View File

@ -25,7 +25,6 @@
#if os(iOS)
import AppLibrary
import CommonAPI
import CommonLibrary
import PassepartoutKit

1
Passepartout/Library/Sources/AppUIMain/Views/Settings/SettingsSectionGroup.swift
View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit

2
Passepartout/Library/Sources/AppUIMain/Views/Settings/SettingsView.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import SwiftUI
public struct SettingsView: View {

2
Passepartout/Library/Sources/AppUITV/Views/App/AppCoordinator.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUITV/Views/Profile/ActiveProfileView.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUITV/Views/Profile/ProfileListView.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/AppUITV/Views/Profile/ProfileView.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

1
Passepartout/Library/Sources/AppLibrary/Business/ExtendedTunnel.swift → Passepartout/Library/Sources/CommonLibrary/Business/ExtendedTunnel.swift
View File

@ -24,7 +24,6 @@
//
import Combine
import CommonLibrary
import Foundation
import PassepartoutKit

0
Passepartout/Library/Sources/AppLibrary/Business/InMemoryProfileRepository.swift → Passepartout/Library/Sources/CommonLibrary/Business/InMemoryProfileRepository.swift
View File

1
Passepartout/Library/Sources/AppLibrary/Business/NEProfileRepository.swift → Passepartout/Library/Sources/CommonLibrary/Business/NEProfileRepository.swift
View File

@ -24,7 +24,6 @@
//
import Combine
import CommonLibrary
import Foundation
import NetworkExtension
import PassepartoutKit

0
Passepartout/Library/Sources/AppLibrary/Business/ProfileManager.swift → Passepartout/Library/Sources/CommonLibrary/Business/ProfileManager.swift
View File

0
Passepartout/Library/Sources/AppLibrary/Business/ProfileProcessor.swift → Passepartout/Library/Sources/CommonLibrary/Business/ProfileProcessor.swift
View File

0
Passepartout/Library/Sources/AppLibrary/Business/ProfileRepository.swift → Passepartout/Library/Sources/CommonLibrary/Business/ProfileRepository.swift
View File

0
Passepartout/Library/Sources/AppLibrary/IAP/AppFeature.swift → Passepartout/Library/Sources/CommonLibrary/IAP/AppFeature.swift
View File

0
Passepartout/Library/Sources/AppLibrary/IAP/AppFeatureProviding.swift → Passepartout/Library/Sources/CommonLibrary/IAP/AppFeatureProviding.swift
View File

0
Passepartout/Library/Sources/AppLibrary/IAP/AppProduct+Donations.swift → Passepartout/Library/Sources/CommonLibrary/IAP/AppProduct+Donations.swift
View File

0
Passepartout/Library/Sources/AppLibrary/IAP/AppProduct+Features.swift → Passepartout/Library/Sources/CommonLibrary/IAP/AppProduct+Features.swift
View File

0
Passepartout/Library/Sources/AppLibrary/IAP/AppProduct+Providers.swift → Passepartout/Library/Sources/CommonLibrary/IAP/AppProduct+Providers.swift
View File

1
Passepartout/Library/Sources/AppLibrary/IAP/AppProduct.swift → Passepartout/Library/Sources/CommonLibrary/IAP/AppProduct.swift
View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import CommonLibrary
import CommonUtils
import Foundation
import PassepartoutKit

0
Passepartout/Library/Sources/AppLibrary/IAP/AppProductHelper.swift → Passepartout/Library/Sources/CommonLibrary/IAP/AppProductHelper.swift
View File

0
Passepartout/Library/Sources/AppLibrary/IAP/AppReceiptReader.swift → Passepartout/Library/Sources/CommonLibrary/IAP/AppReceiptReader.swift
View File

0
Passepartout/Library/Sources/AppLibrary/IAP/AppUserLevel.swift → Passepartout/Library/Sources/CommonLibrary/IAP/AppUserLevel.swift
View File

0
Passepartout/Library/Sources/AppLibrary/IAP/IAPManager.swift → Passepartout/Library/Sources/CommonLibrary/IAP/IAPManager.swift
View File

0
Passepartout/Library/Sources/AppLibrary/IAP/KvittoReceiptReader.swift → Passepartout/Library/Sources/CommonLibrary/IAP/KvittoReceiptReader.swift
View File

0
Passepartout/Library/Sources/AppLibrary/IAP/PaywallReason.swift → Passepartout/Library/Sources/CommonLibrary/IAP/PaywallReason.swift
View File

0
Passepartout/Library/Sources/AppLibrary/Mock/MockAppProductHelper.swift → Passepartout/Library/Sources/CommonLibrary/Mock/MockAppProductHelper.swift
View File

0
Passepartout/Library/Sources/AppLibrary/Mock/MockAppReceiptReader.swift → Passepartout/Library/Sources/CommonLibrary/Mock/MockAppReceiptReader.swift
View File

1
Passepartout/Library/Sources/UILibrary/Business/AppContext.swift
View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import Combine
import CommonLibrary
import CommonUtils

1
Passepartout/Library/Sources/UILibrary/Business/ProfileEditor.swift
View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import Combine
import CommonLibrary
import Foundation

1
Passepartout/Library/Sources/UILibrary/Extensions/View+Environment.swift
View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import SwiftUI
@MainActor

2
Passepartout/Library/Sources/UILibrary/Mock/Mock.swift
View File

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

2
Passepartout/Library/Sources/UILibrary/Protocols/AppCoordinatorConforming.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import Foundation
import PassepartoutKit

2
Passepartout/Library/Sources/UILibrary/Protocols/TunnelInstallationProviding.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import Foundation
import PassepartoutKit

2
Passepartout/Library/Sources/UILibrary/Theme/Theme+Extensions.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/UILibrary/Views/Modules/OpenVPNView+Credentials.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/UILibrary/Views/UI/ConnectionStatusText.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import Foundation
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Sources/UILibrary/Views/UI/TunnelToggleButton.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import CommonLibrary
import CommonUtils
import PassepartoutKit
import SwiftUI

2
Passepartout/Library/Tests/AppUIMainTests/IssueTests.swift
View File

@ -23,8 +23,8 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
@testable import AppUIMain
import CommonLibrary
import Foundation
import XCTest

2
Passepartout/Library/Tests/AppUIMainTests/ProfileImporterTests.swift
View File

@ -23,9 +23,9 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
@testable import AppUIMain
import Combine
import CommonLibrary
import Foundation
import PassepartoutKit
import XCTest

2
Passepartout/Library/Tests/AppLibraryTests/ExtendedTunnelTests.swift → Passepartout/Library/Tests/CommonLibraryTests/ExtendedTunnelTests.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
@testable import AppLibrary
@testable import CommonLibrary
import Foundation
import PassepartoutKit
import XCTest

2
Passepartout/Library/Tests/AppLibraryTests/IAPManagerTests.swift → Passepartout/Library/Tests/CommonLibraryTests/IAPManagerTests.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
@testable import AppLibrary
@testable import CommonLibrary
import Foundation
import XCTest

2
Passepartout/Library/Tests/AppLibraryTests/ProfileManagerTests.swift → Passepartout/Library/Tests/CommonLibraryTests/ProfileManagerTests.swift
View File

@ -23,7 +23,7 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
@testable import AppLibrary
@testable import CommonLibrary
import Foundation
import XCTest

2
Passepartout/Library/Tests/UILibraryTests/ProfileEditorTests.swift
View File

@ -23,8 +23,8 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import AppLibrary
import Combine
import CommonLibrary
import Foundation
import PassepartoutKit
@testable import UILibrary