From eb88f7f958b9c0c56e5b0c8552a78e9995195c3c Mon Sep 17 00:00:00 2001 From: yashikakhurana Date: Wed, 19 Nov 2025 17:49:55 -0800 Subject: [PATCH 1/2] Refactor FXIOS-30781 [Nimbus]: Remove passing the home directory to App context in ios --- .../Sources/FocusRustComponentsWrapper/Nimbus/NimbusCreate.swift | 1 - .../MozillaRustComponentsWrapper/Nimbus/NimbusCreate.swift | 1 - 2 files changed, 2 deletions(-) diff --git a/MozillaRustComponents/Sources/FocusRustComponentsWrapper/Nimbus/NimbusCreate.swift b/MozillaRustComponents/Sources/FocusRustComponentsWrapper/Nimbus/NimbusCreate.swift index 14e3944ab9809..01cbc187f368c 100644 --- a/MozillaRustComponents/Sources/FocusRustComponentsWrapper/Nimbus/NimbusCreate.swift +++ b/MozillaRustComponents/Sources/FocusRustComponentsWrapper/Nimbus/NimbusCreate.swift @@ -151,7 +151,6 @@ public extension Nimbus { androidSdkVersion: nil, debugTag: "Nimbus.rs", installationDate: installationDateSinceEpoch, - homeDirectory: nil, customTargetingAttributes: try? appSettings.customTargetingAttributes.stringify() ) } diff --git a/MozillaRustComponents/Sources/MozillaRustComponentsWrapper/Nimbus/NimbusCreate.swift b/MozillaRustComponents/Sources/MozillaRustComponentsWrapper/Nimbus/NimbusCreate.swift index cba5aaab629be..2b8bb5d974ca7 100644 --- a/MozillaRustComponents/Sources/MozillaRustComponentsWrapper/Nimbus/NimbusCreate.swift +++ b/MozillaRustComponents/Sources/MozillaRustComponentsWrapper/Nimbus/NimbusCreate.swift @@ -159,7 +159,6 @@ public extension Nimbus { androidSdkVersion: nil, debugTag: "Nimbus.rs", installationDate: installationDateSinceEpoch, - homeDirectory: nil, customTargetingAttributes: try? appSettings.customTargetingAttributes.stringify() ) } From ee845d34371f96c6d084a30f5cd03452222a0964 Mon Sep 17 00:00:00 2001 From: Firefox Sync Engineering Date: Wed, 26 Nov 2025 08:01:00 +0000 Subject: [PATCH 2/2] (Local AS flow) Nightly auto-update (147.0.20251126050344) --- MozillaRustComponents/Package.swift | 10 +++++----- .../Generated/Metrics/Metrics.swift | 2 +- .../FocusRustComponentsWrapper/Generated/nimbus.swift | 10 +--------- .../Generated/Metrics/Metrics.swift | 2 +- .../Generated/nimbus.swift | 10 +--------- 5 files changed, 9 insertions(+), 25 deletions(-) diff --git a/MozillaRustComponents/Package.swift b/MozillaRustComponents/Package.swift index 2335480b36948..d5b0fda3a4dc3 100644 --- a/MozillaRustComponents/Package.swift +++ b/MozillaRustComponents/Package.swift @@ -1,13 +1,13 @@ // swift-tools-version: 5.10 import PackageDescription -let checksum = "2b062efa6baae34be125b0b0cd5301f91a1e70e20e448dbbb620f4f5a0571591" -let version = "147.0.20251125170615" -let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.147.20251125170615/artifacts/public/build/MozillaRustComponents.xcframework.zip" +let checksum = "869a53da69028e5b4bfabc24a67d1246a1052e6ef94626fbdea034aeab01f230" +let version = "147.0.20251126050344" +let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.147.20251126050344/artifacts/public/build/MozillaRustComponents.xcframework.zip" // Focus xcframework -let focusChecksum = "cac123dd73022dd872a82accd0cd5e7c7c59b7cb469325f096bcc1da15d6691b" -let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.147.20251125170615/artifacts/public/build/FocusRustComponents.xcframework.zip" +let focusChecksum = "e2126c6e2ce2114ec98a7fcc0e5d908b8b05f79d52d6879195ca412ee6143df5" +let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.147.20251126050344/artifacts/public/build/FocusRustComponents.xcframework.zip" let package = Package( name: "MozillaRustComponentsSwift", diff --git a/MozillaRustComponents/Sources/FocusRustComponentsWrapper/Generated/Metrics/Metrics.swift b/MozillaRustComponents/Sources/FocusRustComponentsWrapper/Generated/Metrics/Metrics.swift index 8bf75ec5bb50d..4220a802d0234 100644 --- a/MozillaRustComponents/Sources/FocusRustComponentsWrapper/Generated/Metrics/Metrics.swift +++ b/MozillaRustComponents/Sources/FocusRustComponentsWrapper/Generated/Metrics/Metrics.swift @@ -23,7 +23,7 @@ extension GleanMetrics { // Intentionally left private, no external user can instantiate a new global object. } - public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2025, month: 11, day: 25, hour: 17, minute: 44, second: 12)) + public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2025, month: 11, day: 26, hour: 5, minute: 17, second: 40)) } enum NimbusEvents { diff --git a/MozillaRustComponents/Sources/FocusRustComponentsWrapper/Generated/nimbus.swift b/MozillaRustComponents/Sources/FocusRustComponentsWrapper/Generated/nimbus.swift index 49d9e3058e1bc..00e52932648a9 100644 --- a/MozillaRustComponents/Sources/FocusRustComponentsWrapper/Generated/nimbus.swift +++ b/MozillaRustComponents/Sources/FocusRustComponentsWrapper/Generated/nimbus.swift @@ -1735,12 +1735,11 @@ public struct AppContext { public var androidSdkVersion: String? public var debugTag: String? public var installationDate: Int64? - public var homeDirectory: String? public var customTargetingAttributes: JsonObject? // Default memberwise initializers are never public by default, so we // declare one manually. - public init(appName: String, appId: String, channel: String, appVersion: String?, appBuild: String?, architecture: String?, deviceManufacturer: String?, deviceModel: String?, locale: String?, os: String?, osVersion: String?, androidSdkVersion: String?, debugTag: String?, installationDate: Int64?, homeDirectory: String?, customTargetingAttributes: JsonObject?) { + public init(appName: String, appId: String, channel: String, appVersion: String?, appBuild: String?, architecture: String?, deviceManufacturer: String?, deviceModel: String?, locale: String?, os: String?, osVersion: String?, androidSdkVersion: String?, debugTag: String?, installationDate: Int64?, customTargetingAttributes: JsonObject?) { self.appName = appName self.appId = appId self.channel = channel @@ -1755,7 +1754,6 @@ public struct AppContext { self.androidSdkVersion = androidSdkVersion self.debugTag = debugTag self.installationDate = installationDate - self.homeDirectory = homeDirectory self.customTargetingAttributes = customTargetingAttributes } } @@ -1809,9 +1807,6 @@ extension AppContext: Equatable, Hashable { if lhs.installationDate != rhs.installationDate { return false } - if lhs.homeDirectory != rhs.homeDirectory { - return false - } if lhs.customTargetingAttributes != rhs.customTargetingAttributes { return false } @@ -1833,7 +1828,6 @@ extension AppContext: Equatable, Hashable { hasher.combine(androidSdkVersion) hasher.combine(debugTag) hasher.combine(installationDate) - hasher.combine(homeDirectory) hasher.combine(customTargetingAttributes) } } @@ -1861,7 +1855,6 @@ public struct FfiConverterTypeAppContext: FfiConverterRustBuffer { androidSdkVersion: FfiConverterOptionString.read(from: &buf), debugTag: FfiConverterOptionString.read(from: &buf), installationDate: FfiConverterOptionInt64.read(from: &buf), - homeDirectory: FfiConverterOptionString.read(from: &buf), customTargetingAttributes: FfiConverterOptionTypeJsonObject.read(from: &buf) ) } @@ -1881,7 +1874,6 @@ public struct FfiConverterTypeAppContext: FfiConverterRustBuffer { FfiConverterOptionString.write(value.androidSdkVersion, into: &buf) FfiConverterOptionString.write(value.debugTag, into: &buf) FfiConverterOptionInt64.write(value.installationDate, into: &buf) - FfiConverterOptionString.write(value.homeDirectory, into: &buf) FfiConverterOptionTypeJsonObject.write(value.customTargetingAttributes, into: &buf) } } diff --git a/MozillaRustComponents/Sources/MozillaRustComponentsWrapper/Generated/Metrics/Metrics.swift b/MozillaRustComponents/Sources/MozillaRustComponentsWrapper/Generated/Metrics/Metrics.swift index 264d72c96c6fd..983b9fdf92741 100644 --- a/MozillaRustComponents/Sources/MozillaRustComponentsWrapper/Generated/Metrics/Metrics.swift +++ b/MozillaRustComponents/Sources/MozillaRustComponentsWrapper/Generated/Metrics/Metrics.swift @@ -23,7 +23,7 @@ extension GleanMetrics { // Intentionally left private, no external user can instantiate a new global object. } - public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2025, month: 11, day: 25, hour: 17, minute: 44, second: 10)) + public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2025, month: 11, day: 26, hour: 5, minute: 17, second: 38)) } enum NimbusEvents { diff --git a/MozillaRustComponents/Sources/MozillaRustComponentsWrapper/Generated/nimbus.swift b/MozillaRustComponents/Sources/MozillaRustComponentsWrapper/Generated/nimbus.swift index 49d9e3058e1bc..00e52932648a9 100644 --- a/MozillaRustComponents/Sources/MozillaRustComponentsWrapper/Generated/nimbus.swift +++ b/MozillaRustComponents/Sources/MozillaRustComponentsWrapper/Generated/nimbus.swift @@ -1735,12 +1735,11 @@ public struct AppContext { public var androidSdkVersion: String? public var debugTag: String? public var installationDate: Int64? - public var homeDirectory: String? public var customTargetingAttributes: JsonObject? // Default memberwise initializers are never public by default, so we // declare one manually. - public init(appName: String, appId: String, channel: String, appVersion: String?, appBuild: String?, architecture: String?, deviceManufacturer: String?, deviceModel: String?, locale: String?, os: String?, osVersion: String?, androidSdkVersion: String?, debugTag: String?, installationDate: Int64?, homeDirectory: String?, customTargetingAttributes: JsonObject?) { + public init(appName: String, appId: String, channel: String, appVersion: String?, appBuild: String?, architecture: String?, deviceManufacturer: String?, deviceModel: String?, locale: String?, os: String?, osVersion: String?, androidSdkVersion: String?, debugTag: String?, installationDate: Int64?, customTargetingAttributes: JsonObject?) { self.appName = appName self.appId = appId self.channel = channel @@ -1755,7 +1754,6 @@ public struct AppContext { self.androidSdkVersion = androidSdkVersion self.debugTag = debugTag self.installationDate = installationDate - self.homeDirectory = homeDirectory self.customTargetingAttributes = customTargetingAttributes } } @@ -1809,9 +1807,6 @@ extension AppContext: Equatable, Hashable { if lhs.installationDate != rhs.installationDate { return false } - if lhs.homeDirectory != rhs.homeDirectory { - return false - } if lhs.customTargetingAttributes != rhs.customTargetingAttributes { return false } @@ -1833,7 +1828,6 @@ extension AppContext: Equatable, Hashable { hasher.combine(androidSdkVersion) hasher.combine(debugTag) hasher.combine(installationDate) - hasher.combine(homeDirectory) hasher.combine(customTargetingAttributes) } } @@ -1861,7 +1855,6 @@ public struct FfiConverterTypeAppContext: FfiConverterRustBuffer { androidSdkVersion: FfiConverterOptionString.read(from: &buf), debugTag: FfiConverterOptionString.read(from: &buf), installationDate: FfiConverterOptionInt64.read(from: &buf), - homeDirectory: FfiConverterOptionString.read(from: &buf), customTargetingAttributes: FfiConverterOptionTypeJsonObject.read(from: &buf) ) } @@ -1881,7 +1874,6 @@ public struct FfiConverterTypeAppContext: FfiConverterRustBuffer { FfiConverterOptionString.write(value.androidSdkVersion, into: &buf) FfiConverterOptionString.write(value.debugTag, into: &buf) FfiConverterOptionInt64.write(value.installationDate, into: &buf) - FfiConverterOptionString.write(value.homeDirectory, into: &buf) FfiConverterOptionTypeJsonObject.write(value.customTargetingAttributes, into: &buf) } }