Skip to content

Commit a17ff11

Browse files
author
Firefox Sync Engineering
committed
Nightly auto-update (136.0.20250117050350)
1 parent 34d3010 commit a17ff11

File tree

4 files changed

+131
-9
lines changed

4 files changed

+131
-9
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 = "9b7b6f1db78b9530eb04b4629abb26211a3a9ffeb1e48cf688fcaa61ba99d1b1"
5-
let version = "136.0.20250116050343"
6-
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.136.20250116050343/artifacts/public/build/MozillaRustComponents.xcframework.zip"
4+
let checksum = "81e65df195db9b83a44816eef24448cd73f9f77c3112c1a0f68a6c6577c20dfd"
5+
let version = "136.0.20250117050350"
6+
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.136.20250117050350/artifacts/public/build/MozillaRustComponents.xcframework.zip"
77

88
// Focus xcframework
9-
let focusChecksum = "f15b67263ef21e1fde2a7b30bb5502c35a6d494dd43c24a9f650b289fa84af40"
10-
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.136.20250116050343/artifacts/public/build/FocusRustComponents.xcframework.zip"
9+
let focusChecksum = "8fa14e3b18067b64e533da4bdce090408a30902121e2b79a5680c85b0fda07cd"
10+
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.136.20250117050350/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: 1, day: 16, hour: 5, minute: 12, second: 44))
26+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2025, month: 1, day: 17, hour: 5, minute: 21, second: 34))
2727
}
2828

2929
enum NimbusEvents {

swift-source/all/Generated/suggest.swift

Lines changed: 124 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1881,6 +1881,11 @@ public struct SuggestionProviderConstraints {
18811881
* settings record(s).
18821882
*/
18831883
public var exposureSuggestionTypes: [String]?
1884+
/**
1885+
* Which strategy should we use for the AMP queries?
1886+
* Use None for the default strategy.
1887+
*/
1888+
public var ampAlternativeMatching: AmpMatchingStrategy?
18841889

18851890
// Default memberwise initializers are never public by default, so we
18861891
// declare one manually.
@@ -1889,8 +1894,13 @@ public struct SuggestionProviderConstraints {
18891894
* `Exposure` provider - For each desired exposure suggestion type, this
18901895
* should contain the value of the `suggestion_type` field of its remote
18911896
* settings record(s).
1892-
*/exposureSuggestionTypes: [String]? = nil) {
1897+
*/exposureSuggestionTypes: [String]? = nil,
1898+
/**
1899+
* Which strategy should we use for the AMP queries?
1900+
* Use None for the default strategy.
1901+
*/ampAlternativeMatching: AmpMatchingStrategy? = nil) {
18931902
self.exposureSuggestionTypes = exposureSuggestionTypes
1903+
self.ampAlternativeMatching = ampAlternativeMatching
18941904
}
18951905
}
18961906

@@ -1901,11 +1911,15 @@ extension SuggestionProviderConstraints: Equatable, Hashable {
19011911
if lhs.exposureSuggestionTypes != rhs.exposureSuggestionTypes {
19021912
return false
19031913
}
1914+
if lhs.ampAlternativeMatching != rhs.ampAlternativeMatching {
1915+
return false
1916+
}
19041917
return true
19051918
}
19061919

19071920
public func hash(into hasher: inout Hasher) {
19081921
hasher.combine(exposureSuggestionTypes)
1922+
hasher.combine(ampAlternativeMatching)
19091923
}
19101924
}
19111925

@@ -1917,12 +1931,14 @@ public struct FfiConverterTypeSuggestionProviderConstraints: FfiConverterRustBuf
19171931
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SuggestionProviderConstraints {
19181932
return
19191933
try SuggestionProviderConstraints(
1920-
exposureSuggestionTypes: FfiConverterOptionSequenceString.read(from: &buf)
1934+
exposureSuggestionTypes: FfiConverterOptionSequenceString.read(from: &buf),
1935+
ampAlternativeMatching: FfiConverterOptionTypeAmpMatchingStrategy.read(from: &buf)
19211936
)
19221937
}
19231938

19241939
public static func write(_ value: SuggestionProviderConstraints, into buf: inout [UInt8]) {
19251940
FfiConverterOptionSequenceString.write(value.exposureSuggestionTypes, into: &buf)
1941+
FfiConverterOptionTypeAmpMatchingStrategy.write(value.ampAlternativeMatching, into: &buf)
19261942
}
19271943
}
19281944

@@ -2026,6 +2042,88 @@ public func FfiConverterTypeSuggestionQuery_lower(_ value: SuggestionQuery) -> R
20262042
return FfiConverterTypeSuggestionQuery.lower(value)
20272043
}
20282044

2045+
// Note that we don't yet support `indirect` for enums.
2046+
// See https://github.com/mozilla/uniffi-rs/issues/396 for further discussion.
2047+
2048+
public enum AmpMatchingStrategy {
2049+
2050+
/**
2051+
* Disable keywords added via keyword expansion.
2052+
* This eliminates keywords that for terms related to the "real" keywords, for example
2053+
* misspellings like "underarmor" instead of "under armor"'.
2054+
*/
2055+
case noKeywordExpansion
2056+
/**
2057+
* Use FTS matching against the full keywords, joined together.
2058+
*/
2059+
case ftsAgainstFullKeywords
2060+
/**
2061+
* Use FTS matching against the title field
2062+
*/
2063+
case ftsAgainstTitle
2064+
}
2065+
2066+
2067+
#if swift(>=5.8)
2068+
@_documentation(visibility: private)
2069+
#endif
2070+
public struct FfiConverterTypeAmpMatchingStrategy: FfiConverterRustBuffer {
2071+
typealias SwiftType = AmpMatchingStrategy
2072+
2073+
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> AmpMatchingStrategy {
2074+
let variant: Int32 = try readInt(&buf)
2075+
switch variant {
2076+
2077+
case 1: return .noKeywordExpansion
2078+
2079+
case 2: return .ftsAgainstFullKeywords
2080+
2081+
case 3: return .ftsAgainstTitle
2082+
2083+
default: throw UniffiInternalError.unexpectedEnumCase
2084+
}
2085+
}
2086+
2087+
public static func write(_ value: AmpMatchingStrategy, into buf: inout [UInt8]) {
2088+
switch value {
2089+
2090+
2091+
case .noKeywordExpansion:
2092+
writeInt(&buf, Int32(1))
2093+
2094+
2095+
case .ftsAgainstFullKeywords:
2096+
writeInt(&buf, Int32(2))
2097+
2098+
2099+
case .ftsAgainstTitle:
2100+
writeInt(&buf, Int32(3))
2101+
2102+
}
2103+
}
2104+
}
2105+
2106+
2107+
#if swift(>=5.8)
2108+
@_documentation(visibility: private)
2109+
#endif
2110+
public func FfiConverterTypeAmpMatchingStrategy_lift(_ buf: RustBuffer) throws -> AmpMatchingStrategy {
2111+
return try FfiConverterTypeAmpMatchingStrategy.lift(buf)
2112+
}
2113+
2114+
#if swift(>=5.8)
2115+
@_documentation(visibility: private)
2116+
#endif
2117+
public func FfiConverterTypeAmpMatchingStrategy_lower(_ value: AmpMatchingStrategy) -> RustBuffer {
2118+
return FfiConverterTypeAmpMatchingStrategy.lower(value)
2119+
}
2120+
2121+
2122+
2123+
extension AmpMatchingStrategy: Equatable, Hashable {}
2124+
2125+
2126+
20292127
// Note that we don't yet support `indirect` for enums.
20302128
// See https://github.com/mozilla/uniffi-rs/issues/396 for further discussion.
20312129

@@ -2881,6 +2979,30 @@ fileprivate struct FfiConverterOptionTypeSuggestionProviderConstraints: FfiConve
28812979
}
28822980
}
28832981

2982+
#if swift(>=5.8)
2983+
@_documentation(visibility: private)
2984+
#endif
2985+
fileprivate struct FfiConverterOptionTypeAmpMatchingStrategy: FfiConverterRustBuffer {
2986+
typealias SwiftType = AmpMatchingStrategy?
2987+
2988+
public static func write(_ value: SwiftType, into buf: inout [UInt8]) {
2989+
guard let value = value else {
2990+
writeInt(&buf, Int8(0))
2991+
return
2992+
}
2993+
writeInt(&buf, Int8(1))
2994+
FfiConverterTypeAmpMatchingStrategy.write(value, into: &buf)
2995+
}
2996+
2997+
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {
2998+
switch try readInt(&buf) as Int8 {
2999+
case 0: return nil
3000+
case 1: return try FfiConverterTypeAmpMatchingStrategy.read(from: &buf)
3001+
default: throw UniffiInternalError.unexpectedOptionalTag
3002+
}
3003+
}
3004+
}
3005+
28843006
#if swift(>=5.8)
28853007
@_documentation(visibility: private)
28863008
#endif

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: 1, day: 16, hour: 5, minute: 12, second: 46))
26+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2025, month: 1, day: 17, hour: 5, minute: 21, second: 36))
2727
}
2828

2929
enum NimbusEvents {

0 commit comments

Comments
 (0)