Skip to content

Bump SwiftPM's minimum deployment target to macOS 12 #6138

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
Apr 13, 2023
Merged

Bump SwiftPM's minimum deployment target to macOS 12 #6138

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
4 changes: 2 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ packageCollectionsSigningTargets.append(
let package = Package(
name: "SwiftPM",
platforms: [
.macOS("10.15.4"),
.iOS("13.4")
.macOS("12.0"),
.iOS("15.0")
],
products:
autoProducts.flatMap {
Expand Down
2 changes: 0 additions & 2 deletions Sources/Basics/Netrc.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import Foundation
import TSCBasic

/// Representation of Netrc configuration
@available (macOS 10.13, iOS 11, tvOS 11, watchOS 4, *)
public struct Netrc {
/// Representation of `machine` connection settings & `default` connection settings.
/// If `default` connection settings present, they will be last element.
Expand Down Expand Up @@ -140,7 +139,6 @@ public enum NetrcError: Error, Equatable {
case invalidDefaultMachinePosition
}

@available (macOS 10.13, iOS 11, tvOS 11, watchOS 4, *)
fileprivate enum RegexUtil {
@frozen fileprivate enum Token: String, CaseIterable {
case machine, login, password, account, macdef, `default`
Expand Down
3 changes: 0 additions & 3 deletions Sources/Workspace/Workspace.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,7 +1073,6 @@ extension Workspace {
}

/// Loads and returns manifests at the given paths.
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
public func loadRootManifests(packages: [AbsolutePath], observabilityScope: ObservabilityScope) async throws -> [AbsolutePath: Manifest] {
return try await withCheckedThrowingContinuation{ continuation in
self.loadRootManifests(packages: packages, observabilityScope: observabilityScope) { result in
Expand Down Expand Up @@ -1124,7 +1123,6 @@ extension Workspace {
}

/// Loads and returns manifest at the given path.
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
public func loadRootManifest(at path: AbsolutePath, observabilityScope: ObservabilityScope) async throws -> Manifest {
return try await withCheckedThrowingContinuation{ continuation in
self.loadRootManifest(at: path, observabilityScope: observabilityScope) { result in
Expand Down Expand Up @@ -1155,7 +1153,6 @@ extension Workspace {
}

/// Loads root package
@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
public func loadRootPackage(at path: AbsolutePath, observabilityScope: ObservabilityScope) async throws -> Package {
return try await withCheckedThrowingContinuation{ continuation in
self.loadRootPackage(at: path, observabilityScope: observabilityScope) { result in
Expand Down
1 change: 0 additions & 1 deletion Tests/BasicsTests/NetrcTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import XCTest

/// Netrc feature depends upon `NSTextCheckingResult.range(withName name: String) -> NSRange`,
/// which is only available in macOS 10.13+ at this time.
@available(macOS 10.13, iOS 11, tvOS 11, watchOS 4, *)
class NetrcTests: XCTestCase {
/// should load machines for a given inline format
func testLoadMachinesInline() throws {
Expand Down
2 changes: 1 addition & 1 deletion Utilities/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import shutil
import subprocess
from helpers import note, error, symlink_force, mkdir_p, call, call_output

g_macos_deployment_target = '10.15'
g_macos_deployment_target = '12.0'

g_shared_lib_prefix = "lib"
if platform.system() == 'Darwin':
Expand Down