Skip to content
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

Jump to bottom

[5.9] Add PackageDescription platform constants for the 2023 Apple OS versions #6637

Merged
merged 1 commit into from Jun 6, 2023
Merged

[5.9] Add PackageDescription platform constants for the 2023 Apple OS versions #6637

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 37 additions & 1 deletion Sources/PackageDescription/SupportedPlatforms.swift
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
//
// This source file is part of the Swift open source project
//
// Copyright (c) 2018-2022 Apple Inc. and the Swift project authors
// Copyright (c) 2018-2023 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
Expand Down Expand Up @@ -336,6 +336,12 @@ extension SupportedPlatform {
/// - Since: First available in PackageDescription 5.7.
@available(_PackageDescription, introduced: 5.7)
public static let v13: MacOSVersion = .init(string: "13.0")

/// The value that represents macOS 14.0.
///
/// - Since: First available in PackageDescription 5.9.
@available(_PackageDescription, introduced: 5.9)
public static let v14: MacOSVersion = .init(string: "14.0")
}

/// The supported tvOS version.
Expand Down Expand Up @@ -397,6 +403,12 @@ extension SupportedPlatform {
/// - Since: First available in PackageDescription 5.7.
@available(_PackageDescription, introduced: 5.7)
public static let v16: TVOSVersion = .init(string: "16.0")

/// The value that represents tvOS 17.0.
///
/// - Since: First available in PackageDescription 5.9.
@available(_PackageDescription, introduced: 5.9)
public static let v17: TVOSVersion = .init(string: "17.0")
}

/// The supported Mac Catalyst version.
Expand Down Expand Up @@ -434,6 +446,12 @@ extension SupportedPlatform {
/// - Since: First available in PackageDescription 5.7.
@available(_PackageDescription, introduced: 5.7)
public static let v16: MacCatalystVersion = .init(string: "16.0")

/// The value that represents Mac Catalyst 17.0.
///
/// - Since: First available in PackageDescription 5.9.
@available(_PackageDescription, introduced: 5.9)
public static let v17: MacCatalystVersion = .init(string: "17.0")
}

/// The supported iOS version.
Expand Down Expand Up @@ -501,6 +519,12 @@ extension SupportedPlatform {
/// - Since: First available in PackageDescription 5.7.
@available(_PackageDescription, introduced: 5.7)
public static let v16: IOSVersion = .init(string: "16.0")

/// The value that represents iOS 17.0.
///
/// - Since: First available in PackageDescription 5.9.
@available(_PackageDescription, introduced: 5.9)
public static let v17: IOSVersion = .init(string: "17.0")
}

/// The supported watchOS version.
Expand Down Expand Up @@ -562,6 +586,12 @@ extension SupportedPlatform {
/// - Since: First available in PackageDescription 5.7.
@available(_PackageDescription, introduced: 5.7)
public static let v9: WatchOSVersion = .init(string: "9.0")

/// The value that represents watchOS 10.0.
///
/// - Since: First available in PackageDescription 5.9.
@available(_PackageDescription, introduced: 5.9)
public static let v10: WatchOSVersion = .init(string: "10.0")
}

/// The supported DriverKit version.
Expand Down Expand Up @@ -599,6 +629,12 @@ extension SupportedPlatform {
/// - Since: First available in PackageDescription 5.7.
@available(_PackageDescription, introduced: 5.7)
public static let v22: DriverKitVersion = .init(string: "22.0")

/// The value that represents DriverKit 23.0.
///
/// - Since: First available in PackageDescription 5.9.
@available(_PackageDescription, introduced: 5.9)
public static let v23: DriverKitVersion = .init(string: "23.0")
}

/// A supported custom platform version.
Expand Down
28 changes: 28 additions & 0 deletions Tests/PackageLoadingTests/PD_5_9_LoadingTests.swift
View file
Open in desktop
Expand Up @@ -21,6 +21,34 @@ class PackageDescription5_9LoadingTests: PackageDescriptionLoadingTests {
.v5_9
}

func testPlatforms() throws {
let content = """
import PackageDescription
let package = Package(
name: "Foo",
platforms: [
.macOS(.v14), .iOS(.v17),
.tvOS(.v17), .watchOS(.v10),
.macCatalyst(.v17), .driverKit(.v23),
]
)
"""

let observability = ObservabilitySystem.makeForTesting()
let (manifest, validationDiagnostics) = try loadAndValidateManifest(content, observabilityScope: observability.topScope)
XCTAssertNoDiagnostics(observability.diagnostics)
XCTAssertNoDiagnostics(validationDiagnostics)

XCTAssertEqual(manifest.platforms, [
PlatformDescription(name: "macos", version: "14.0"),
PlatformDescription(name: "ios", version: "17.0"),
PlatformDescription(name: "tvos", version: "17.0"),
PlatformDescription(name: "watchos", version: "10.0"),
PlatformDescription(name: "maccatalyst", version: "17.0"),
PlatformDescription(name: "driverkit", version: "23.0"),
])
}

func testMacroTargets() throws {
let content = """
import CompilerPluginSupport
Expand Down
12 changes: 6 additions & 6 deletions Tests/WorkspaceTests/ManifestSourceGenerationTests.swift
View file
Open in desktop
Expand Up @@ -433,12 +433,12 @@ class ManifestSourceGenerationTests: XCTestCase {
let package = Package(
name: "MyPackage",
platforms: [
.macOS(.v13),
.iOS(.v16),
.tvOS(.v16),
.watchOS(.v9),
.macCatalyst(.v16),
.driverKit(.v22)
.macOS(.v14),
.iOS(.v17),
.tvOS(.v17),
.watchOS(.v10),
.macCatalyst(.v17),
.driverKit(.v23)
],
targets: [
]
Expand Down