Add dedicated settings flags for swift warnings

Seperate warning and errors
Add tests
Update test case, passing in argument
Update the target swift version
Update test case pattern

Author: swiftlysingh

Sources/SWBCore/Settings/BuiltinMacros.swift

@@ -1017,6 +1017,8 @@ public final class BuiltinMacros {
     public static let SWIFT_LTO = BuiltinMacros.declareEnumMacro("SWIFT_LTO") as EnumMacroDeclaration<LTOSetting>
     public static let SWIFT_MODULE_NAME = BuiltinMacros.declareStringMacro("SWIFT_MODULE_NAME")
     public static let SWIFT_MODULE_ALIASES = BuiltinMacros.declareStringListMacro("SWIFT_MODULE_ALIASES")
+    public static let SWIFT_WARNINGS_AS_WARNINGS_GROUPS = BuiltinMacros.declareStringListMacro("SWIFT_WARNINGS_AS_WARNINGS_GROUPS")
+    public static let SWIFT_WARNINGS_AS_ERRORS_GROUPS = BuiltinMacros.declareStringListMacro("SWIFT_WARNINGS_AS_ERRORS_GROUPS")
     public static let SWIFT_OBJC_BRIDGING_HEADER = BuiltinMacros.declareStringMacro("SWIFT_OBJC_BRIDGING_HEADER")
     public static let SWIFT_OBJC_INTERFACE_HEADER_NAME = BuiltinMacros.declareStringMacro("SWIFT_OBJC_INTERFACE_HEADER_NAME")
     public static let SWIFT_OBJC_INTERFACE_HEADER_DIR = BuiltinMacros.declareStringMacro("SWIFT_OBJC_INTERFACE_HEADER_DIR")
@@ -2164,6 +2166,8 @@ public final class BuiltinMacros {
         SWIFT_LIBRARY_PATH,
         SWIFT_LTO,
         SWIFT_MODULE_ALIASES,
+        SWIFT_WARNINGS_AS_WARNINGS_GROUPS,
+        SWIFT_WARNINGS_AS_ERRORS_GROUPS,
         SWIFT_MODULE_NAME,
         SWIFT_MODULE_ONLY_ARCHS,
         SWIFT_MODULE_ONLY_MACOSX_DEPLOYMENT_TARGET,

Sources/SWBProjectModel/PIFGenerationModel.swift

@@ -1023,6 +1023,8 @@ public enum PIF {
         public var SWIFT_INSTALL_OBJC_HEADER: String?
         public var SWIFT_LOAD_BINARY_MACROS: [String]?
         public var SWIFT_MODULE_ALIASES: [String]?
+        public var SWIFT_WARNINGS_AS_WARNINGS_GROUPS: [String]?
+        public var SWIFT_WARNINGS_AS_ERRORS_GROUPS: [String]?
         public var SWIFT_OBJC_INTERFACE_HEADER_NAME: String?
         public var SWIFT_OBJC_INTERFACE_HEADER_DIR: String?
         public var SWIFT_OPTIMIZATION_LEVEL: String?

Sources/SWBUniversalPlatform/Specs/Swift.xcspec

@@ -202,6 +202,24 @@
                 DefaultValue = "";
                 CommandLineFlag = "-module-alias";
             },
+            {
+                Name = "SWIFT_WARNINGS_AS_WARNINGS_GROUPS";
+                Type = StringList;
+                DefaultValue = "";
+                Category = BuildOptions;
+                DisplayName = "Diagnostic Groups Remain Warnings";
+                Description = "Specify diagnostic groups that should remain warnings (format: '<group>')";
+                CommandLineFlag = "-Wwarning";
+            },
+            {
+                Name = "SWIFT_WARNINGS_AS_ERRORS_GROUPS";
+                Type = StringList;
+                DefaultValue = "";
+                Category = BuildOptions;
+                DisplayName = "Diagnostic Groups Treated as Errors";
+                Description = "Specify diagnostic groups that should be treated as errors (format: '<group>')";
+                CommandLineFlag = "-Werror";
+            },
             {
                 Name = "SWIFT_OBJC_BRIDGING_HEADER";
                 Type = String;

Sources/SwiftBuild/ProjectModel/BuildSettings.swift

@@ -124,6 +124,8 @@ extension ProjectModel {
             case SWIFT_ACTIVE_COMPILATION_CONDITIONS
             case SWIFT_IMPLEMENTS_MACROS_FOR_MODULE_NAMES
             case SWIFT_MODULE_ALIASES
+            case SWIFT_WARNINGS_AS_WARNINGS_GROUPS
+            case SWIFT_WARNINGS_AS_ERRORS_GROUPS
         }
 
         public enum Declaration: String, Hashable, CaseIterable, Sendable {

Tests/SWBTaskConstructionTests/SwiftTaskConstructionTests.swift

@@ -3917,6 +3917,94 @@ fileprivate struct SwiftTaskConstructionTests: CoreBasedTests {
             results.checkNoDiagnostics()
         }
     }
+
+    @Test(.requireSDKs(.host))
+    func warningAsWarningsGroups() async throws {
+        try await withTemporaryDirectory { tmpDir in
+            let testProject = try await TestProject(
+                "ProjectName",
+                sourceRoot: tmpDir.join("srcroot"),
+                groupTree: TestGroup(
+                    "SomeFiles",
+                    children: [
+                        TestFile("File1.swift"),
+                    ]),
+                targets: [
+                    TestStandardTarget(
+                        "TargetName",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug", buildSettings: [
+                                "SWIFT_WARNINGS_AS_WARNINGS_GROUPS": "Unsafe DeprecatedDeclaration",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "CODE_SIGN_IDENTITY": ""
+                            ]),
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase([
+                                TestBuildFile("File1.swift"),
+                            ]),
+                        ])
+                ])
+
+            let tester = try await TaskConstructionTester(getCore(), testProject)
+
+            try await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["SWIFT_VERSION": swiftVersion])) { results in
+                results.checkTarget("TargetName") { target in
+                    results.checkTask(.matchTarget(target), .matchRuleType("SwiftDriver Compilation")) { task in
+                        task.checkCommandLineContains([
+                            "-Wwarning", "Unsafe",
+                            "-Wwarning", "DeprecatedDeclaration"
+                        ])
+                    }
+                }
+            }
+        }
+    }
+
+    @Test(.requireSDKs(.host))
+    func warningAsErrorsGroups() async throws {
+        try await withTemporaryDirectory { tmpDir in
+            let testProject = try await TestProject(
+                "ProjectName",
+                sourceRoot: tmpDir.join("srcroot"),
+                groupTree: TestGroup(
+                    "SomeFiles",
+                    children: [
+                        TestFile("File1.swift"),
+                    ]),
+                targets: [
+                    TestStandardTarget(
+                        "TargetName",
+                        type: .framework,
+                        buildConfigurations: [
+                            TestBuildConfiguration("Debug", buildSettings: [
+                                "SWIFT_WARNINGS_AS_ERRORS_GROUPS": "UnknownWarningGroup PreconcurrencyImport",
+                                "SWIFT_EXEC": swiftCompilerPath.str,
+                                "CODE_SIGN_IDENTITY": ""
+                            ]),
+                        ],
+                        buildPhases: [
+                            TestSourcesBuildPhase([
+                                TestBuildFile("File1.swift"),
+                            ]),
+                        ])
+                ])
+
+            let tester = try await TaskConstructionTester(getCore(), testProject)
+
+            try await tester.checkBuild(BuildParameters(configuration: "Debug", overrides: ["SWIFT_VERSION": swiftVersion])) { results in
+                results.checkTarget("TargetName") { target in
+                    results.checkTask(.matchTarget(target), .matchRuleType("SwiftDriver Compilation")) { task in
+                        task.checkCommandLineContains([
+                            "-Werror", "UnknownWarningGroup",
+                            "-Werror","PreconcurrencyImport"
+                        ])
+                    }
+                }
+            }
+        }
+    }
 }
 
 private func XCTAssertEqual(_ lhs: EnvironmentBindings, _ rhs: [String: String], file: StaticString = #filePath, line: UInt = #line) {