Update library again
- Drop -Type suffixes from associated types - Rename to IdentifiableConfiguration
This commit is contained in:
parent
355974292e
commit
79bb6e6bdb
|
@ -41,7 +41,7 @@
|
|||
"kind" : "remoteSourceControl",
|
||||
"location" : "git@github.com:passepartoutvpn/passepartoutkit-source",
|
||||
"state" : {
|
||||
"revision" : "51288509f90b0d4dd2c4ceee2af5cfb36e6319f1"
|
||||
"revision" : "4d9cb52344de9c4a075389966a706574af936c08"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
@ -52,7 +52,7 @@ let package = Package(
|
|||
],
|
||||
dependencies: [
|
||||
// .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", from: "0.12.0"),
|
||||
.package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "51288509f90b0d4dd2c4ceee2af5cfb36e6319f1"),
|
||||
.package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "4d9cb52344de9c4a075389966a706574af936c08"),
|
||||
// .package(path: "../../passepartoutkit-source"),
|
||||
.package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", from: "0.9.1"),
|
||||
// .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", revision: "031863a1cd683962a7dfe68e20b91fa820a1ecce"),
|
||||
|
|
|
@ -39,7 +39,7 @@ final class CDVPNProviderServerRepositoryV3: VPNProviderServerRepository {
|
|||
self.providerId = providerId
|
||||
}
|
||||
|
||||
func availableOptions<Configuration>(for configurationType: Configuration.Type) async throws -> VPNFilterOptions where Configuration: ConfigurationIdentifiable {
|
||||
func availableOptions<Configuration>(for configurationType: Configuration.Type) async throws -> VPNFilterOptions where Configuration: IdentifiableConfiguration {
|
||||
try await context.perform {
|
||||
let mapper = DomainMapper()
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ import PassepartoutKit
|
|||
import SwiftUI
|
||||
import UILibrary
|
||||
|
||||
struct ProviderContentModifier<Entity, ProviderRows>: ViewModifier where Entity: ProviderEntityType, ProviderRows: View {
|
||||
struct ProviderContentModifier<Entity, ProviderRows>: ViewModifier where Entity: ProviderEntity, ProviderRows: View {
|
||||
|
||||
@EnvironmentObject
|
||||
private var providerManager: ProviderManager
|
||||
|
|
|
@ -28,7 +28,7 @@ import CommonLibrary
|
|||
import PassepartoutKit
|
||||
import SwiftUI
|
||||
|
||||
struct VPNProviderContentModifier<Configuration, ProviderRows>: ViewModifier where Configuration: ConfigurationIdentifiable, ProviderRows: View {
|
||||
struct VPNProviderContentModifier<Configuration, ProviderRows>: ViewModifier where Configuration: IdentifiableConfiguration, ProviderRows: View {
|
||||
var apis: [APIMapper] = API.shared
|
||||
|
||||
@Binding
|
||||
|
|
|
@ -27,7 +27,7 @@ import CommonUtils
|
|||
import PassepartoutKit
|
||||
import SwiftUI
|
||||
|
||||
struct VPNProviderServerCoordinator<Configuration>: View where Configuration: ConfigurationIdentifiable {
|
||||
struct VPNProviderServerCoordinator<Configuration>: View where Configuration: IdentifiableConfiguration {
|
||||
|
||||
@Environment(\.dismiss)
|
||||
private var dismiss
|
||||
|
|
|
@ -29,7 +29,7 @@ import CommonUtils
|
|||
import PassepartoutKit
|
||||
import SwiftUI
|
||||
|
||||
struct VPNProviderServerView<Configuration>: View where Configuration: ConfigurationIdentifiable {
|
||||
struct VPNProviderServerView<Configuration>: View where Configuration: IdentifiableConfiguration {
|
||||
|
||||
@EnvironmentObject
|
||||
private var providerManager: ProviderManager
|
||||
|
|
|
@ -43,7 +43,7 @@ extension ModuleDraftEditing where Draft: MutableProviderSelecting {
|
|||
}
|
||||
}
|
||||
|
||||
public var providerEntity: Binding<Draft.CustomSelectionType.EntityType?> {
|
||||
public var providerEntity: Binding<Draft.CustomProviderSelection.Entity?> {
|
||||
Binding {
|
||||
draft.providerEntity.wrappedValue
|
||||
} set: {
|
||||
|
@ -51,7 +51,7 @@ extension ModuleDraftEditing where Draft: MutableProviderSelecting {
|
|||
}
|
||||
}
|
||||
|
||||
public var providerOptions: Binding<Set<Draft.CustomSelectionType.OptionType>?> {
|
||||
public var providerOptions: Binding<Set<Draft.CustomProviderSelection.Option>?> {
|
||||
Binding {
|
||||
draft.providerOptions.wrappedValue
|
||||
} set: {
|
||||
|
|
Loading…
Reference in New Issue