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

Upgrade to Xcode 16 (#858) 

- Address further restrictions on actor-isolation by using `nonisolated`
on:
  - Combine subjects
  - Core Data context/controller
  - Blocks
- In previews using inline `@State`, create a custom view instead
- Use `@retroactive` in l10n extensions
- Fix compile error in WireGuardKit
This commit is contained in:
Davide 2024-11-13 12:07:30 +01:00 committed by GitHub
parent c5047533b5
commit 008b78cc7c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 85 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -41,7 +41,8 @@
"kind" : "remoteSourceControl",
"location" : "git@github.com:passepartoutvpn/passepartoutkit-source",
"state" : {
"revision" : "3a4c78af67dfe181acc657a5539ee3d62d1c9361"
"revision" : "3a4c78af67dfe181acc657a5539ee3d62d1c9361",
"version" : "0.11.0"
}
},
{
@ -58,8 +59,8 @@
"kind" : "remoteSourceControl",
"location" : "git@github.com:passepartoutvpn/passepartoutkit-source-wireguard-go",
"state" : {
"revision" : "8d142c806fb7dc4a2cd754d38d99da0d6398b811",
"version" : "0.9.1"
"revision" : "256a4a8265b7d214bb35f4e29e18c27e2dc49137",
"version" : "0.9.2"
}
},
{
@ -76,8 +77,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/passepartoutvpn/wireguard-apple",
"state" : {
"revision" : "a896f784bc5ed94f29d97e376be5cfa08d4a5d44",
"version" : "1.1.1"
"revision" : "d8bcdf22f1e75d80caac874f302dee86194bb71d",
"version" : "1.1.2"
}
}
],

6
Passepartout/Library/Package.swift
View File

@ -49,13 +49,13 @@ let package = Package(
)
],
dependencies: [
// .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", from: "0.9.0"),
.package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "3a4c78af67dfe181acc657a5539ee3d62d1c9361"),
.package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", from: "0.11.0"),
// .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "3a4c78af67dfe181acc657a5539ee3d62d1c9361"),
// .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"),
// .package(path: "../../../passepartoutkit-source-openvpn-openssl"),
.package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-wireguard-go", from: "0.9.1"),
.package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-wireguard-go", from: "0.9.2"),
// .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-wireguard-go", revision: "ea39fa396e98cfd2b9a235f0a801aaf03a37e30a"),
// .package(path: "../../../passepartoutkit-source-wireguard-go"),
.package(url: "https://github.com/Cocoanetics/Kvitto", from: "1.0.0")

10
Passepartout/Library/Sources/AppDataProviders/CDProviderRepositoryV3.swift
View File

@ -40,15 +40,15 @@ extension AppData {
}
actor CDProviderRepositoryV3: NSObject, ProviderRepository {
private let context: NSManagedObjectContext
private nonisolated let context: NSManagedObjectContext
private let backgroundContext: NSManagedObjectContext
private nonisolated let backgroundContext: NSManagedObjectContext
private let providersSubject: CurrentValueSubject<[ProviderMetadata], Never>
private nonisolated let providersSubject: CurrentValueSubject<[ProviderMetadata], Never>
private let lastUpdateSubject: CurrentValueSubject<[ProviderID: Date], Never>
private nonisolated let lastUpdateSubject: CurrentValueSubject<[ProviderID: Date], Never>
private let providersController: NSFetchedResultsController<CDProviderV3>
private nonisolated let providersController: NSFetchedResultsController<CDProviderV3>
init(context: NSManagedObjectContext, backgroundContext: NSManagedObjectContext) {
self.context = context

26
Passepartout/Library/Sources/AppUIMain/Views/Profile/NameSection.swift
View File

@ -43,17 +43,25 @@ struct NameSection: View {
}
}
// MARK: - Previews
#Preview {
struct ContentView: View {
@State
var name = ""
@State
private var name = ""
return Form {
NameSection(
name: $name,
placeholder: "My name"
)
var body: some View {
Form {
NameSection(
name: $name,
placeholder: "My name"
)
}
.themeForm()
}
}
.themeForm()
.withMockEnvironment()
return ContentView()
.withMockEnvironment()
}

10
Passepartout/Library/Sources/CommonLibrary/Business/ProfileProcessor.swift
View File

@ -26,16 +26,16 @@
import Foundation
import PassepartoutKit
public final class ProfileProcessor: ObservableObject {
public final class ProfileProcessor: ObservableObject, Sendable {
private let iapManager: IAPManager
public let title: (Profile) -> String
public nonisolated let title: (Profile) -> String
private let _isIncluded: (IAPManager, Profile) -> Bool
private nonisolated let _isIncluded: (IAPManager, Profile) -> Bool
private let _willSave: (IAPManager, Profile.Builder) throws -> Profile.Builder
private nonisolated let _willSave: (IAPManager, Profile.Builder) throws -> Profile.Builder
private let _willConnect: (IAPManager, Profile) throws -> Profile
private nonisolated let _willConnect: (IAPManager, Profile) throws -> Profile
public init(
iapManager: IAPManager,

2
Passepartout/Library/Sources/CommonLibrary/IAP/FallbackReceiptReader.swift
View File

@ -31,7 +31,7 @@ import PassepartoutKit
public actor FallbackReceiptReader: AppReceiptReader {
private let reader: InAppReceiptReader?
private let localReader: (URL) -> InAppReceiptReader?
private nonisolated let localReader: (URL) -> InAppReceiptReader?
private var pendingTask: Task<InAppReceipt?, Never>?

2
Passepartout/Library/Sources/CommonLibrary/Mock/MockAppProductHelper.swift
View File

@ -34,7 +34,7 @@ public actor MockAppProductHelper: AppProductHelper {
public nonisolated let receiptReader: MockAppReceiptReader
private let didUpdateSubject: PassthroughSubject<Void, Never>
private nonisolated let didUpdateSubject: PassthroughSubject<Void, Never>
// set .max to skip entitled products
public init(build: Int = .max) {

10
Passepartout/Library/Sources/CommonUtils/Business/CoreDataRepository.swift
View File

@ -46,17 +46,17 @@ public actor CoreDataRepository<CD, T>: NSObject,
private let entityName: String
private let context: NSManagedObjectContext
private nonisolated let context: NSManagedObjectContext
private let observingResults: Bool
private let fromMapper: (CD) throws -> T?
private nonisolated let fromMapper: (CD) throws -> T?
private let toMapper: (T, NSManagedObjectContext) throws -> CD
private nonisolated let toMapper: (T, NSManagedObjectContext) throws -> CD
private let onResultError: ((Error) -> CoreDataResultAction)?
private nonisolated let onResultError: ((Error) -> CoreDataResultAction)?
private let entitiesSubject: CurrentValueSubject<EntitiesResult<T>, Never>
private nonisolated let entitiesSubject: CurrentValueSubject<EntitiesResult<T>, Never>
// cannot easily use CD as generic
private var resultsController: NSFetchedResultsController<CD>

36
Passepartout/Library/Sources/CommonUtils/Extensions/UUID+RawRepresentable.swift
View File

@ -1,36 +0,0 @@
//
// UUID+RawRepresentable.swift
// Passepartout
//
// Created by Davide De Rosa on 8/11/24.
// Copyright (c) 2024 Davide De Rosa. All rights reserved.
//
// https://github.com/passepartoutvpn
//
// This file is part of Passepartout.
//
// Passepartout is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Passepartout is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
import Foundation
extension UUID: RawRepresentable {
public var rawValue: String {
uuidString
}
public init?(rawValue: RawValue) {
self.init(uuidString: rawValue)
}
}

2
Passepartout/Library/Sources/CommonUtils/IAP/StoreKitHelper.swift
View File

@ -39,7 +39,7 @@ public final class StoreKitHelper<ProductType>: InAppHelper where ProductType: R
private var activeTransactions: Set<Transaction>
private let didUpdateSubject: PassthroughSubject<Void, Never>
private nonisolated let didUpdateSubject: PassthroughSubject<Void, Never>
private var observer: Task<Void, Never>?

2
Passepartout/Library/Sources/UILibrary/L10n/AppError+L10n.swift
View File

@ -55,7 +55,7 @@ extension AppError: LocalizedError {
// MARK: - App side
extension PassepartoutError: LocalizedError {
extension PassepartoutError: @retroactive LocalizedError {
public var errorDescription: String? {
switch code {
case .App.ineligibleProfile:

2
Passepartout/Library/Sources/UILibrary/L10n/PassepartoutKit+L10n.swift
View File

@ -144,7 +144,7 @@ extension OnDemandModule.Policy: LocalizableEntity {
}
}
extension ProviderID: CustomDebugStringConvertible {
extension ProviderID: @retroactive CustomDebugStringConvertible {
public var debugDescription: String {
rawValue
}

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

@ -209,18 +209,24 @@ private extension OpenVPNCredentialsView {
}
#Preview {
struct ContentView: View {
@State
var credentials: OpenVPN.Credentials?
@State
private var credentials: OpenVPN.Credentials?
@State
var isInteractive = true
@State
private var isInteractive = true
return NavigationStack {
OpenVPNCredentialsView(
isInteractive: $isInteractive,
credentials: $credentials
)
.withMockEnvironment()
var body: some View {
NavigationStack {
OpenVPNCredentialsView(
isInteractive: $isInteractive,
credentials: $credentials
)
}
}
}
return ContentView()
.withMockEnvironment()
}

39
Passepartout/Library/Sources/UILibrary/Views/UI/EditableListSection.swift
View File

@ -238,26 +238,33 @@ private extension EditableListSection {
}
#Preview {
@State
var originalItems = ["One", "Two", "Three"]
struct ContentView: View {
return Form {
EditableListSection(
"Title",
addTitle: "Add item",
originalItems: $originalItems
) {
if $0 {
Text($1.wrappedValue)
} else {
TextField("", text: $1)
@State
private var originalItems = ["One", "Two", "Three"]
var body: some View {
Form {
EditableListSection(
"Title",
addTitle: "Add item",
originalItems: $originalItems
) {
if $0 {
Text($1.wrappedValue)
} else {
TextField("", text: $1)
}
} removeLabel: { action in
Button("Remove", action: action)
} editLabel: {
Image(systemName: "arrow.up.arrow.down")
}
}
} removeLabel: { action in
Button("Remove", action: action)
} editLabel: {
Image(systemName: "arrow.up.arrow.down")
}
}
return ContentView()
}
#endif