Skip to content

Commit 477935a

Browse files
committed
Sort cases in PlatformRegistry, use init in PackageBuilder
1 parent 6dab954 commit 477935a

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

Sources/PackageLoading/PackageBuilder.swift

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,8 +1149,7 @@ public final class PackageBuilder {
11491149
var conditions: [PackageCondition] = []
11501150

11511151
if let config = condition?.config.flatMap({ BuildConfiguration(rawValue: $0) }) {
1152-
let condition = PackageCondition(configuration: config)
1153-
conditions.append(condition)
1152+
conditions.append(.init(configuration: config))
11541153
}
11551154

11561155
if let platforms = condition?.platformNames.map({
@@ -1159,11 +1158,9 @@ public final class PackageBuilder {
11591158
} else {
11601159
return PackageModel.Platform.custom(name: $0, oldestSupportedVersion: .unknown)
11611160
}
1162-
}),
1163-
!platforms.isEmpty
1161+
}), !platforms.isEmpty
11641162
{
1165-
let condition = PackageCondition(platforms: platforms)
1166-
conditions.append(condition)
1163+
conditions.append(.init(platforms: platforms))
11671164
}
11681165

11691166
return conditions

Sources/PackageModel/PlatformRegistry.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ public struct PlatformRegistry {
3131
/// The static list of known platforms.
3232
private static var _knownPlatforms: [Platform] {
3333
[
34+
.android,
35+
.driverKit,
36+
.iOS,
37+
.linux,
3438
.macOS,
3539
.macCatalyst,
36-
.iOS,
40+
.openbsd,
3741
.tvOS,
38-
.watchOS,
3942
.visionOS,
40-
.linux,
41-
.windows,
42-
.android,
4343
.wasi,
44-
.driverKit,
45-
.openbsd
44+
.watchOS,
45+
.windows,
4646
]
4747
}
4848
}

0 commit comments

Comments
 (0)