Skip to content

Commit 1931e02

Browse files
mergify[bot]ih-codes
mergify[bot]
and
ih-codes
authored
Bugfix FXIOS-14715 Stopgap measure to downgrade Swift 6 while we investigate a more robust solution (backport #31793) (#31796)
Bugfix FXIOS-14715 Stopgap measure to downgrade Swift 6 while we investigate a more robust solution (#31793) * Stopgap downgrade of Swift 6 while we resolve WKNavigationDelegate methods not being called properly. Bumping warning threshold. * Downgrade ClientTests to Swift 5 as well to avoid errors after some Swift 6 related changes were made. * Apply suggestion from @ih-codes Bump warning count. (cherry picked from commit 5878473) Co-authored-by: Isabella <173110554+ih-codes@users.noreply.github.com>
1 parent 52d1a5f commit 1931e02

File tree

2 files changed

+8
-20
lines changed

2 files changed

+8
-20
lines changed

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

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27964,7 +27964,7 @@
2796427964
SWIFT_UPCOMING_FEATURE_ISOLATED_DEFAULT_VALUES = YES;
2796527965
SWIFT_UPCOMING_FEATURE_NONFROZEN_ENUM_EXHAUSTIVITY = YES;
2796627966
SWIFT_UPCOMING_FEATURE_REGION_BASED_ISOLATION = YES;
27967-
SWIFT_VERSION = 6.0;
27967+
SWIFT_VERSION = 5.0;
2796827968
TARGETED_DEVICE_FAMILY = "iPhone, iPad";
2796927969
TEST_TARGET_NAME = Client;
2797027970
VALIDATE_PRODUCT = YES;
@@ -28004,7 +28004,6 @@
2800428004
SWIFT_STRICT_CONCURRENCY = minimal;
2800528005
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
2800628006
SWIFT_UPCOMING_FEATURE_ISOLATED_DEFAULT_VALUES = YES;
28007-
SWIFT_VERSION = 6.0;
2800828007
TARGETED_DEVICE_FAMILY = "1,2";
2800928008
VALIDATE_WORKSPACE = YES;
2801028009
};
@@ -28270,7 +28269,6 @@
2827028269
INFOPLIST_FILE = "firefox-ios-tests/Tests/ClientTests/Info.plist";
2827128270
LOCALIZATION_EXPORT_SUPPORTED = NO;
2827228271
PRODUCT_NAME = ClientTests;
28273-
SWIFT_VERSION = 6.0;
2827428272
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Client.app/Client";
2827528273
};
2827628274
name = FirefoxStaging;
@@ -28479,7 +28477,7 @@
2847928477
SWIFT_UPCOMING_FEATURE_ISOLATED_DEFAULT_VALUES = YES;
2848028478
SWIFT_UPCOMING_FEATURE_NONFROZEN_ENUM_EXHAUSTIVITY = YES;
2848128479
SWIFT_UPCOMING_FEATURE_REGION_BASED_ISOLATION = YES;
28482-
SWIFT_VERSION = 6.0;
28480+
SWIFT_VERSION = 5.0;
2848328481
VALIDATE_WORKSPACE = YES;
2848428482
};
2848528483
name = Fennec_Testing;
@@ -28513,7 +28511,6 @@
2851328511
SWIFT_STRICT_CONCURRENCY = complete;
2851428512
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
2851528513
SWIFT_UPCOMING_FEATURE_ISOLATED_DEFAULT_VALUES = YES;
28516-
SWIFT_VERSION = 6.0;
2851728514
VALIDATE_WORKSPACE = YES;
2851828515
};
2851928516
name = Fennec_Testing;
@@ -28707,7 +28704,6 @@
2870728704
INFOPLIST_FILE = "firefox-ios-tests/Tests/ClientTests/Info.plist";
2870828705
LOCALIZATION_EXPORT_SUPPORTED = NO;
2870928706
PRODUCT_NAME = ClientTests;
28710-
SWIFT_VERSION = 6.0;
2871128707
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Client.app/Client";
2871228708
};
2871328709
name = Fennec_Testing;
@@ -29792,7 +29788,7 @@
2979229788
SWIFT_UPCOMING_FEATURE_ISOLATED_DEFAULT_VALUES = YES;
2979329789
SWIFT_UPCOMING_FEATURE_NONFROZEN_ENUM_EXHAUSTIVITY = YES;
2979429790
SWIFT_UPCOMING_FEATURE_REGION_BASED_ISOLATION = YES;
29795-
SWIFT_VERSION = 6.0;
29791+
SWIFT_VERSION = 5.0;
2979629792
VALIDATE_WORKSPACE = YES;
2979729793
};
2979829794
name = Firefox;
@@ -29829,7 +29825,6 @@
2982929825
SWIFT_STRICT_CONCURRENCY = minimal;
2983029826
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
2983129827
SWIFT_UPCOMING_FEATURE_ISOLATED_DEFAULT_VALUES = YES;
29832-
SWIFT_VERSION = 6.0;
2983329828
VALIDATE_WORKSPACE = YES;
2983429829
};
2983529830
name = Firefox;
@@ -29842,7 +29837,6 @@
2984229837
INFOPLIST_FILE = "firefox-ios-tests/Tests/ClientTests/Info.plist";
2984329838
LOCALIZATION_EXPORT_SUPPORTED = NO;
2984429839
PRODUCT_NAME = ClientTests;
29845-
SWIFT_VERSION = 6.0;
2984629840
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Client.app/Client";
2984729841
};
2984829842
name = Firefox;
@@ -30116,7 +30110,7 @@
3011630110
SWIFT_UPCOMING_FEATURE_ISOLATED_DEFAULT_VALUES = YES;
3011730111
SWIFT_UPCOMING_FEATURE_NONFROZEN_ENUM_EXHAUSTIVITY = YES;
3011830112
SWIFT_UPCOMING_FEATURE_REGION_BASED_ISOLATION = YES;
30119-
SWIFT_VERSION = 6.0;
30113+
SWIFT_VERSION = 5.0;
3012030114
VALIDATE_WORKSPACE = YES;
3012130115
};
3012230116
name = Fennec_Enterprise;
@@ -30161,7 +30155,6 @@
3016130155
SWIFT_STRICT_CONCURRENCY = complete;
3016230156
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
3016330157
SWIFT_UPCOMING_FEATURE_ISOLATED_DEFAULT_VALUES = YES;
30164-
SWIFT_VERSION = 6.0;
3016530158
VALIDATE_WORKSPACE = YES;
3016630159
};
3016730160
name = Fennec_Enterprise;
@@ -30277,7 +30270,6 @@
3027730270
INFOPLIST_FILE = "firefox-ios-tests/Tests/ClientTests/Info.plist";
3027830271
LOCALIZATION_EXPORT_SUPPORTED = NO;
3027930272
PRODUCT_NAME = ClientTests;
30280-
SWIFT_VERSION = 6.0;
3028130273
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Client.app/Client";
3028230274
};
3028330275
name = Fennec_Enterprise;
@@ -30443,7 +30435,7 @@
3044330435
SWIFT_UPCOMING_FEATURE_ISOLATED_DEFAULT_VALUES = YES;
3044430436
SWIFT_UPCOMING_FEATURE_NONFROZEN_ENUM_EXHAUSTIVITY = YES;
3044530437
SWIFT_UPCOMING_FEATURE_REGION_BASED_ISOLATION = YES;
30446-
SWIFT_VERSION = 6.0;
30438+
SWIFT_VERSION = 5.0;
3044730439
VALIDATE_WORKSPACE = YES;
3044830440
};
3044930441
name = FirefoxBeta;
@@ -30480,7 +30472,6 @@
3048030472
SWIFT_STRICT_CONCURRENCY = minimal;
3048130473
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
3048230474
SWIFT_UPCOMING_FEATURE_ISOLATED_DEFAULT_VALUES = YES;
30483-
SWIFT_VERSION = 6.0;
3048430475
VALIDATE_WORKSPACE = YES;
3048530476
};
3048630477
name = FirefoxBeta;
@@ -30493,7 +30484,6 @@
3049330484
INFOPLIST_FILE = "firefox-ios-tests/Tests/ClientTests/Info.plist";
3049430485
LOCALIZATION_EXPORT_SUPPORTED = NO;
3049530486
PRODUCT_NAME = ClientTests;
30496-
SWIFT_VERSION = 6.0;
3049730487
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Client.app/Client";
3049830488
};
3049930489
name = FirefoxBeta;
@@ -30985,7 +30975,7 @@
3098530975
SWIFT_UPCOMING_FEATURE_ISOLATED_DEFAULT_VALUES = YES;
3098630976
SWIFT_UPCOMING_FEATURE_NONFROZEN_ENUM_EXHAUSTIVITY = YES;
3098730977
SWIFT_UPCOMING_FEATURE_REGION_BASED_ISOLATION = YES;
30988-
SWIFT_VERSION = 6.0;
30978+
SWIFT_VERSION = 5.0;
3098930979
VALIDATE_WORKSPACE = YES;
3099030980
};
3099130981
name = Fennec;
@@ -31018,7 +31008,6 @@
3101831008
SWIFT_STRICT_CONCURRENCY = complete;
3101931009
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
3102031010
SWIFT_UPCOMING_FEATURE_ISOLATED_DEFAULT_VALUES = YES;
31021-
SWIFT_VERSION = 6.0;
3102231011
VALIDATE_WORKSPACE = YES;
3102331012
};
3102431013
name = Fennec;
@@ -31031,7 +31020,6 @@
3103131020
INFOPLIST_FILE = "firefox-ios-tests/Tests/ClientTests/Info.plist";
3103231021
LOCALIZATION_EXPORT_SUPPORTED = NO;
3103331022
PRODUCT_NAME = ClientTests;
31034-
SWIFT_VERSION = 6.0;
3103531023
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Client.app/Client";
3103631024
};
3103731025
name = Fennec;

‎test-fixtures/generate-metrics.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ set -e
44

55
BUILD_LOG_FILE="$1"
66
TYPE_LOG_FILE="$2"
7-
THRESHOLD_UNIT_TEST=5
8-
THRESHOLD_XCUITEST=5
7+
THRESHOLD_UNIT_TEST=53
8+
THRESHOLD_XCUITEST=53
99

1010

1111
WARNINGS=$(

0 commit comments

Comments
 (0)