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

Upgrade Xcode project and TunnelKit

This commit is contained in:
Davide De Rosa 2021-06-26 09:49:48 +02:00
parent a7bccde045
commit c1f169b239
23 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Passepartout/App/iOS/Cells/FieldTableViewCell.swift
View File

@ -29,7 +29,7 @@ extension Cells {
static let field = FieldTableViewCell.Provider()
}
protocol FieldTableViewCellDelegate: class {
protocol FieldTableViewCellDelegate: AnyObject {
func fieldCellDidEdit(_: FieldTableViewCell)
func fieldCellDidEnter(_: FieldTableViewCell)

2
Passepartout/App/iOS/Cells/ToggleTableViewCell.swift
View File

@ -29,7 +29,7 @@ extension Cells {
static let toggle = ToggleTableViewCell.Provider()
}
protocol ToggleTableViewCellDelegate: class {
protocol ToggleTableViewCellDelegate: AnyObject {
func toggleCell(_: ToggleTableViewCell, didToggleToValue value: Bool)
}

2
Passepartout/App/iOS/Scenes/AccountViewController.swift
View File

@ -27,7 +27,7 @@ import UIKit
import PassepartoutCore
import Convenience
protocol AccountViewControllerDelegate: class {
protocol AccountViewControllerDelegate: AnyObject {
func accountController(_: AccountViewController, didEnterCredentials credentials: Credentials)
func accountControllerDidComplete(_: AccountViewController)

2
Passepartout/App/iOS/Scenes/ConfigurationModificationDelegate.swift
View File

@ -26,7 +26,7 @@
import Foundation
import TunnelKit
protocol ConfigurationModificationDelegate: class {
protocol ConfigurationModificationDelegate: AnyObject {
func configuration(didUpdate newConfiguration: OpenVPN.Configuration)
func configurationShouldReinstall()

2
Passepartout/App/iOS/Scenes/EndpointViewController.swift
View File

@ -28,7 +28,7 @@ import TunnelKit
import PassepartoutCore
import Convenience
protocol EndpointViewControllerDelegate: class {
protocol EndpointViewControllerDelegate: AnyObject {
func endpointController(_: EndpointViewController, didUpdateWithNewAddress newAddress: String?, newProtocol: EndpointProtocol?)
}

2
Passepartout/App/iOS/Scenes/Organizer/ImportedHostsViewController.swift
View File

@ -30,7 +30,7 @@ import PassepartoutCore
private let log = SwiftyBeaver.self
protocol ImportedHostsViewControllerDelegate: class {
protocol ImportedHostsViewControllerDelegate: AnyObject {
func importedHostsController(_: ImportedHostsViewController, didImport url: URL)
}

2
Passepartout/App/iOS/Scenes/ProviderPoolViewController.swift
View File

@ -27,7 +27,7 @@ import UIKit
import PassepartoutCore
import Convenience
protocol ProviderPoolViewControllerDelegate: class {
protocol ProviderPoolViewControllerDelegate: AnyObject {
func providerPoolController(_: ProviderPoolViewController, didSelectPool pool: Pool)
func providerPoolController(_: ProviderPoolViewController, didUpdateFavoriteGroups favoriteGroupIds: [String])

2
Passepartout/App/iOS/Scenes/ProviderPresetViewController.swift
View File

@ -26,7 +26,7 @@
import UIKit
import PassepartoutCore
protocol ProviderPresetViewControllerDelegate: class {
protocol ProviderPresetViewControllerDelegate: AnyObject {
func providerPresetController(_: ProviderPresetViewController, didSelectPreset preset: InfrastructurePreset)
}

2
Passepartout/App/iOS/Scenes/Purchase/PurchaseViewController.swift
View File

@ -31,7 +31,7 @@ import Convenience
private let log = SwiftyBeaver.self
protocol PurchaseViewControllerDelegate: class {
protocol PurchaseViewControllerDelegate: AnyObject {
func purchaseController(_ purchaseController: PurchaseViewController, didPurchase product: Product?)
}

2
Passepartout/App/iOS/Scenes/Shortcuts/ShortcutsViewController.swift
View File

@ -30,7 +30,7 @@ import PassepartoutCore
import Convenience
@available(iOS 12, *)
protocol ShortcutsIntentDelegate: class {
protocol ShortcutsIntentDelegate: AnyObject {
func shortcutsDidSelectIntent(intent: INIntent)
}

2
Passepartout/App/macOS/Global/TextInputViewController.swift
View File

@ -26,7 +26,7 @@
import Cocoa
import PassepartoutCore
protocol TextInputViewControllerDelegate: class {
protocol TextInputViewControllerDelegate: AnyObject {
func textInputController(_ textInputController: TextInputViewController, shouldEnterText text: String) -> Bool
func textInputController(_ textInputController: TextInputViewController, didEnterText text: String)

2
Passepartout/App/macOS/Scenes/OrganizerProfileTableView.swift
View File

@ -26,7 +26,7 @@
import Cocoa
import PassepartoutCore
protocol OrganizerProfileTableViewDelegate: class {
protocol OrganizerProfileTableViewDelegate: AnyObject {
func profileTableViewDidRequestAdd(_ profileTableView: OrganizerProfileTableView, sender: NSView)
func profileTableView(_ profileTableView: OrganizerProfileTableView, didRequestRemove profile: ConnectionProfile)

2
Passepartout/App/macOS/Scenes/Purchase/PurchaseViewController.swift
View File

@ -31,7 +31,7 @@ import Convenience
private let log = SwiftyBeaver.self
protocol PurchaseViewControllerDelegate: class {
protocol PurchaseViewControllerDelegate: AnyObject {
func purchaseController(_ purchaseController: PurchaseViewController, didPurchase product: Product?)
}

2
Passepartout/App/macOS/Scenes/Service/AccountViewController.swift
View File

@ -27,7 +27,7 @@ import Cocoa
import TunnelKit
import PassepartoutCore
protocol AccountViewControllerDelegate: class {
protocol AccountViewControllerDelegate: AnyObject {
func accountController(_ accountController: AccountViewController, shouldUpdateCredentials credentials: Credentials, forProfile profile: ConnectionProfile) -> Bool
func accountController(_ accountController: AccountViewController, didUpdateCredentials credentials: Credentials, forProfile profile: ConnectionProfile)

4
Passepartout/App/macOS/Scenes/Service/Customization/ProfileCustomizationViewController.swift
View File

@ -27,13 +27,13 @@ import Cocoa
import PassepartoutCore
import TunnelKit
protocol ProfileCustomization: class {
protocol ProfileCustomization: AnyObject {
var profile: ConnectionProfile? { get set }
var delegate: ProfileCustomizationDelegate? { get set }
}
protocol ProfileCustomizationDelegate: class {
protocol ProfileCustomizationDelegate: AnyObject {
func profileCustomization(_ profileCustomization: ProfileCustomization, didUpdateEndpointWithAddress newAddress: String?)
func profileCustomization(_ profileCustomization: ProfileCustomization, didUpdateEndpointWithProtocol newEndpointProtocol: EndpointProtocol?)

2
Passepartout/App/macOS/Scenes/Service/Customization/TrustedNetworksAddViewController.swift
View File

@ -26,7 +26,7 @@
import Cocoa
import PassepartoutCore
protocol TrustedNetworksAddViewControllerDelegate: class {
protocol TrustedNetworksAddViewControllerDelegate: AnyObject {
func trustedController(_ trustedController: TrustedNetworksAddViewController, didEnterSSID ssid: String)
}

2
Passepartout/App/macOS/Scenes/Service/HostServiceView.swift
View File

@ -26,7 +26,7 @@
import Cocoa
import PassepartoutCore
protocol HostServiceViewDelegate: class {
protocol HostServiceViewDelegate: AnyObject {
}
class HostServiceView: NSView {

2
Passepartout/App/macOS/Scenes/Service/ProviderServiceView.swift
View File

@ -26,7 +26,7 @@
import Cocoa
import PassepartoutCore
protocol ProviderServiceViewDelegate: class {
protocol ProviderServiceViewDelegate: AnyObject {
func providerView(_ providerView: ProviderServiceView, didSelectPool pool: Pool)
func providerViewDidRequestInfrastructureRefresh(_ providerView: ProviderServiceView)

2
Passepartout/Core/Sources/Model/ConnectionProfile.swift
View File

@ -33,7 +33,7 @@ public enum Context: String, Codable {
case host
}
public protocol ConnectionProfile: class, EndpointDataSource, CustomStringConvertible {
public protocol ConnectionProfile: AnyObject, EndpointDataSource, CustomStringConvertible {
var context: Context { get }
var id: String { get }

2
Passepartout/Core/Sources/Model/ConnectionService.swift
View File

@ -30,7 +30,7 @@ import SwiftyBeaver
private let log = SwiftyBeaver.self
public protocol ConnectionServiceDelegate: class {
public protocol ConnectionServiceDelegate: AnyObject {
func connectionService(didAdd profile: ConnectionProfile)
func connectionService(didRename profile: ConnectionProfile, to newTitle: String)

2
Passepartout/Core/Sources/UI/TrustedNetworksUI.swift
View File

@ -25,7 +25,7 @@
import Foundation
public protocol TrustedNetworksUIDelegate: class {
public protocol TrustedNetworksUIDelegate: AnyObject {
func trustedNetworksCouldDisconnect(_: TrustedNetworksUI) -> Bool
func trustedNetworksShouldConfirmDisconnection(_: TrustedNetworksUI, triggeredAt rowIndex: Int, completionHandler: @escaping () -> Void)

4
Podfile
View File

@ -7,8 +7,8 @@ $tunnelkit_name = 'TunnelKit'
$tunnelkit_specs = ['Protocols/OpenVPN', 'Extra/LZO']
def shared_pods
pod_version $tunnelkit_name, $tunnelkit_specs, '~> 3.3.1'
#pod_git $tunnelkit_name, $tunnelkit_specs, '59e30cd'
#pod_version $tunnelkit_name, $tunnelkit_specs, '~> 3.3.1'
pod_git $tunnelkit_name, $tunnelkit_specs, 'a658410'
#pod_path $tunnelkit_name, $tunnelkit_specs, '..'
pod 'SSZipArchive'
pod 'Kvitto', :git => 'https://github.com/keeshux/Kvitto', :branch => 'enable-macos-spec'

29
Podfile.lock
View File

@ -21,18 +21,18 @@ PODS:
- Kvitto/Core (1.0.5):
- DTFoundation/DTASN1 (~> 1.7.13)
- MBProgressHUD (1.2.0)
- OpenSSL-Apple (1.1.1h.10)
- OpenSSL-Apple (1.1.1k.11)
- SSZipArchive (2.2.3)
- SwiftyBeaver (1.9.3)
- TunnelKit/AppExtension (3.3.1):
- TunnelKit/AppExtension (3.4.0):
- SwiftyBeaver
- TunnelKit/Core
- TunnelKit/Core (3.3.1):
- TunnelKit/Core (3.4.0):
- SwiftyBeaver
- TunnelKit/Extra/LZO (3.3.1)
- TunnelKit/Manager (3.3.1):
- TunnelKit/Extra/LZO (3.4.0)
- TunnelKit/Manager (3.4.0):
- SwiftyBeaver
- TunnelKit/Protocols/OpenVPN (3.3.1):
- TunnelKit/Protocols/OpenVPN (3.4.0):
- OpenSSL-Apple (~> 1.1.1h.10)
- TunnelKit/AppExtension
- TunnelKit/Core
@ -52,8 +52,8 @@ DEPENDENCIES:
- Kvitto (from `https://github.com/keeshux/Kvitto`, branch `enable-macos-spec`)
- MBProgressHUD
- SSZipArchive
- TunnelKit/Extra/LZO (~> 3.3.1)
- TunnelKit/Protocols/OpenVPN (~> 3.3.1)
- TunnelKit/Extra/LZO (from `https://github.com/passepartoutvpn/tunnelkit`, commit `a658410`)
- TunnelKit/Protocols/OpenVPN (from `https://github.com/passepartoutvpn/tunnelkit`, commit `a658410`)
SPEC REPOS:
https://github.com/cocoapods/specs.git:
@ -62,7 +62,6 @@ SPEC REPOS:
- OpenSSL-Apple
- SSZipArchive
- SwiftyBeaver
- TunnelKit
EXTERNAL SOURCES:
Convenience:
@ -71,6 +70,9 @@ EXTERNAL SOURCES:
Kvitto:
:branch: enable-macos-spec
:git: https://github.com/keeshux/Kvitto
TunnelKit:
:commit: a658410
:git: https://github.com/passepartoutvpn/tunnelkit
CHECKOUT OPTIONS:
Convenience:
@ -79,17 +81,20 @@ CHECKOUT OPTIONS:
Kvitto:
:commit: e263fcd1f40a6a482a0f1e424ba98009c4ad2b96
:git: https://github.com/keeshux/Kvitto
TunnelKit:
:commit: a658410
:git: https://github.com/passepartoutvpn/tunnelkit
SPEC CHECKSUMS:
Convenience: c805c2aff569ff735c5d69c2c2b7a9bd110fa507
DTFoundation: e7781d9fd2f202bfd451fbbf8cab71ce83b46498
Kvitto: 5511954b22d6c710e1a04dcbdee44ae7b3d1caeb
MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
OpenSSL-Apple: 8a8fcb06fb66f9c2f7aed45ce363668493b8e5f6
OpenSSL-Apple: 3104e6d32de21815b68aeba31edaa6a78d90e7e0
SSZipArchive: 62d4947b08730e4cda640473b0066d209ff033c9
SwiftyBeaver: 2e8acd6fc90c6d0a27055867a290794926d57c02
TunnelKit: abc76b7580ac190c4e932d8e67b9ece11fba45a4
TunnelKit: 9733bb3d8b911b8dfa3cb1363bc82bb3f4204038
PODFILE CHECKSUM: 02f587a7e0b92f055453fe6df12d236f8368ade5
PODFILE CHECKSUM: 240f988c205fbbd465571409d4d6ea67de3b7bb6
COCOAPODS: 1.10.1