Skip to content

Commit

Permalink
Merge pull request #150 from mozilla/cut-134.0
Browse files Browse the repository at this point in the history
Cut v134.0.0
  • Loading branch information
lougeniaC64 authored Nov 25, 2024
2 parents 610d1e3 + 33349fc commit 3c5d60f
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 27 deletions.
10 changes: 5 additions & 5 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// swift-tools-version:5.4
import PackageDescription

let checksum = "28a5e134935a06b4ba20bbc95ed201ab863e603dd1e291b943e88d1db1c1deab"
let version = "134.0.20241122050253"
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.134.20241122050253/artifacts/public/build/MozillaRustComponents.xcframework.zip"
let checksum = "2fc3d6b6a14adc0eb79a323b9ef324e2eaea555cd911a0ec0a22013fc10ab195"
let version = "134.0.0"
let url = "https://archive.mozilla.org/pub/app-services/releases/134.0/MozillaRustComponents.xcframework.zip"

// Focus xcframework
let focusChecksum = "bffd6e54406290e3eff067c143e2afc6915128023d5d1c14df5cc3aabad0fb49"
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.134.20241122050253/artifacts/public/build/FocusRustComponents.xcframework.zip"
let focusChecksum = "fdd071228ccb4892bf73e82a422f4988bfebe5e239e0651936a3dcc79a06db59"
let focusUrl = "https://archive.mozilla.org/pub/app-services/releases/134.0/FocusRustComponents.xcframework.zip"
let package = Package(
name: "MozillaRustComponentsSwift",
platforms: [.iOS(.v14)],
Expand Down
2 changes: 1 addition & 1 deletion swift-source/all/Generated/Metrics/Metrics.swift
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: 2024, month: 11, day: 22, hour: 5, minute: 12, second: 58))
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 11, day: 25, hour: 15, minute: 49, second: 47))
}

enum NimbusEvents {
Expand Down
14 changes: 5 additions & 9 deletions swift-source/all/Generated/remote_settings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ public protocol RemoteSettingsClientProtocol : AnyObject {
* - This method will throw if there is a network or other error when fetching the
* attachment data.
*/
func getAttachment(attachmentId: String) throws -> Data
func getAttachment(attachmentLocation: String) throws -> Data

/**
* Get the current set of records.
Expand All @@ -722,8 +722,6 @@ public protocol RemoteSettingsClientProtocol : AnyObject {
* this is that there is not much an application can do in this situation other than fall back
* to the same default handling as if records have not been synced.
*
* TODO(Bug 1919141):
*
* Application-services schedules regular dumps of the server data for specific collections.
* For these collections, `get_records` will never return None. If you would like to add your
* collection to this list, please reach out to the DISCO team.
Expand Down Expand Up @@ -815,10 +813,10 @@ open func collectionName() -> String {
* - This method will throw if there is a network or other error when fetching the
* attachment data.
*/
open func getAttachment(attachmentId: String)throws -> Data {
open func getAttachment(attachmentLocation: String)throws -> Data {
return try FfiConverterData.lift(try rustCallWithError(FfiConverterTypeRemoteSettingsError.lift) {
uniffi_remote_settings_fn_method_remotesettingsclient_get_attachment(self.uniffiClonePointer(),
FfiConverterString.lower(attachmentId),$0
FfiConverterString.lower(attachmentLocation),$0
)
})
}
Expand All @@ -837,8 +835,6 @@ open func getAttachment(attachmentId: String)throws -> Data {
* this is that there is not much an application can do in this situation other than fall back
* to the same default handling as if records have not been synced.
*
* TODO(Bug 1919141):
*
* Application-services schedules regular dumps of the server data for specific collections.
* For these collections, `get_records` will never return None. If you would like to add your
* collection to this list, please reach out to the DISCO team.
Expand Down Expand Up @@ -2336,10 +2332,10 @@ private var initializationResult: InitializationResult = {
if (uniffi_remote_settings_checksum_method_remotesettingsclient_collection_name() != 54184) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_remote_settings_checksum_method_remotesettingsclient_get_attachment() != 50902) {
if (uniffi_remote_settings_checksum_method_remotesettingsclient_get_attachment() != 40834) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_remote_settings_checksum_method_remotesettingsclient_get_records() != 20713) {
if (uniffi_remote_settings_checksum_method_remotesettingsclient_get_records() != 64865) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_remote_settings_checksum_method_remotesettingsclient_get_records_map() != 32665) {
Expand Down
2 changes: 1 addition & 1 deletion swift-source/all/Generated/remote_settingsFFI.h
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ RustBuffer uniffi_remote_settings_fn_method_remotesettingsclient_collection_name
#endif
#ifndef UNIFFI_FFIDEF_UNIFFI_REMOTE_SETTINGS_FN_METHOD_REMOTESETTINGSCLIENT_GET_ATTACHMENT
#define UNIFFI_FFIDEF_UNIFFI_REMOTE_SETTINGS_FN_METHOD_REMOTESETTINGSCLIENT_GET_ATTACHMENT
RustBuffer uniffi_remote_settings_fn_method_remotesettingsclient_get_attachment(void*_Nonnull ptr, RustBuffer attachment_id, RustCallStatus *_Nonnull out_status
RustBuffer uniffi_remote_settings_fn_method_remotesettingsclient_get_attachment(void*_Nonnull ptr, RustBuffer attachment_location, RustCallStatus *_Nonnull out_status
);
#endif
#ifndef UNIFFI_FFIDEF_UNIFFI_REMOTE_SETTINGS_FN_METHOD_REMOTESETTINGSCLIENT_GET_RECORDS
Expand Down
2 changes: 1 addition & 1 deletion swift-source/focus/Generated/Metrics/Metrics.swift
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: 2024, month: 11, day: 22, hour: 5, minute: 13, second: 0))
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 11, day: 25, hour: 15, minute: 49, second: 50))
}

enum NimbusEvents {
Expand Down
14 changes: 5 additions & 9 deletions swift-source/focus/Generated/remote_settings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ public protocol RemoteSettingsClientProtocol : AnyObject {
* - This method will throw if there is a network or other error when fetching the
* attachment data.
*/
func getAttachment(attachmentId: String) throws -> Data
func getAttachment(attachmentLocation: String) throws -> Data

/**
* Get the current set of records.
Expand All @@ -722,8 +722,6 @@ public protocol RemoteSettingsClientProtocol : AnyObject {
* this is that there is not much an application can do in this situation other than fall back
* to the same default handling as if records have not been synced.
*
* TODO(Bug 1919141):
*
* Application-services schedules regular dumps of the server data for specific collections.
* For these collections, `get_records` will never return None. If you would like to add your
* collection to this list, please reach out to the DISCO team.
Expand Down Expand Up @@ -815,10 +813,10 @@ open func collectionName() -> String {
* - This method will throw if there is a network or other error when fetching the
* attachment data.
*/
open func getAttachment(attachmentId: String)throws -> Data {
open func getAttachment(attachmentLocation: String)throws -> Data {
return try FfiConverterData.lift(try rustCallWithError(FfiConverterTypeRemoteSettingsError.lift) {
uniffi_remote_settings_fn_method_remotesettingsclient_get_attachment(self.uniffiClonePointer(),
FfiConverterString.lower(attachmentId),$0
FfiConverterString.lower(attachmentLocation),$0
)
})
}
Expand All @@ -837,8 +835,6 @@ open func getAttachment(attachmentId: String)throws -> Data {
* this is that there is not much an application can do in this situation other than fall back
* to the same default handling as if records have not been synced.
*
* TODO(Bug 1919141):
*
* Application-services schedules regular dumps of the server data for specific collections.
* For these collections, `get_records` will never return None. If you would like to add your
* collection to this list, please reach out to the DISCO team.
Expand Down Expand Up @@ -2336,10 +2332,10 @@ private var initializationResult: InitializationResult = {
if (uniffi_remote_settings_checksum_method_remotesettingsclient_collection_name() != 54184) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_remote_settings_checksum_method_remotesettingsclient_get_attachment() != 50902) {
if (uniffi_remote_settings_checksum_method_remotesettingsclient_get_attachment() != 40834) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_remote_settings_checksum_method_remotesettingsclient_get_records() != 20713) {
if (uniffi_remote_settings_checksum_method_remotesettingsclient_get_records() != 64865) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_remote_settings_checksum_method_remotesettingsclient_get_records_map() != 32665) {
Expand Down
2 changes: 1 addition & 1 deletion swift-source/focus/Generated/remote_settingsFFI.h
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ RustBuffer uniffi_remote_settings_fn_method_remotesettingsclient_collection_name
#endif
#ifndef UNIFFI_FFIDEF_UNIFFI_REMOTE_SETTINGS_FN_METHOD_REMOTESETTINGSCLIENT_GET_ATTACHMENT
#define UNIFFI_FFIDEF_UNIFFI_REMOTE_SETTINGS_FN_METHOD_REMOTESETTINGSCLIENT_GET_ATTACHMENT
RustBuffer uniffi_remote_settings_fn_method_remotesettingsclient_get_attachment(void*_Nonnull ptr, RustBuffer attachment_id, RustCallStatus *_Nonnull out_status
RustBuffer uniffi_remote_settings_fn_method_remotesettingsclient_get_attachment(void*_Nonnull ptr, RustBuffer attachment_location, RustCallStatus *_Nonnull out_status
);
#endif
#ifndef UNIFFI_FFIDEF_UNIFFI_REMOTE_SETTINGS_FN_METHOD_REMOTESETTINGSCLIENT_GET_RECORDS
Expand Down

0 comments on commit 3c5d60f

Please sign in to comment.