Skip to content
Open
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
12 changes: 12 additions & 0 deletions Fixtures/Miscellaneous/DumpPackage/PlayingCard/Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// swift-tools-version: 6.0
import PackageDescription

let package = Package(
name: "PlayingCard",
products: [
.library(name: "PlayingCard", targets: ["PlayingCard"]),
],
targets: [
.target(name: "PlayingCard", path: "src"),
]
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
public struct PlayingCard: Equatable {
let rank: Rank
let suit: Suit

public init(rank: Rank, suit: Suit) {
self.rank = rank
self.suit = suit
}
}

// MARK: - Comparable

extension PlayingCard: Comparable {}

public func <(lhs: PlayingCard, rhs: PlayingCard) -> Bool {
return lhs.suit < rhs.suit || (lhs.suit == rhs.suit && lhs.rank < rhs.rank)
}

// MARK: - CustomStringConvertible

extension PlayingCard : CustomStringConvertible {
public var description: String {
return "\(suit)\(rank)"
}
}
35 changes: 35 additions & 0 deletions Fixtures/Miscellaneous/DumpPackage/PlayingCard/src/Rank.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
public enum Rank : Int {
case Ace = 1
case Two, Three, Four, Five, Six, Seven, Eight, Nine, Ten
case Jack, Queen, King
}

// MARK: - Comparable

extension Rank : Comparable {}

public func <(lhs: Rank, rhs: Rank) -> Bool {
switch (lhs, rhs) {
case (_, _) where lhs == rhs:
return false
case (.Ace, _):
return false
default:
return lhs.rawValue < rhs.rawValue
}
}

// MARK: - CustomStringConvertible

extension Rank : CustomStringConvertible {
public var description: String {
switch self {
case .Ace: return "A"
case .Jack: return "J"
case .Queen: return "Q"
case .King: return "K"
default:
return "\(rawValue)"
}
}
}
33 changes: 33 additions & 0 deletions Fixtures/Miscellaneous/DumpPackage/PlayingCard/src/Suit.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
public enum Suit: String {
case Spades, Hearts, Diamonds, Clubs
}

// MARK: - Comparable

extension Suit: Comparable {}

public func <(lhs: Suit, rhs: Suit) -> Bool {
switch (lhs, rhs) {
case (_, _) where lhs == rhs:
return false
case (.Spades, _),
(.Hearts, .Diamonds), (.Hearts, .Clubs),
(.Diamonds, .Clubs):
return false
default:
return true
}
}

// MARK: - CustomStringConvertible

extension Suit : CustomStringConvertible {
public var description: String {
switch self {
case .Spades: return "♠︎"
case .Hearts: return ""
case .Diamonds: return ""
case .Clubs: return "♣︎"
}
}
}
23 changes: 23 additions & 0 deletions Fixtures/Miscellaneous/DumpPackage/app/Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// swift-tools-version: 6.0
import PackageDescription

let package = Package(
name: "Dealer",
defaultLocalization: "en",
platforms: [
.macOS(.v10_13),
.iOS(.v12),
.tvOS(.v12),
.watchOS(.v5)
],
dependencies: [
.package(path: "../PlayingCard"),
],
targets: [
.target(
name: "Dealer",
dependencies: ["PlayingCard"],
path: "./"
),
]
)
20 changes: 20 additions & 0 deletions Fixtures/Miscellaneous/DumpPackage/app/main.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
This source file is part of the Swift.org open source project

Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
Licensed under Apache License v2.0 with Runtime Library Exception

See http://swift.org/LICENSE.txt for license information
See http://swift.org/CONTRIBUTORS.txt for Swift project authors
*/

import PlayingCard

let hand: [PlayingCard] = [
.init(rank: .Ace, suit: .Hearts),
.init(rank: .King, suit: .Spades),
]

for card in hand {
print(card)
}
1 change: 1 addition & 0 deletions Sources/PackageModel/Manifest/Manifest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,7 @@ extension Manifest: Encodable {
}

try container.encode(self.toolsVersion, forKey: .toolsVersion)
try container.encode(self.defaultLocalization, forKey: .defaultLocalization)
try container.encode(self.pkgConfig, forKey: .pkgConfig)
try container.encode(self.providers, forKey: .providers)
try container.encode(self.cLanguageStandard, forKey: .cLanguageStandard)
Expand Down
18 changes: 12 additions & 6 deletions Tests/CommandsTests/PackageCommandTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,7 @@ struct PackageCommandTests {
func dumpPackage(
data: BuildData,
) async throws {
try await fixture(name: "DependencyResolution/External/Complex") { fixturePath in
try await fixture(name: "Miscellaneous/DumpPackage") { fixturePath in
let packageRoot = fixturePath.appending("app")
let (dumpOutput, _) = try await execute(
["dump-package"],
Expand All @@ -1000,29 +1000,34 @@ struct PackageCommandTests {
return
}
guard case .string(let name)? = contents["name"] else {
Issue.record("unexpected result")
Issue.record("unexpected name")
return
}
guard case .string(let defaultLocalization)? = contents["defaultLocalization"] else {
Issue.record("unexpected defaultLocalization")
return
}
guard case .array(let platforms)? = contents["platforms"] else {
Issue.record("unexpected result")
Issue.record("unexpected platforms")
return
}
#expect(name == "Dealer")
#expect(defaultLocalization == "en")
#expect(
platforms == [
.dictionary([
"platformName": .string("macos"),
"version": .string("10.12"),
"version": .string("10.13"),
"options": .array([]),
]),
.dictionary([
"platformName": .string("ios"),
"version": .string("10.0"),
"version": .string("12.0"),
"options": .array([]),
]),
.dictionary([
"platformName": .string("tvos"),
"version": .string("11.0"),
"version": .string("12.0"),
"options": .array([]),
]),
.dictionary([
Expand All @@ -1032,6 +1037,7 @@ struct PackageCommandTests {
]),
]
)
// FIXME: We should also test dependencies and targets here.
}
}

Expand Down