Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
strategy:
fail-fast: false
matrix:
swift: [ "5.10", "6.0" ]
swift: [ "6.0" ]
name: swift ${{ matrix.swift }} tests
steps:
- uses: slashmo/[email protected]
Expand Down
63 changes: 31 additions & 32 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 5.10
// swift-tools-version: 6.0
// The swift-tools-version declares the minimum version of Swift required to build this package.

// Copyright 2024 Apple Inc. and the Swift Homomorphic Encryption project authors
Expand Down Expand Up @@ -33,7 +33,9 @@ let package = Package(
.package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.0"),
.package(url: "https://github.com/apple/swift-asn1.git", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-crypto.git", from: "3.5.0"),
.package(url: "https://github.com/apple/swift-homomorphic-encryption", from: "1.0.0"),
.package(
url: "https://github.com/apple/swift-homomorphic-encryption",
revision: "7091583923d9e25ec760e8479b56f6aefd7fa6d5"),
.package(url: "https://github.com/apple/swift-protobuf.git", from: "1.27.0"),
.package(url: "https://github.com/hummingbird-project/hummingbird", from: "2.0.0"),
.package(url: "https://github.com/hummingbird-project/hummingbird-compression", from: "2.0.0-rc.2"),
Expand Down Expand Up @@ -91,6 +93,6 @@ let package = Package(
#if canImport(Darwin)
// Set the minimum macOS version for the package
package.platforms = [
.macOS(.v14), // Constrained by Swift 5.10 support for Xcode (https://developer.apple.com/support/xcode/)
.macOS(.v15), // Constrained by swift-homomorphic-encryption
]
#endif
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The documentation lives at [Swift Package Index](https://swiftpackageindex.com/a
Building Live Caller ID Lookup Example requires:
* 64-bit processor with little-endian memory representation
* macOS or Linux operating system
* [Swift](https://www.swift.org/) version 5.10 or later
* [Swift](https://www.swift.org/) version 6.0 or later

Additionally, developing Live Caller ID Lookup Example requires:
* [Nick Lockwood SwiftFormat](https://github.com/nicklockwood/SwiftFormat)
Expand Down
9 changes: 0 additions & 9 deletions Sources/PIRService/Controllers/PrivacyPassController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#if canImport(Darwin)
import Foundation
#else
// Foundation.URL is not Sendable
@preconcurrency import Foundation
#endif
import Hummingbird
import PrivacyPass

Expand Down Expand Up @@ -50,11 +45,7 @@ struct PrivacyPassController<UserAuthenticator: UserTokenAuthenticator> {
}
// swiftlint:disable:next force_unwrapping
let issuerRequestUri = URL(string: "/issue")!
#if canImport(Darwin)
return TokenIssuerDirectory(issuerRequestUri: issuerRequestUri, tokenKeys: tokenKeys)
#else
return await TokenIssuerDirectory(issuerRequestUri: issuerRequestUri, tokenKeys: tokenKeys)
#endif
}

@Sendable
Expand Down
5 changes: 0 additions & 5 deletions Sources/PrivacyPass/TokenIssuerDirectory.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#if canImport(Darwin)
import Foundation
#else
// Foundation.URL is not Sendable
@preconcurrency import Foundation
#endif

/// Token issuer directory hold the list of all public keys supported by the issuer.
///
Expand Down