Skip to content

ContainerRegistry: Unconditionally depend on swift-crypto #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 24, 2024
Merged

ContainerRegistry: Unconditionally depend on swift-crypto #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,16 @@ let package = Package(
.target(
name: "ContainerRegistry",
dependencies: [
.product(name: "Crypto", package: "swift-crypto", condition: .when(platforms: [.linux])),
.target(name: "Basics"), .product(name: "Crypto", package: "swift-crypto"),
.product(name: "HTTPTypes", package: "swift-http-types"),
.product(name: "HTTPTypesFoundation", package: "swift-http-types"),
.target(
name: "Basics" // AuthorizationProvider
),
]
),
.executableTarget(
name: "containertool",
dependencies: [
.product(name: "ArgumentParser", package: "swift-argument-parser"),
.product(name: "Crypto", package: "swift-crypto", condition: .when(platforms: [.linux])),
.target(name: "ContainerRegistry"), .target(name: "VendorCNIOExtrasZlib"),
.product(name: "ArgumentParser", package: "swift-argument-parser"),
],
swiftSettings: [.swiftLanguageMode(.v5)]
),
Expand Down
5 changes: 0 additions & 5 deletions Sources/ContainerRegistry/Blobs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,7 @@

import Foundation
import HTTPTypes

#if canImport(CryptoKit)
import CryptoKit
#else
import Crypto
#endif

/// Calculates the digest of a blob of data.
/// - Parameter data: Blob of data to digest.
Expand Down
5 changes: 0 additions & 5 deletions Sources/ContainerRegistry/ImageManifest+Digest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,7 @@
//===----------------------------------------------------------------------===//

import Foundation

#if canImport(CryptoKit)
import CryptoKit
#else
import Crypto
#endif

public extension ImageManifest {
var digest: String {
Expand Down