Skip to content

Commit 7900312

Browse files
lmarceaulmarceau
authored
Refactor FXIOS-10790 [Swift 6 Migration] Turn on complete strict concurrency at project level (#31026)
* Project level flags * Version * Try it out enabled still * Revert "Try it out enabled still" This reverts commit 0465b49. * Change regex to detect warnings
1 parent 4647be9 commit 7900312

File tree

3 files changed

+22
-18
lines changed

3 files changed

+22
-18
lines changed

‎firefox-ios/Client.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27929,7 +27929,7 @@
2792927929
ENABLE_STRICT_OBJC_MSGSEND = YES;
2793027930
ENABLE_TESTABILITY = YES;
2793127931
FUSE_BUILD_SCRIPT_PHASES = YES;
27932-
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
27932+
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
2793327933
HEADER_SEARCH_PATHS = (
2793427934
"$(inherited)",
2793527935
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -27963,7 +27963,7 @@
2796327963
STRIP_PNG_TEXT = YES;
2796427964
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
2796527965
SWIFT_STRICT_CONCURRENCY = minimal;
27966-
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
27966+
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
2796727967
SWIFT_UPCOMING_FEATURE_CONCISE_MAGIC_FILE = YES;
2796827968
SWIFT_UPCOMING_FEATURE_DEPRECATE_APPLICATION_MAIN = YES;
2796927969
SWIFT_UPCOMING_FEATURE_DISABLE_OUTWARD_ACTOR_ISOLATION = YES;
@@ -28453,11 +28453,11 @@
2845328453
DEVELOPMENT_TEAM = 43AQ936H96;
2845428454
EAGER_LINKING = YES;
2845528455
FUSE_BUILD_SCRIPT_PHASES = YES;
28456-
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
28456+
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
2845728457
OTHER_SWIFT_FLAGS = "$(OTHER_SWIFT_FLAGS_common) -DMOZ_CHANNEL_developer";
2845828458
SWIFT_ACTIVE_COMPILATION_CONDITIONS = TESTING;
28459-
SWIFT_STRICT_CONCURRENCY = minimal;
28460-
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
28459+
SWIFT_STRICT_CONCURRENCY = complete;
28460+
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
2846128461
SWIFT_UPCOMING_FEATURE_CONCISE_MAGIC_FILE = YES;
2846228462
SWIFT_UPCOMING_FEATURE_DEPRECATE_APPLICATION_MAIN = YES;
2846328463
SWIFT_UPCOMING_FEATURE_DISABLE_OUTWARD_ACTOR_ISOLATION = YES;
@@ -29734,14 +29734,14 @@
2973429734
DEVELOPMENT_TEAM = 43AQ936H96;
2973529735
EAGER_LINKING = YES;
2973629736
FUSE_BUILD_SCRIPT_PHASES = YES;
29737-
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
29737+
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
2973829738
OTHER_LDFLAGS = (
2973929739
"$(inherited)",
2974029740
"-Xlinker",
2974129741
"-no_application_extension",
2974229742
);
2974329743
SWIFT_STRICT_CONCURRENCY = minimal;
29744-
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
29744+
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
2974529745
SWIFT_UPCOMING_FEATURE_CONCISE_MAGIC_FILE = YES;
2974629746
SWIFT_UPCOMING_FEATURE_DEPRECATE_APPLICATION_MAIN = YES;
2974729747
SWIFT_UPCOMING_FEATURE_DISABLE_OUTWARD_ACTOR_ISOLATION = YES;
@@ -30037,14 +30037,14 @@
3003730037
DEVELOPMENT_TEAM = 43AQ936H96;
3003830038
EAGER_LINKING = YES;
3003930039
FUSE_BUILD_SCRIPT_PHASES = YES;
30040-
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
30040+
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
3004130041
OTHER_LDFLAGS = (
3004230042
"$(inherited)",
3004330043
"-Xlinker",
3004430044
"-no_application_extension",
3004530045
);
30046-
SWIFT_STRICT_CONCURRENCY = minimal;
30047-
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
30046+
SWIFT_STRICT_CONCURRENCY = complete;
30047+
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
3004830048
SWIFT_UPCOMING_FEATURE_CONCISE_MAGIC_FILE = YES;
3004930049
SWIFT_UPCOMING_FEATURE_DEPRECATE_APPLICATION_MAIN = YES;
3005030050
SWIFT_UPCOMING_FEATURE_DISABLE_OUTWARD_ACTOR_ISOLATION = YES;
@@ -30343,15 +30343,15 @@
3034330343
DEVELOPMENT_TEAM = 43AQ936H96;
3034430344
EAGER_LINKING = YES;
3034530345
FUSE_BUILD_SCRIPT_PHASES = YES;
30346-
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
30346+
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
3034730347
MACOSX_DEPLOYMENT_TARGET = "";
3034830348
OTHER_LDFLAGS = (
3034930349
"$(inherited)",
3035030350
"-Xlinker",
3035130351
"-no_application_extension",
3035230352
);
3035330353
SWIFT_STRICT_CONCURRENCY = minimal;
30354-
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
30354+
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
3035530355
SWIFT_UPCOMING_FEATURE_CONCISE_MAGIC_FILE = YES;
3035630356
SWIFT_UPCOMING_FEATURE_DEPRECATE_APPLICATION_MAIN = YES;
3035730357
SWIFT_UPCOMING_FEATURE_DISABLE_OUTWARD_ACTOR_ISOLATION = YES;
@@ -30876,9 +30876,9 @@
3087630876
DEVELOPMENT_TEAM = 43AQ936H96;
3087730877
EAGER_LINKING = YES;
3087830878
FUSE_BUILD_SCRIPT_PHASES = YES;
30879-
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
30880-
SWIFT_STRICT_CONCURRENCY = minimal;
30881-
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
30879+
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
30880+
SWIFT_STRICT_CONCURRENCY = complete;
30881+
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
3088230882
SWIFT_UPCOMING_FEATURE_CONCISE_MAGIC_FILE = YES;
3088330883
SWIFT_UPCOMING_FEATURE_DEPRECATE_APPLICATION_MAIN = YES;
3088430884
SWIFT_UPCOMING_FEATURE_DISABLE_OUTWARD_ACTOR_ISOLATION = YES;

‎firefox-ios/Client/Configuration/version.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
APP_VERSION = 146.0
1+
APP_VERSION = 146.1

‎test-fixtures/generate-metrics.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ TYPE_LOG_FILE="$2"
77
THRESHOLD_UNIT_TEST=13
88
THRESHOLD_XCUITEST=13
99

10-
WARNINGS=$(grep -E -v 'SourcePackages/checkouts' "$BUILD_LOG_FILE" \
10+
11+
WARNINGS=$(
12+
grep -E -v 'SourcePackages/checkouts' "$BUILD_LOG_FILE" \
1113
| grep -E '^[^ ]+:[0-9]+:[0-9]+: warning:' \
12-
| uniq)
14+
| grep -Ev '/Tests/' \
15+
| uniq
16+
)
1317

1418
WARNING_COUNT=$(printf '%s\n' "$WARNINGS" | wc -l)
1519

0 commit comments

Comments
 (0)