Skip to content

Use the new warning control instead of unsafeFlags #1882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 29, 2025
Merged

Use the new warning control instead of unsafeFlags #1882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.10
// swift-tools-version:6.2
Copy link
Collaborator

@allevato allevato Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will cause everything to compile in Swift 6 language mode as well, right? That's probably fine (if we've fixed all the relevant issues), but should we add in swiftLanguageModes: [.v5] for now so that we don't change the language mode as part of an otherwise unrelated change, and then we can go back and audit it for Swift 6 support later?

Copy link
Contributor

@Lukasa Lukasa Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds sensible to me.

Copy link
Member Author

@FranzBusch FranzBusch Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was aware and wanted to see what the CI says. It looks like we are compiling cleanly in Swift 6 mode. I will change it back to Swift 5 mode for now.

Copy link
Member Author

@FranzBusch FranzBusch Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just when I wrote this comment I saw that we are actually setting the language mode already in all of our manifests.

Copy link
Collaborator

@allevato allevato Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well that's what I get for not expanding the diff far enough.


// Package.swift
//
Expand Down Expand Up @@ -350,10 +350,8 @@ let package = Package(
"protobuf/upb_generator/minitable/names_internal.cc",
],
cSettings: [
.unsafeFlags([
"-Wno-conversion",
"-Wno-deprecated-declarations",
])
.disableWarning("conversion"),
.disableWarning("deprecated-declarations"),
],
cxxSettings: [
.headerSearchPath("abseil/"),
Expand All @@ -363,10 +361,8 @@ let package = Package(
.headerSearchPath("protobuf/upb/"),
.headerSearchPath("protobuf/upb_generator/"),
.define("UPB_BOOTSTRAP_STAGE", to: "0"),
.unsafeFlags([
"-Wno-conversion",
"-Wno-deprecated-declarations",
]),
.disableWarning("conversion"),
.disableWarning("deprecated-declarations"),
],
linkerSettings: [
.linkedFramework(
Expand Down
Loading