Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions MozillaRustComponents/Package.swift
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -1755,7 +1754,6 @@ public struct AppContext {
self.androidSdkVersion = androidSdkVersion
self.debugTag = debugTag
self.installationDate = installationDate
self.homeDirectory = homeDirectory
self.customTargetingAttributes = customTargetingAttributes
}
}
Expand Down Expand Up @@ -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
}
Expand All @@ -1833,7 +1828,6 @@ extension AppContext: Equatable, Hashable {
hasher.combine(androidSdkVersion)
hasher.combine(debugTag)
hasher.combine(installationDate)
hasher.combine(homeDirectory)
hasher.combine(customTargetingAttributes)
}
}
Expand Down Expand Up @@ -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)
)
}
Expand All @@ -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)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ public extension Nimbus {
androidSdkVersion: nil,
debugTag: "Nimbus.rs",
installationDate: installationDateSinceEpoch,
homeDirectory: nil,
customTargetingAttributes: try? appSettings.customTargetingAttributes.stringify()
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -1755,7 +1754,6 @@ public struct AppContext {
self.androidSdkVersion = androidSdkVersion
self.debugTag = debugTag
self.installationDate = installationDate
self.homeDirectory = homeDirectory
self.customTargetingAttributes = customTargetingAttributes
}
}
Expand Down Expand Up @@ -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
}
Expand All @@ -1833,7 +1828,6 @@ extension AppContext: Equatable, Hashable {
hasher.combine(androidSdkVersion)
hasher.combine(debugTag)
hasher.combine(installationDate)
hasher.combine(homeDirectory)
hasher.combine(customTargetingAttributes)
}
}
Expand Down Expand Up @@ -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)
)
}
Expand All @@ -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)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ public extension Nimbus {
androidSdkVersion: nil,
debugTag: "Nimbus.rs",
installationDate: installationDateSinceEpoch,
homeDirectory: nil,
customTargetingAttributes: try? appSettings.customTargetingAttributes.stringify()
)
}
Expand Down