Merge pull request #3803 from SwiftPackageIndex/add-new-platforms

Add Wasm and Android platforms

Author: finestructure

Package.resolved

@@ -32,7 +32,7 @@ let package = Package(
         .package(url: "https://github.com/SwiftPackageIndex/Plot.git", branch: "main"),
         .package(url: "https://github.com/SwiftPackageIndex/CanonicalPackageURL.git", from: "1.0.0"),
         .package(url: "https://github.com/SwiftPackageIndex/DependencyResolution.git", from: "1.1.2"),
-        .package(url: "https://github.com/SwiftPackageIndex/SPIManifest.git", from: "1.2.0"),
+        .package(url: "https://github.com/SwiftPackageIndex/SPIManifest.git", from: "1.9.0"),
         .package(url: "https://github.com/SwiftPackageIndex/SemanticVersion.git", from: "0.3.0"),
         .package(url: "https://github.com/SwiftPackageIndex/ShellOut.git", from: "3.1.4"),
         .package(url: "https://github.com/swiftlang/swift-package-manager.git", branch: "release/6.1"),

Package.swift

@@ -383,11 +383,17 @@ struct BuildPair {
     static let all = Build.Platform.allActive.flatMap { platform in
         SwiftVersion.allActive.compactMap { swiftVersion in
             switch platform {
+                case .android:
+                    // Android is supported from Swift version 6.1+
+                    return swiftVersion >= .v6_1 ? BuildPair(platform, swiftVersion) : nil
                 case .iOS, .linux, .macosSpm, .macosXcodebuild, .tvOS, .watchOS:
                     return BuildPair(platform, swiftVersion)
                 case .visionOS:
                     // visionOS is only available for Swift versions 5.9+
                     return swiftVersion >= .v5_9 ? BuildPair(platform, swiftVersion) : nil
+                case .wasm:
+                    // Android is supported from Swift version 6.1+
+                    return swiftVersion >= .v6_1 ? BuildPair(platform, swiftVersion) : nil
             }
         }
     }

Sources/App/Commands/TriggerBuilds.swift

@@ -36,6 +36,8 @@ extension CompatibilityMatrix {
         case watchOS
         case tvOS
         case linux
+        case wasm
+        case android
 
         static func <(lhs: Self, rhs: Self) -> Bool { allCases.firstIndex(of: lhs)! < allCases.firstIndex(of: rhs)! }
     }

Sources/App/Controllers/CompatibilityMatrix.swift

@@ -51,12 +51,16 @@ extension Array where Element == PackageController.BuildsRoute.BuildInfo {
 extension Build.Platform {
     func isCompatible(with other: CompatibilityMatrix.Platform) -> Bool {
         switch self {
+            case .android:
+                return other == .android
             case .iOS:
                 return other == .iOS
             case .macosSpm, .macosXcodebuild:
                 return other == .macOS
             case .tvOS:
                 return other == .tvOS
+            case .wasm:
+                return other == .wasm
             case .watchOS:
                 return other == .watchOS
             case .visionOS:

Sources/App/Controllers/PackageController+ShowRoute.swift

@@ -124,6 +124,10 @@ extension Badge {
                                 return .init(left: 4, right: "watchOS")
                             case .linux:
                                 return .init(left: 5, right: "Linux")
+                            case .wasm:
+                                return .init(left: 6, right: "Wasm")
+                            case .android:
+                                return .init(left: 7, right: "Android")
                         }
                     }
                 )

Sources/App/Core/Extensions/Badge.swift

@@ -32,6 +32,10 @@ extension BuildPair {
                 return .visionOS
             case .watchOS:
                 return .watchOS
+            case .wasm:
+                return .wasm
+            case .android:
+                return .android
         }
     }
 

Sources/App/Core/Extensions/BuildPair+ext.swift

@@ -296,7 +296,7 @@ extension Array where Element == PackageCollection.Compatibility {
 private extension PackageCollection.Platform {
     init(platform: Build.Platform) {
         switch platform {
-            case .iOS, .tvOS, .visionOS, .watchOS, .linux:
+            case .android, .iOS, .tvOS, .visionOS, .watchOS, .linux, .wasm:
                 self.init(name: platform.rawValue)
             case .macosSpm, .macosXcodebuild:
                 self.init(name: "macos")

Sources/App/Core/PackageCollection+generate.swift

@@ -57,6 +57,8 @@ struct PlatformSearchFilter: SearchFilterProtocol {
 private extension Package.PlatformCompatibility {
     var displayDescription: String {
         switch self {
+            case .android:
+                return "Android"
             case .iOS:
                 return "iOS"
             case .macOS:
@@ -67,6 +69,8 @@ private extension Package.PlatformCompatibility {
                 return "tvOS"
             case .visionOS:
                 return "visionOS"
+            case .wasm:
+                return "Wasm"
             case .watchOS:
                 return "watchOS"
         }

Sources/App/Core/SearchFilter/Filters/PlatformSearchFilter.swift

@@ -17,57 +17,67 @@ import SPIManifest
 
 extension Build {
     enum Platform: String, Codable, Equatable, CaseIterable {
+        case android
         case iOS                = "ios"
         case linux
         case macosSpm           = "macos-spm"
         case macosXcodebuild    = "macos-xcodebuild"
         case tvOS               = "tvos"
         case visionOS           = "visionos"
+        case wasm
         case watchOS            = "watchos"
 
         var name: String {
             switch self {
+                case .android:
+                    return "Android"
                 case .iOS:
                     return "iOS"
+                case .linux:
+                    return "Linux"
                 case .macosSpm:
                     return "macOS - SPM"
                 case .macosXcodebuild:
                     return "macOS - xcodebuild"
                 case .tvOS:
                     return "tvOS"
+                case .wasm:
+                    return "Wasm"
                 case .watchOS:
                     return "watchOS"
                 case .visionOS:
                     return "visionOS"
-                case .linux:
-                    return "Linux"
             }
         }
 
         var displayName: String {
             switch self {
+                case .android:
+                    return "Android"
                 case .iOS:
                     return "iOS"
+                case .linux:
+                    return "Linux"
                 case .macosSpm:
                     return "macOS (SPM)"
                 case .macosXcodebuild:
                     return "macOS (Xcode)"
                 case .tvOS:
                     return "tvOS"
+                case .wasm:
+                    return "Wasm"
                 case .watchOS:
                     return "watchOS"
                 case .visionOS:
                     return "visionOS"
-                case .linux:
-                    return "Linux"
             }
         }
 
         /// Currently supported build platforms
         static var allActive: [Self] {
             // The order of this array defines the platform order on the BuildIndex page. Keep this aliged with the
             // order in GetRoute.Model.PlatformResults (which is the order in the build matrix on the PackageShow page).
-            let active: [Self] = [.iOS, .macosSpm, .macosXcodebuild, .visionOS, .tvOS, .watchOS, .linux]
+            let active: [Self] = [.iOS, .macosSpm, .macosXcodebuild, .visionOS, .tvOS, .watchOS, .linux, .wasm, .android]
             assert(active.count == allCases.count, "mismatch in Build.Platform and active platform count")
             return active
         }
@@ -78,6 +88,8 @@ extension Build {
         /// - Parameter spiManifestPlatform: SPIManifest platform
         private init(_ spiManifestPlatform: SPIManifest.Platform) {
             switch spiManifestPlatform {
+                case .android:
+                    self = .android
                 case .iOS:
                     self = .iOS
                 case .linux:
@@ -90,6 +102,8 @@ extension Build {
                     self = .tvOS
                 case .visionOS:
                     self = .visionOS
+                case .wasm:
+                    self = .wasm
                 case .watchOS:
                     self = .watchOS
             }