Skip to content

Commit 6b61e67

Browse files
author
Firefox Sync Engineering
committed
Nightly auto-update (137.0.20250226050341)
1 parent fe9059d commit 6b61e67

File tree

9 files changed

+78
-53
lines changed

9 files changed

+78
-53
lines changed

‎Package.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// swift-tools-version:5.4
22
import PackageDescription
33

4-
let checksum = "4ff110a8297a44f81f725cafc2d5c168254a491e6e8f83d6884e10383c2a1aa7"
5-
let version = "137.0.20250225050335"
6-
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.137.20250225050335/artifacts/public/build/MozillaRustComponents.xcframework.zip"
4+
let checksum = "8c8f4890a9ba24866e79582620a83185be02888766d18c2dd0319bda3364a844"
5+
let version = "137.0.20250226050341"
6+
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.137.20250226050341/artifacts/public/build/MozillaRustComponents.xcframework.zip"
77

88
// Focus xcframework
9-
let focusChecksum = "74102296fe02067655a984c2036a8312ad7c7f5d33d1249684b4c2cde4147384"
10-
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.137.20250225050335/artifacts/public/build/FocusRustComponents.xcframework.zip"
9+
let focusChecksum = "ecfffb5e2b51206b3cea6c7a24ec25793f53e264159e52baa5c053c1a4c228f2"
10+
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.137.20250226050341/artifacts/public/build/FocusRustComponents.xcframework.zip"
1111
let package = Package(
1212
name: "MozillaRustComponentsSwift",
1313
platforms: [.iOS(.v14)],

‎swift-source/all/Generated/Metrics/Metrics.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extension GleanMetrics {
2323
// Intentionally left private, no external user can instantiate a new global object.
2424
}
2525

26-
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2025, month: 2, day: 25, hour: 5, minute: 31, second: 14))
26+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2025, month: 2, day: 26, hour: 5, minute: 22, second: 7))
2727
}
2828

2929
enum NimbusEvents {

‎swift-source/all/Generated/remote_settings.swift

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ public protocol RemoteSettingsServiceProtocol : AnyObject {
929929
/**
930930
* Create a new Remote Settings client
931931
*/
932-
func makeClient(collectionName: String, appContext: RemoteSettingsContext?) throws -> RemoteSettingsClient
932+
func makeClient(collectionName: String) throws -> RemoteSettingsClient
933933

934934
/**
935935
* Sync collections for all active clients
@@ -1021,11 +1021,10 @@ public convenience init(storageDir: String, config: RemoteSettingsConfig2)throws
10211021
/**
10221022
* Create a new Remote Settings client
10231023
*/
1024-
open func makeClient(collectionName: String, appContext: RemoteSettingsContext?)throws -> RemoteSettingsClient {
1024+
open func makeClient(collectionName: String)throws -> RemoteSettingsClient {
10251025
return try FfiConverterTypeRemoteSettingsClient.lift(try rustCallWithError(FfiConverterTypeRemoteSettingsError.lift) {
10261026
uniffi_remote_settings_fn_method_remotesettingsservice_make_client(self.uniffiClonePointer(),
1027-
FfiConverterString.lower(collectionName),
1028-
FfiConverterOptionTypeRemoteSettingsContext.lower(appContext),$0
1027+
FfiConverterString.lower(collectionName),$0
10291028
)
10301029
})
10311030
}
@@ -1311,6 +1310,10 @@ public struct RemoteSettingsConfig2 {
13111310
* Bucket name to use, defaults to "main". Use "main-preview" for a preview bucket
13121311
*/
13131312
public var bucketName: String?
1313+
/**
1314+
* App context to use for JEXL filtering (when the `jexl` feature is present).
1315+
*/
1316+
public var appContext: RemoteSettingsContext?
13141317

13151318
// Default memberwise initializers are never public by default, so we
13161319
// declare one manually.
@@ -1320,9 +1323,13 @@ public struct RemoteSettingsConfig2 {
13201323
*/server: RemoteSettingsServer? = nil,
13211324
/**
13221325
* Bucket name to use, defaults to "main". Use "main-preview" for a preview bucket
1323-
*/bucketName: String? = nil) {
1326+
*/bucketName: String? = nil,
1327+
/**
1328+
* App context to use for JEXL filtering (when the `jexl` feature is present).
1329+
*/appContext: RemoteSettingsContext? = nil) {
13241330
self.server = server
13251331
self.bucketName = bucketName
1332+
self.appContext = appContext
13261333
}
13271334
}
13281335

@@ -1336,12 +1343,16 @@ extension RemoteSettingsConfig2: Equatable, Hashable {
13361343
if lhs.bucketName != rhs.bucketName {
13371344
return false
13381345
}
1346+
if lhs.appContext != rhs.appContext {
1347+
return false
1348+
}
13391349
return true
13401350
}
13411351

13421352
public func hash(into hasher: inout Hasher) {
13431353
hasher.combine(server)
13441354
hasher.combine(bucketName)
1355+
hasher.combine(appContext)
13451356
}
13461357
}
13471358

@@ -1354,13 +1365,15 @@ public struct FfiConverterTypeRemoteSettingsConfig2: FfiConverterRustBuffer {
13541365
return
13551366
try RemoteSettingsConfig2(
13561367
server: FfiConverterOptionTypeRemoteSettingsServer.read(from: &buf),
1357-
bucketName: FfiConverterOptionString.read(from: &buf)
1368+
bucketName: FfiConverterOptionString.read(from: &buf),
1369+
appContext: FfiConverterOptionTypeRemoteSettingsContext.read(from: &buf)
13581370
)
13591371
}
13601372

13611373
public static func write(_ value: RemoteSettingsConfig2, into buf: inout [UInt8]) {
13621374
FfiConverterOptionTypeRemoteSettingsServer.write(value.server, into: &buf)
13631375
FfiConverterOptionString.write(value.bucketName, into: &buf)
1376+
FfiConverterOptionTypeRemoteSettingsContext.write(value.appContext, into: &buf)
13641377
}
13651378
}
13661379

@@ -2347,7 +2360,7 @@ private var initializationResult: InitializationResult = {
23472360
if (uniffi_remote_settings_checksum_method_remotesettingsclient_get_records_map() != 32665) {
23482361
return InitializationResult.apiChecksumMismatch
23492362
}
2350-
if (uniffi_remote_settings_checksum_method_remotesettingsservice_make_client() != 41207) {
2363+
if (uniffi_remote_settings_checksum_method_remotesettingsservice_make_client() != 50814) {
23512364
return InitializationResult.apiChecksumMismatch
23522365
}
23532366
if (uniffi_remote_settings_checksum_method_remotesettingsservice_sync() != 61379) {

‎swift-source/all/Generated/remote_settingsFFI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ void*_Nonnull uniffi_remote_settings_fn_constructor_remotesettingsservice_new(Ru
328328
#endif
329329
#ifndef UNIFFI_FFIDEF_UNIFFI_REMOTE_SETTINGS_FN_METHOD_REMOTESETTINGSSERVICE_MAKE_CLIENT
330330
#define UNIFFI_FFIDEF_UNIFFI_REMOTE_SETTINGS_FN_METHOD_REMOTESETTINGSSERVICE_MAKE_CLIENT
331-
void*_Nonnull uniffi_remote_settings_fn_method_remotesettingsservice_make_client(void*_Nonnull ptr, RustBuffer collection_name, RustBuffer app_context, RustCallStatus *_Nonnull out_status
331+
void*_Nonnull uniffi_remote_settings_fn_method_remotesettingsservice_make_client(void*_Nonnull ptr, RustBuffer collection_name, RustCallStatus *_Nonnull out_status
332332
);
333333
#endif
334334
#ifndef UNIFFI_FFIDEF_UNIFFI_REMOTE_SETTINGS_FN_METHOD_REMOTESETTINGSSERVICE_SYNC

‎swift-source/all/Generated/suggest.swift

Lines changed: 17 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ public func FfiConverterTypeSuggestStore_lower(_ value: SuggestStore) -> UnsafeM
951951
*/
952952
public protocol SuggestStoreBuilderProtocol : AnyObject {
953953

954-
func build(rsService: RemoteSettingsService?) throws -> SuggestStore
954+
func build() throws -> SuggestStore
955955

956956
/**
957957
* Deprecated: this is no longer used by the suggest component.
@@ -973,6 +973,8 @@ public protocol SuggestStoreBuilderProtocol : AnyObject {
973973

974974
func remoteSettingsServer(server: RemoteSettingsServer) -> SuggestStoreBuilder
975975

976+
func remoteSettingsService(rsService: RemoteSettingsService) -> SuggestStoreBuilder
977+
976978
}
977979
/**
978980
* Builder for [SuggestStore]
@@ -1037,10 +1039,9 @@ public convenience init() {
10371039

10381040

10391041

1040-
open func build(rsService: RemoteSettingsService? = nil)throws -> SuggestStore {
1042+
open func build()throws -> SuggestStore {
10411043
return try FfiConverterTypeSuggestStore.lift(try rustCallWithError(FfiConverterTypeSuggestApiError.lift) {
1042-
uniffi_suggest_fn_method_suggeststorebuilder_build(self.uniffiClonePointer(),
1043-
FfiConverterOptionTypeRemoteSettingsService.lower(rsService),$0
1044+
uniffi_suggest_fn_method_suggeststorebuilder_build(self.uniffiClonePointer(),$0
10441045
)
10451046
})
10461047
}
@@ -1096,6 +1097,14 @@ open func remoteSettingsServer(server: RemoteSettingsServer) -> SuggestStoreBuil
10961097
})
10971098
}
10981099

1100+
open func remoteSettingsService(rsService: RemoteSettingsService) -> SuggestStoreBuilder {
1101+
return try! FfiConverterTypeSuggestStoreBuilder.lift(try! rustCall() {
1102+
uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_service(self.uniffiClonePointer(),
1103+
FfiConverterTypeRemoteSettingsService_lower(rsService),$0
1104+
)
1105+
})
1106+
}
1107+
10991108

11001109
}
11011110

@@ -3173,30 +3182,6 @@ fileprivate struct FfiConverterOptionTypeRemoteSettingsConfig: FfiConverterRustB
31733182
}
31743183
}
31753184

3176-
#if swift(>=5.8)
3177-
@_documentation(visibility: private)
3178-
#endif
3179-
fileprivate struct FfiConverterOptionTypeRemoteSettingsService: FfiConverterRustBuffer {
3180-
typealias SwiftType = RemoteSettingsService?
3181-
3182-
public static func write(_ value: SwiftType, into buf: inout [UInt8]) {
3183-
guard let value = value else {
3184-
writeInt(&buf, Int8(0))
3185-
return
3186-
}
3187-
writeInt(&buf, Int8(1))
3188-
FfiConverterTypeRemoteSettingsService.write(value, into: &buf)
3189-
}
3190-
3191-
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {
3192-
switch try readInt(&buf) as Int8 {
3193-
case 0: return nil
3194-
case 1: return try FfiConverterTypeRemoteSettingsService.read(from: &buf)
3195-
default: throw UniffiInternalError.unexpectedOptionalTag
3196-
}
3197-
}
3198-
}
3199-
32003185
#if swift(>=5.8)
32013186
@_documentation(visibility: private)
32023187
#endif
@@ -3414,7 +3399,7 @@ private var initializationResult: InitializationResult = {
34143399
if (uniffi_suggest_checksum_method_suggeststore_query_with_metrics() != 14851) {
34153400
return InitializationResult.apiChecksumMismatch
34163401
}
3417-
if (uniffi_suggest_checksum_method_suggeststorebuilder_build() != 26843) {
3402+
if (uniffi_suggest_checksum_method_suggeststorebuilder_build() != 42072) {
34183403
return InitializationResult.apiChecksumMismatch
34193404
}
34203405
if (uniffi_suggest_checksum_method_suggeststorebuilder_cache_path() != 55168) {
@@ -3432,6 +3417,9 @@ private var initializationResult: InitializationResult = {
34323417
if (uniffi_suggest_checksum_method_suggeststorebuilder_remote_settings_server() != 19990) {
34333418
return InitializationResult.apiChecksumMismatch
34343419
}
3420+
if (uniffi_suggest_checksum_method_suggeststorebuilder_remote_settings_service() != 52699) {
3421+
return InitializationResult.apiChecksumMismatch
3422+
}
34353423
if (uniffi_suggest_checksum_constructor_suggeststore_new() != 9768) {
34363424
return InitializationResult.apiChecksumMismatch
34373425
}

‎swift-source/all/Generated/suggestFFI.h

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ void*_Nonnull uniffi_suggest_fn_constructor_suggeststorebuilder_new(RustCallStat
334334
#endif
335335
#ifndef UNIFFI_FFIDEF_UNIFFI_SUGGEST_FN_METHOD_SUGGESTSTOREBUILDER_BUILD
336336
#define UNIFFI_FFIDEF_UNIFFI_SUGGEST_FN_METHOD_SUGGESTSTOREBUILDER_BUILD
337-
void*_Nonnull uniffi_suggest_fn_method_suggeststorebuilder_build(void*_Nonnull ptr, RustBuffer rs_service, RustCallStatus *_Nonnull out_status
337+
void*_Nonnull uniffi_suggest_fn_method_suggeststorebuilder_build(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
338338
);
339339
#endif
340340
#ifndef UNIFFI_FFIDEF_UNIFFI_SUGGEST_FN_METHOD_SUGGESTSTOREBUILDER_CACHE_PATH
@@ -362,6 +362,11 @@ void*_Nonnull uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_bucke
362362
void*_Nonnull uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_server(void*_Nonnull ptr, RustBuffer server, RustCallStatus *_Nonnull out_status
363363
);
364364
#endif
365+
#ifndef UNIFFI_FFIDEF_UNIFFI_SUGGEST_FN_METHOD_SUGGESTSTOREBUILDER_REMOTE_SETTINGS_SERVICE
366+
#define UNIFFI_FFIDEF_UNIFFI_SUGGEST_FN_METHOD_SUGGESTSTOREBUILDER_REMOTE_SETTINGS_SERVICE
367+
void*_Nonnull uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_service(void*_Nonnull ptr, void*_Nonnull _rs_service, RustCallStatus *_Nonnull out_status
368+
);
369+
#endif
365370
#ifndef UNIFFI_FFIDEF_UNIFFI_SUGGEST_FN_FUNC_RAW_SUGGESTION_URL_MATCHES
366371
#define UNIFFI_FFIDEF_UNIFFI_SUGGEST_FN_FUNC_RAW_SUGGESTION_URL_MATCHES
367372
int8_t uniffi_suggest_fn_func_raw_suggestion_url_matches(RustBuffer raw_url, RustBuffer cooked_url, RustCallStatus *_Nonnull out_status
@@ -747,6 +752,12 @@ uint16_t uniffi_suggest_checksum_method_suggeststorebuilder_remote_settings_buck
747752
#define UNIFFI_FFIDEF_UNIFFI_SUGGEST_CHECKSUM_METHOD_SUGGESTSTOREBUILDER_REMOTE_SETTINGS_SERVER
748753
uint16_t uniffi_suggest_checksum_method_suggeststorebuilder_remote_settings_server(void
749754

755+
);
756+
#endif
757+
#ifndef UNIFFI_FFIDEF_UNIFFI_SUGGEST_CHECKSUM_METHOD_SUGGESTSTOREBUILDER_REMOTE_SETTINGS_SERVICE
758+
#define UNIFFI_FFIDEF_UNIFFI_SUGGEST_CHECKSUM_METHOD_SUGGESTSTOREBUILDER_REMOTE_SETTINGS_SERVICE
759+
uint16_t uniffi_suggest_checksum_method_suggeststorebuilder_remote_settings_service(void
760+
750761
);
751762
#endif
752763
#ifndef UNIFFI_FFIDEF_UNIFFI_SUGGEST_CHECKSUM_CONSTRUCTOR_SUGGESTSTORE_NEW

‎swift-source/focus/Generated/Metrics/Metrics.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extension GleanMetrics {
2323
// Intentionally left private, no external user can instantiate a new global object.
2424
}
2525

26-
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2025, month: 2, day: 25, hour: 5, minute: 31, second: 17))
26+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2025, month: 2, day: 26, hour: 5, minute: 22, second: 9))
2727
}
2828

2929
enum NimbusEvents {

‎swift-source/focus/Generated/remote_settings.swift

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ public protocol RemoteSettingsServiceProtocol : AnyObject {
929929
/**
930930
* Create a new Remote Settings client
931931
*/
932-
func makeClient(collectionName: String, appContext: RemoteSettingsContext?) throws -> RemoteSettingsClient
932+
func makeClient(collectionName: String) throws -> RemoteSettingsClient
933933

934934
/**
935935
* Sync collections for all active clients
@@ -1021,11 +1021,10 @@ public convenience init(storageDir: String, config: RemoteSettingsConfig2)throws
10211021
/**
10221022
* Create a new Remote Settings client
10231023
*/
1024-
open func makeClient(collectionName: String, appContext: RemoteSettingsContext?)throws -> RemoteSettingsClient {
1024+
open func makeClient(collectionName: String)throws -> RemoteSettingsClient {
10251025
return try FfiConverterTypeRemoteSettingsClient.lift(try rustCallWithError(FfiConverterTypeRemoteSettingsError.lift) {
10261026
uniffi_remote_settings_fn_method_remotesettingsservice_make_client(self.uniffiClonePointer(),
1027-
FfiConverterString.lower(collectionName),
1028-
FfiConverterOptionTypeRemoteSettingsContext.lower(appContext),$0
1027+
FfiConverterString.lower(collectionName),$0
10291028
)
10301029
})
10311030
}
@@ -1311,6 +1310,10 @@ public struct RemoteSettingsConfig2 {
13111310
* Bucket name to use, defaults to "main". Use "main-preview" for a preview bucket
13121311
*/
13131312
public var bucketName: String?
1313+
/**
1314+
* App context to use for JEXL filtering (when the `jexl` feature is present).
1315+
*/
1316+
public var appContext: RemoteSettingsContext?
13141317

13151318
// Default memberwise initializers are never public by default, so we
13161319
// declare one manually.
@@ -1320,9 +1323,13 @@ public struct RemoteSettingsConfig2 {
13201323
*/server: RemoteSettingsServer? = nil,
13211324
/**
13221325
* Bucket name to use, defaults to "main". Use "main-preview" for a preview bucket
1323-
*/bucketName: String? = nil) {
1326+
*/bucketName: String? = nil,
1327+
/**
1328+
* App context to use for JEXL filtering (when the `jexl` feature is present).
1329+
*/appContext: RemoteSettingsContext? = nil) {
13241330
self.server = server
13251331
self.bucketName = bucketName
1332+
self.appContext = appContext
13261333
}
13271334
}
13281335

@@ -1336,12 +1343,16 @@ extension RemoteSettingsConfig2: Equatable, Hashable {
13361343
if lhs.bucketName != rhs.bucketName {
13371344
return false
13381345
}
1346+
if lhs.appContext != rhs.appContext {
1347+
return false
1348+
}
13391349
return true
13401350
}
13411351

13421352
public func hash(into hasher: inout Hasher) {
13431353
hasher.combine(server)
13441354
hasher.combine(bucketName)
1355+
hasher.combine(appContext)
13451356
}
13461357
}
13471358

@@ -1354,13 +1365,15 @@ public struct FfiConverterTypeRemoteSettingsConfig2: FfiConverterRustBuffer {
13541365
return
13551366
try RemoteSettingsConfig2(
13561367
server: FfiConverterOptionTypeRemoteSettingsServer.read(from: &buf),
1357-
bucketName: FfiConverterOptionString.read(from: &buf)
1368+
bucketName: FfiConverterOptionString.read(from: &buf),
1369+
appContext: FfiConverterOptionTypeRemoteSettingsContext.read(from: &buf)
13581370
)
13591371
}
13601372

13611373
public static func write(_ value: RemoteSettingsConfig2, into buf: inout [UInt8]) {
13621374
FfiConverterOptionTypeRemoteSettingsServer.write(value.server, into: &buf)
13631375
FfiConverterOptionString.write(value.bucketName, into: &buf)
1376+
FfiConverterOptionTypeRemoteSettingsContext.write(value.appContext, into: &buf)
13641377
}
13651378
}
13661379

@@ -2347,7 +2360,7 @@ private var initializationResult: InitializationResult = {
23472360
if (uniffi_remote_settings_checksum_method_remotesettingsclient_get_records_map() != 32665) {
23482361
return InitializationResult.apiChecksumMismatch
23492362
}
2350-
if (uniffi_remote_settings_checksum_method_remotesettingsservice_make_client() != 41207) {
2363+
if (uniffi_remote_settings_checksum_method_remotesettingsservice_make_client() != 50814) {
23512364
return InitializationResult.apiChecksumMismatch
23522365
}
23532366
if (uniffi_remote_settings_checksum_method_remotesettingsservice_sync() != 61379) {

‎swift-source/focus/Generated/remote_settingsFFI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ void*_Nonnull uniffi_remote_settings_fn_constructor_remotesettingsservice_new(Ru
328328
#endif
329329
#ifndef UNIFFI_FFIDEF_UNIFFI_REMOTE_SETTINGS_FN_METHOD_REMOTESETTINGSSERVICE_MAKE_CLIENT
330330
#define UNIFFI_FFIDEF_UNIFFI_REMOTE_SETTINGS_FN_METHOD_REMOTESETTINGSSERVICE_MAKE_CLIENT
331-
void*_Nonnull uniffi_remote_settings_fn_method_remotesettingsservice_make_client(void*_Nonnull ptr, RustBuffer collection_name, RustBuffer app_context, RustCallStatus *_Nonnull out_status
331+
void*_Nonnull uniffi_remote_settings_fn_method_remotesettingsservice_make_client(void*_Nonnull ptr, RustBuffer collection_name, RustCallStatus *_Nonnull out_status
332332
);
333333
#endif
334334
#ifndef UNIFFI_FFIDEF_UNIFFI_REMOTE_SETTINGS_FN_METHOD_REMOTESETTINGSSERVICE_SYNC

0 commit comments

Comments
 (0)