From fb592007726cd0b0a24b839d0d68ac59e50a4fbb Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Mon, 28 Apr 2025 13:11:50 -0400 Subject: [PATCH 1/2] Bump - Update SPM to rust-components 139.0.0 --- firefox-ios/Client.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- focus-ios/Blockzilla.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/firefox-ios/Client.xcodeproj/project.pbxproj b/firefox-ios/Client.xcodeproj/project.pbxproj index b31ce774d288..f8e47cedf3d7 100644 --- a/firefox-ios/Client.xcodeproj/project.pbxproj +++ b/firefox-ios/Client.xcodeproj/project.pbxproj @@ -28448,7 +28448,7 @@ repositoryURL = "https://github.com/mozilla/rust-components-swift.git"; requirement = { kind = exactVersion; - version = 139.0.20250416050241; + version = 139.0.0; }; }; 435C85EE2788F4D00072B526 /* XCRemoteSwiftPackageReference "glean-swift" */ = { diff --git a/firefox-ios/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/firefox-ios/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 13bd4f5f2ff3..726b694fa7ff 100644 --- a/firefox-ios/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/firefox-ios/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -95,8 +95,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mozilla/rust-components-swift.git", "state" : { - "revision" : "5545f0ac18e10b6cf12b8b5a9df5b9ee196debaa", - "version" : "139.0.20250416050241" + "revision" : "b5f9c8f4aba8a405e618abcac239280dc937ea53", + "version" : "139.0.0" } }, { diff --git a/focus-ios/Blockzilla.xcodeproj/project.pbxproj b/focus-ios/Blockzilla.xcodeproj/project.pbxproj index 92e0e3240ed0..042e4764ed41 100644 --- a/focus-ios/Blockzilla.xcodeproj/project.pbxproj +++ b/focus-ios/Blockzilla.xcodeproj/project.pbxproj @@ -7277,7 +7277,7 @@ repositoryURL = "https://github.com/mozilla/rust-components-swift"; requirement = { kind = exactVersion; - version = 139.0.20250416050241; + version = 139.0.0; }; }; 8A0E7F2C2BA0F0E0006BC6B6 /* XCRemoteSwiftPackageReference "Fuzi" */ = { diff --git a/focus-ios/Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/focus-ios/Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index df62a40975f8..aed098b267b9 100644 --- a/focus-ios/Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/focus-ios/Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -51,8 +51,8 @@ "repositoryURL": "https://github.com/mozilla/rust-components-swift", "state": { "branch": null, - "revision": "5545f0ac18e10b6cf12b8b5a9df5b9ee196debaa", - "version": "139.0.20250416050241" + "revision": "b5f9c8f4aba8a405e618abcac239280dc937ea53", + "version": "139.0.0" } }, { From 93b4be40e32f9706b74e17879a664b626afdb577 Mon Sep 17 00:00:00 2001 From: Issam Mani Date: Mon, 28 Apr 2025 20:23:21 +0200 Subject: [PATCH 2/2] fix: makeClient, useRemoteSettingsServer no longer throws --- .../Application Services/ASRemoteSettingsCollection.swift | 7 +------ .../Application Services/ASSearchEngineSelector.swift | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/firefox-ios/Client/Application/RemoteSettings/Application Services/ASRemoteSettingsCollection.swift b/firefox-ios/Client/Application/RemoteSettings/Application Services/ASRemoteSettingsCollection.swift index febcf3085247..c28aaa941e10 100644 --- a/firefox-ios/Client/Application/RemoteSettings/Application Services/ASRemoteSettingsCollection.swift +++ b/firefox-ios/Client/Application/RemoteSettings/Application Services/ASRemoteSettingsCollection.swift @@ -16,11 +16,6 @@ extension ASRemoteSettingsCollection { func makeClient() -> RemoteSettingsClient? { let profile: Profile = AppContainer.shared.resolve() guard let service = profile.remoteSettingsService else { return nil } - do { - return try service.makeClient(collectionName: rawValue) - } catch { - DefaultLogger.shared.log("Error creating RS client: \(error)", level: .warning, category: .remoteSettings) - } - return nil + return service.makeClient(collectionName: rawValue) } } diff --git a/firefox-ios/Client/Application/RemoteSettings/Application Services/ASSearchEngineSelector.swift b/firefox-ios/Client/Application/RemoteSettings/Application Services/ASSearchEngineSelector.swift index 0e68df51f5f5..d3c61e5777fb 100644 --- a/firefox-ios/Client/Application/RemoteSettings/Application Services/ASSearchEngineSelector.swift +++ b/firefox-ios/Client/Application/RemoteSettings/Application Services/ASSearchEngineSelector.swift @@ -33,7 +33,7 @@ final class ASSearchEngineSelector: ASSearchEngineSelectorProtocol { region: String, completion: @escaping ((RefinedSearchConfig?, Error?) -> Void)) { do { - try engineSelector.useRemoteSettingsServer(service: service, applyEngineOverrides: false) + engineSelector.useRemoteSettingsServer(service: service, applyEngineOverrides: false) let deviceType: SearchDeviceType = UIDevice.current.userInterfaceIdiom == .pad ? .tablet : .smartphone let env = SearchUserEnvironment(locale: locale,