From a601d7d32efecb8143034d24b3c4d3e71881c049 Mon Sep 17 00:00:00 2001 From: Kyle Date: Mon, 6 Oct 2025 15:16:42 +0800 Subject: [PATCH] Disable Wwarning flag by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix external xcodeproj’s Conflicting options '-Wwarning' and '-suppress-warnings' issue --- Package.resolved | 2 +- Package.swift | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Package.resolved b/Package.resolved index 3ede887c1..6499b6007 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "106a21412583c15dcfc5506af42f485123fabe106be5887207958028611f2bb0", + "originHash" : "2c64b45620932621276e50344e6c5fe6c9d3f5504944717f976fdeef05f66bc5", "pins" : [ { "identity" : "darwinprivateframeworks", diff --git a/Package.swift b/Package.swift index 54349789f..7c82eb87c 100644 --- a/Package.swift +++ b/Package.swift @@ -60,7 +60,6 @@ var sharedSwiftSettings: [SwiftSetting] = [ .enableUpcomingFeature("BareSlashRegexLiterals"), .enableUpcomingFeature("InternalImportsByDefault"), .enableUpcomingFeature("InferSendableFromCaptures"), - .unsafeFlags(["-Wwarning", "DeprecatedDeclaration"]), // We want to use deprecated APIs in test targets // FIXME: -unavailable-decl-optimization=stub is not working somehow (eg. Color.vibrancy). Dig into this later .unsafeFlags(["-unavailable-decl-optimization=stub"]), .swiftLanguageMode(.v5), @@ -190,6 +189,12 @@ if warningsAsErrorsCondition { sharedSwiftSettings.append(.unsafeFlags(["-Werror", "Unsafe"])) sharedSwiftSettings.append(.unsafeFlags(["-Werror", "UnknownWarningGroup"])) sharedSwiftSettings.append(.unsafeFlags(["-Werror", "ExistentialAny"])) + + // This will cause conflict when used by Xcode from a non-local dependency + // "Conflicting options '-Wwarning' and '-suppress-warnings'" + // See: https://forums.swift.org/t/warnings-as-errors-in-sub-packages/70810 + // So do not enable it by default here. + sharedSwiftSettings.append(.unsafeFlags(["-Wwarning", "DeprecatedDeclaration"])) // We want to use deprecated APIs in test targets) } // MARK: - [env] OPENSWIFTUI_LIBRARY_EVOLUTION