[NFC] Remove SupportedPlatforms, add PlatformVersionProvider
#7161
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| //===----------------------------------------------------------------------===// | ||
| // | ||
| // This source file is part of the Swift open source project | ||
| // | ||
| // Copyright (c) 2014-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 | ||
| // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| import struct PackageModel.MinimumDeploymentTarget | ||
| import struct PackageModel.Platform | ||
| import struct PackageModel.PlatformVersion | ||
| import struct PackageModel.SupportedPlatform | ||
|
|
||
| /// Merging two sets of supported platforms, preferring the max constraint | ||
| func merge(into partial: inout [SupportedPlatform], platforms: [SupportedPlatform]) { | ||
| for platformSupport in platforms { | ||
| if let existing = partial.firstIndex(where: { $0.platform == platformSupport.platform }) { | ||
| if partial[existing].version < platformSupport.version { | ||
| partial.remove(at: existing) | ||
| partial.append(platformSupport) | ||
| } | ||
| } else { | ||
| partial.append(platformSupport) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public struct PlatformVersionProvider: Hashable { | ||
| public enum Implementation: Hashable { | ||
| case mergingFromTargets([ResolvedTarget]) | ||
| case customXCTestMinimumDeploymentTargets([PackageModel.Platform: PlatformVersion]?) | ||
| case empty | ||
| } | ||
|
|
||
| private let implementation: Implementation | ||
|
|
||
| public init(implementation: Implementation) { | ||
| self.implementation = implementation | ||
| } | ||
|
|
||
| func derivedXCTestPlatformProvider(_ declared: PackageModel.Platform) -> PlatformVersion? { | ||
| switch implementation { | ||
| case .mergingFromTargets(let targets): | ||
| let platforms = targets.reduce(into: [SupportedPlatform]()) { partial, item in | ||
| merge(into: &partial, platforms: [item.getDerived(for: declared, usingXCTest: item.type == .test)]) | ||
| } | ||
| return platforms.first!.version | ||
|
|
||
| case .customXCTestMinimumDeploymentTargets(let customXCTestMinimumDeploymentTargets): | ||
|
Contributor
There was a problem hiding this comment. Since we are creating the implementation enum here, I wonder if we should make custom and default two separate cases?
Contributor
Author
There was a problem hiding this comment. Good catch, I also found that |
||
| if let customXCTestMinimumDeploymentTargets { | ||
| return customXCTestMinimumDeploymentTargets[declared] | ||
| } else { | ||
| return MinimumDeploymentTarget.default.computeXCTestMinimumDeploymentTarget(for: declared) | ||
| } | ||
|
|
||
| case .empty: | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| /// Returns the supported platform instance for the given platform. | ||
| func getDerived(declared: [SupportedPlatform], for platform: Platform, usingXCTest: Bool) -> SupportedPlatform { | ||
| // derived platform based on known minimum deployment target logic | ||
| if let declaredPlatform = declared.first(where: { $0.platform == platform }) { | ||
| var version = declaredPlatform.version | ||
|
|
||
| if usingXCTest, let xcTestMinimumDeploymentTarget = self.derivedXCTestPlatformProvider(platform), version < xcTestMinimumDeploymentTarget { | ||
| version = xcTestMinimumDeploymentTarget | ||
| } | ||
|
|
||
| // If the declared version is smaller than the oldest supported one, we raise the derived version to that. | ||
| if version < platform.oldestSupportedVersion { | ||
| version = platform.oldestSupportedVersion | ||
| } | ||
|
|
||
| return SupportedPlatform( | ||
| platform: declaredPlatform.platform, | ||
| version: version, | ||
| options: declaredPlatform.options | ||
| ) | ||
| } else { | ||
| let minimumSupportedVersion: PlatformVersion | ||
| if usingXCTest, let xcTestMinimumDeploymentTarget = self.derivedXCTestPlatformProvider(platform), xcTestMinimumDeploymentTarget > platform.oldestSupportedVersion { | ||
| minimumSupportedVersion = xcTestMinimumDeploymentTarget | ||
| } else { | ||
| minimumSupportedVersion = platform.oldestSupportedVersion | ||
| } | ||
|
|
||
| let oldestSupportedVersion: PlatformVersion | ||
| if platform == .macCatalyst { | ||
| let iOS = self.getDerived(declared: declared, for: .iOS, usingXCTest: usingXCTest) | ||
| // If there was no deployment target specified for Mac Catalyst, fall back to the iOS deployment target. | ||
| oldestSupportedVersion = max(minimumSupportedVersion, iOS.version) | ||
| } else { | ||
| oldestSupportedVersion = minimumSupportedVersion | ||
| } | ||
|
|
||
| return SupportedPlatform( | ||
| platform: platform, | ||
| version: oldestSupportedVersion, | ||
| options: [] | ||
| ) | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.