Skip to content

Commit d86f85a

Browse files
author
Tarik Eshaq
authored
Version 94.0.0 (#70)
1 parent 52bb3d6 commit d86f85a

File tree

8 files changed

+363
-264
lines changed

8 files changed

+363
-264
lines changed

Package.swift

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

4-
let checksum = "fed5bed5e96003fc5d88b57771649c680ad7438f72ce95dc556163d70dbf6612"
5-
let version = "v93.7.1"
4+
let checksum = "3db99d66288f471da92fc9b6849208096e568529b1d9bf88a772a490c512e82e"
5+
let version = "v94.0.0"
66
let url = "https://github.com/mozilla/application-services/releases/download/\(version)/MozillaRustComponents.xcframework.zip"
77

88
// Focus xcframework
9-
let focusChecksum = "1040f11947d2564512f144a6be20bd540d9fe282179cebb817afc768a1f43306"
9+
let focusChecksum = "add012de5e5695719d462be3b276554490d266ffd6ed6001b6c92c14f4032d43"
1010
let focusUrl = "https://github.com/mozilla/application-services/releases/download/\(version)/FocusRustComponents.xcframework.zip"
1111
let package = Package(
1212
name: "MozillaRustComponentsSwift",

generate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ rm -rf "$FOCUS_DIR" && mkdir -p "$FOCUS_DIR"
3131
# Glean metrics.
3232
# Run this first, because it appears to delete any other .swift files in the output directory.
3333
# Also, it wants to be run from inside Xcode, so we set some env vars to fake it out.
34-
SOURCE_ROOT="$THIS_DIR" PROJECT="MozillaAppServices" "$GLEAN_GENERATOR" -o "$OUT_DIR/Generated/Metrics/" "$APP_SERVICES_DIR/components/nimbus/metrics.yaml" "$APP_SERVICES_DIR/components/logins/ios/metrics.yaml"
34+
SOURCE_ROOT="$THIS_DIR" PROJECT="MozillaAppServices" "$GLEAN_GENERATOR" -o "$OUT_DIR/Generated/Metrics/" "$APP_SERVICES_DIR/components/nimbus/metrics.yaml"
3535

3636

3737

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

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

25-
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2022, month: 7, day: 27, hour: 15, minute: 6, second: 30))
25+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2022, month: 8, day: 5, hour: 19, minute: 16, second: 22))
2626
}
2727

2828
enum NimbusEvents {
@@ -172,63 +172,4 @@ extension GleanMetrics {
172172

173173
}
174174

175-
enum LoginsStoreMigration {
176-
/// The total number of login records processed by the migration
177-
static let numProcessed = CounterMetricType( // generated from logins_store_migration.num_processed
178-
CommonMetricData(
179-
category: "logins_store_migration",
180-
name: "num_processed",
181-
sendInPings: ["metrics"],
182-
lifetime: .ping,
183-
disabled: true
184-
)
185-
)
186-
187-
/// The total number of login records successfully migrated
188-
static let numSucceeded = CounterMetricType( // generated from logins_store_migration.num_succeeded
189-
CommonMetricData(
190-
category: "logins_store_migration",
191-
name: "num_succeeded",
192-
sendInPings: ["metrics"],
193-
lifetime: .ping,
194-
disabled: true
195-
)
196-
)
197-
198-
/// The total number of login records which failed to migrate
199-
static let numFailed = CounterMetricType( // generated from logins_store_migration.num_failed
200-
CommonMetricData(
201-
category: "logins_store_migration",
202-
name: "num_failed",
203-
sendInPings: ["metrics"],
204-
lifetime: .ping,
205-
disabled: true
206-
)
207-
)
208-
209-
/// How long the migration tool
210-
static let totalDuration = TimespanMetricType( // generated from logins_store_migration.total_duration
211-
CommonMetricData(
212-
category: "logins_store_migration",
213-
name: "total_duration",
214-
sendInPings: ["metrics"],
215-
lifetime: .ping,
216-
disabled: true
217-
)
218-
, .millisecond
219-
)
220-
221-
/// Errors discovered in the migration.
222-
static let errors = StringListMetricType( // generated from logins_store_migration.errors
223-
CommonMetricData(
224-
category: "logins_store_migration",
225-
name: "errors",
226-
sendInPings: ["metrics"],
227-
lifetime: .ping,
228-
disabled: true
229-
)
230-
)
231-
232-
}
233-
234175
}

swift-source/all/Generated/places.swift

Lines changed: 122 additions & 121 deletions
Large diffs are not rendered by default.

swift-source/all/Generated/placesFFI.h

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -46,227 +46,227 @@ typedef struct RustCallStatus {
4646
// ⚠️ increment the version suffix in all instances of UNIFFI_SHARED_HEADER_V4 in this file. ⚠️
4747
#endif // def UNIFFI_SHARED_H
4848

49-
void ffi_places_56cb_SqlInterruptHandle_object_free(
49+
void ffi_places_3e8_SqlInterruptHandle_object_free(
5050
void*_Nonnull ptr,
5151
RustCallStatus *_Nonnull out_status
5252
);
53-
void places_56cb_SqlInterruptHandle_interrupt(
53+
void places_3e8_SqlInterruptHandle_interrupt(
5454
void*_Nonnull ptr,
5555
RustCallStatus *_Nonnull out_status
5656
);
57-
void ffi_places_56cb_PlacesApi_object_free(
57+
void ffi_places_3e8_PlacesApi_object_free(
5858
void*_Nonnull ptr,
5959
RustCallStatus *_Nonnull out_status
6060
);
61-
void*_Nonnull places_56cb_PlacesApi_new_connection(
61+
void*_Nonnull places_3e8_PlacesApi_new_connection(
6262
void*_Nonnull ptr,RustBuffer conn_type,
6363
RustCallStatus *_Nonnull out_status
6464
);
65-
void places_56cb_PlacesApi_register_with_sync_manager(
65+
void places_3e8_PlacesApi_register_with_sync_manager(
6666
void*_Nonnull ptr,
6767
RustCallStatus *_Nonnull out_status
6868
);
69-
void places_56cb_PlacesApi_reset_history(
69+
void places_3e8_PlacesApi_reset_history(
7070
void*_Nonnull ptr,
7171
RustCallStatus *_Nonnull out_status
7272
);
73-
RustBuffer places_56cb_PlacesApi_history_sync(
73+
RustBuffer places_3e8_PlacesApi_history_sync(
7474
void*_Nonnull ptr,RustBuffer key_id,RustBuffer access_token,RustBuffer sync_key,RustBuffer tokenserver_url,
7575
RustCallStatus *_Nonnull out_status
7676
);
77-
RustBuffer places_56cb_PlacesApi_bookmarks_sync(
77+
RustBuffer places_3e8_PlacesApi_bookmarks_sync(
7878
void*_Nonnull ptr,RustBuffer key_id,RustBuffer access_token,RustBuffer sync_key,RustBuffer tokenserver_url,
7979
RustCallStatus *_Nonnull out_status
8080
);
81-
RustBuffer places_56cb_PlacesApi_places_pinned_sites_import_from_fennec(
81+
RustBuffer places_3e8_PlacesApi_places_pinned_sites_import_from_fennec(
8282
void*_Nonnull ptr,RustBuffer db_path,
8383
RustCallStatus *_Nonnull out_status
8484
);
85-
RustBuffer places_56cb_PlacesApi_places_history_import_from_fennec(
85+
RustBuffer places_3e8_PlacesApi_places_history_import_from_fennec(
8686
void*_Nonnull ptr,RustBuffer db_path,
8787
RustCallStatus *_Nonnull out_status
8888
);
89-
RustBuffer places_56cb_PlacesApi_places_bookmarks_import_from_fennec(
89+
RustBuffer places_3e8_PlacesApi_places_bookmarks_import_from_fennec(
9090
void*_Nonnull ptr,RustBuffer db_path,
9191
RustCallStatus *_Nonnull out_status
9292
);
93-
void places_56cb_PlacesApi_places_bookmarks_import_from_ios(
93+
void places_3e8_PlacesApi_places_bookmarks_import_from_ios(
9494
void*_Nonnull ptr,RustBuffer db_path,
9595
RustCallStatus *_Nonnull out_status
9696
);
97-
void places_56cb_PlacesApi_bookmarks_reset(
97+
void places_3e8_PlacesApi_bookmarks_reset(
9898
void*_Nonnull ptr,
9999
RustCallStatus *_Nonnull out_status
100100
);
101-
void ffi_places_56cb_PlacesConnection_object_free(
101+
void ffi_places_3e8_PlacesConnection_object_free(
102102
void*_Nonnull ptr,
103103
RustCallStatus *_Nonnull out_status
104104
);
105-
void*_Nonnull places_56cb_PlacesConnection_new_interrupt_handle(
105+
void*_Nonnull places_3e8_PlacesConnection_new_interrupt_handle(
106106
void*_Nonnull ptr,
107107
RustCallStatus *_Nonnull out_status
108108
);
109-
RustBuffer places_56cb_PlacesConnection_get_latest_history_metadata_for_url(
109+
RustBuffer places_3e8_PlacesConnection_get_latest_history_metadata_for_url(
110110
void*_Nonnull ptr,RustBuffer url,
111111
RustCallStatus *_Nonnull out_status
112112
);
113-
RustBuffer places_56cb_PlacesConnection_get_history_metadata_between(
113+
RustBuffer places_3e8_PlacesConnection_get_history_metadata_between(
114114
void*_Nonnull ptr,int64_t start,int64_t end,
115115
RustCallStatus *_Nonnull out_status
116116
);
117-
RustBuffer places_56cb_PlacesConnection_get_history_metadata_since(
117+
RustBuffer places_3e8_PlacesConnection_get_history_metadata_since(
118118
void*_Nonnull ptr,int64_t since,
119119
RustCallStatus *_Nonnull out_status
120120
);
121-
RustBuffer places_56cb_PlacesConnection_query_autocomplete(
121+
RustBuffer places_3e8_PlacesConnection_query_autocomplete(
122122
void*_Nonnull ptr,RustBuffer search,int32_t limit,
123123
RustCallStatus *_Nonnull out_status
124124
);
125-
void places_56cb_PlacesConnection_accept_result(
125+
void places_3e8_PlacesConnection_accept_result(
126126
void*_Nonnull ptr,RustBuffer search_string,RustBuffer url,
127127
RustCallStatus *_Nonnull out_status
128128
);
129-
RustBuffer places_56cb_PlacesConnection_match_url(
129+
RustBuffer places_3e8_PlacesConnection_match_url(
130130
void*_Nonnull ptr,RustBuffer query,
131131
RustCallStatus *_Nonnull out_status
132132
);
133-
RustBuffer places_56cb_PlacesConnection_query_history_metadata(
133+
RustBuffer places_3e8_PlacesConnection_query_history_metadata(
134134
void*_Nonnull ptr,RustBuffer query,int32_t limit,
135135
RustCallStatus *_Nonnull out_status
136136
);
137-
RustBuffer places_56cb_PlacesConnection_get_history_highlights(
137+
RustBuffer places_3e8_PlacesConnection_get_history_highlights(
138138
void*_Nonnull ptr,RustBuffer weights,int32_t limit,
139139
RustCallStatus *_Nonnull out_status
140140
);
141-
void places_56cb_PlacesConnection_note_history_metadata_observation(
141+
void places_3e8_PlacesConnection_note_history_metadata_observation(
142142
void*_Nonnull ptr,RustBuffer data,
143143
RustCallStatus *_Nonnull out_status
144144
);
145-
void places_56cb_PlacesConnection_metadata_delete(
145+
void places_3e8_PlacesConnection_metadata_delete(
146146
void*_Nonnull ptr,RustBuffer url,RustBuffer referrer_url,RustBuffer search_term,
147147
RustCallStatus *_Nonnull out_status
148148
);
149-
void places_56cb_PlacesConnection_metadata_delete_older_than(
149+
void places_3e8_PlacesConnection_metadata_delete_older_than(
150150
void*_Nonnull ptr,int64_t older_than,
151151
RustCallStatus *_Nonnull out_status
152152
);
153-
void places_56cb_PlacesConnection_apply_observation(
153+
void places_3e8_PlacesConnection_apply_observation(
154154
void*_Nonnull ptr,RustBuffer visit,
155155
RustCallStatus *_Nonnull out_status
156156
);
157-
RustBuffer places_56cb_PlacesConnection_get_visited_urls_in_range(
157+
RustBuffer places_3e8_PlacesConnection_get_visited_urls_in_range(
158158
void*_Nonnull ptr,int64_t start,int64_t end,int8_t include_remote,
159159
RustCallStatus *_Nonnull out_status
160160
);
161-
RustBuffer places_56cb_PlacesConnection_get_visit_infos(
161+
RustBuffer places_3e8_PlacesConnection_get_visit_infos(
162162
void*_Nonnull ptr,int64_t start_date,int64_t end_date,int32_t exclude_types,
163163
RustCallStatus *_Nonnull out_status
164164
);
165-
int64_t places_56cb_PlacesConnection_get_visit_count(
165+
int64_t places_3e8_PlacesConnection_get_visit_count(
166166
void*_Nonnull ptr,int32_t exclude_types,
167167
RustCallStatus *_Nonnull out_status
168168
);
169-
RustBuffer places_56cb_PlacesConnection_get_visit_page(
169+
RustBuffer places_3e8_PlacesConnection_get_visit_page(
170170
void*_Nonnull ptr,int64_t offset,int64_t count,int32_t exclude_types,
171171
RustCallStatus *_Nonnull out_status
172172
);
173-
RustBuffer places_56cb_PlacesConnection_get_visit_page_with_bound(
173+
RustBuffer places_3e8_PlacesConnection_get_visit_page_with_bound(
174174
void*_Nonnull ptr,int64_t bound,int64_t offset,int64_t count,int32_t exclude_types,
175175
RustCallStatus *_Nonnull out_status
176176
);
177-
RustBuffer places_56cb_PlacesConnection_get_visited(
177+
RustBuffer places_3e8_PlacesConnection_get_visited(
178178
void*_Nonnull ptr,RustBuffer urls,
179179
RustCallStatus *_Nonnull out_status
180180
);
181-
void places_56cb_PlacesConnection_delete_visits_for(
181+
void places_3e8_PlacesConnection_delete_visits_for(
182182
void*_Nonnull ptr,RustBuffer url,
183183
RustCallStatus *_Nonnull out_status
184184
);
185-
void places_56cb_PlacesConnection_delete_visits_between(
185+
void places_3e8_PlacesConnection_delete_visits_between(
186186
void*_Nonnull ptr,int64_t start,int64_t end,
187187
RustCallStatus *_Nonnull out_status
188188
);
189-
void places_56cb_PlacesConnection_delete_visit(
189+
void places_3e8_PlacesConnection_delete_visit(
190190
void*_Nonnull ptr,RustBuffer url,int64_t timestamp,
191191
RustCallStatus *_Nonnull out_status
192192
);
193-
RustBuffer places_56cb_PlacesConnection_get_top_frecent_site_infos(
193+
RustBuffer places_3e8_PlacesConnection_get_top_frecent_site_infos(
194194
void*_Nonnull ptr,int32_t num_items,RustBuffer threshold_option,
195195
RustCallStatus *_Nonnull out_status
196196
);
197-
void places_56cb_PlacesConnection_wipe_local_history(
197+
void places_3e8_PlacesConnection_wipe_local_history(
198198
void*_Nonnull ptr,
199199
RustCallStatus *_Nonnull out_status
200200
);
201-
void places_56cb_PlacesConnection_delete_everything_history(
201+
void places_3e8_PlacesConnection_delete_everything_history(
202202
void*_Nonnull ptr,
203203
RustCallStatus *_Nonnull out_status
204204
);
205-
void places_56cb_PlacesConnection_prune_destructively(
205+
void places_3e8_PlacesConnection_prune_destructively(
206206
void*_Nonnull ptr,
207207
RustCallStatus *_Nonnull out_status
208208
);
209-
void places_56cb_PlacesConnection_run_maintenance(
210-
void*_Nonnull ptr,
209+
void places_3e8_PlacesConnection_run_maintenance(
210+
void*_Nonnull ptr,uint32_t db_size_limit,
211211
RustCallStatus *_Nonnull out_status
212212
);
213-
RustBuffer places_56cb_PlacesConnection_bookmarks_get_tree(
213+
RustBuffer places_3e8_PlacesConnection_bookmarks_get_tree(
214214
void*_Nonnull ptr,RustBuffer item_guid,
215215
RustCallStatus *_Nonnull out_status
216216
);
217-
RustBuffer places_56cb_PlacesConnection_bookmarks_get_by_guid(
217+
RustBuffer places_3e8_PlacesConnection_bookmarks_get_by_guid(
218218
void*_Nonnull ptr,RustBuffer guid,int8_t get_direct_children,
219219
RustCallStatus *_Nonnull out_status
220220
);
221-
RustBuffer places_56cb_PlacesConnection_bookmarks_get_all_with_url(
221+
RustBuffer places_3e8_PlacesConnection_bookmarks_get_all_with_url(
222222
void*_Nonnull ptr,RustBuffer url,
223223
RustCallStatus *_Nonnull out_status
224224
);
225-
RustBuffer places_56cb_PlacesConnection_bookmarks_search(
225+
RustBuffer places_3e8_PlacesConnection_bookmarks_search(
226226
void*_Nonnull ptr,RustBuffer query,int32_t limit,
227227
RustCallStatus *_Nonnull out_status
228228
);
229-
RustBuffer places_56cb_PlacesConnection_bookmarks_get_recent(
229+
RustBuffer places_3e8_PlacesConnection_bookmarks_get_recent(
230230
void*_Nonnull ptr,int32_t limit,
231231
RustCallStatus *_Nonnull out_status
232232
);
233-
int8_t places_56cb_PlacesConnection_bookmarks_delete(
233+
int8_t places_3e8_PlacesConnection_bookmarks_delete(
234234
void*_Nonnull ptr,RustBuffer id,
235235
RustCallStatus *_Nonnull out_status
236236
);
237-
void places_56cb_PlacesConnection_bookmarks_delete_everything(
237+
void places_3e8_PlacesConnection_bookmarks_delete_everything(
238238
void*_Nonnull ptr,
239239
RustCallStatus *_Nonnull out_status
240240
);
241-
RustBuffer places_56cb_PlacesConnection_bookmarks_get_url_for_keyword(
241+
RustBuffer places_3e8_PlacesConnection_bookmarks_get_url_for_keyword(
242242
void*_Nonnull ptr,RustBuffer keyword,
243243
RustCallStatus *_Nonnull out_status
244244
);
245-
void places_56cb_PlacesConnection_bookmarks_update(
245+
void places_3e8_PlacesConnection_bookmarks_update(
246246
void*_Nonnull ptr,RustBuffer data,
247247
RustCallStatus *_Nonnull out_status
248248
);
249-
RustBuffer places_56cb_PlacesConnection_bookmarks_insert(
249+
RustBuffer places_3e8_PlacesConnection_bookmarks_insert(
250250
void*_Nonnull ptr,RustBuffer bookmark,
251251
RustCallStatus *_Nonnull out_status
252252
);
253-
void*_Nonnull places_56cb_places_api_new(
253+
void*_Nonnull places_3e8_places_api_new(
254254
RustBuffer db_path,
255255
RustCallStatus *_Nonnull out_status
256256
);
257-
RustBuffer ffi_places_56cb_rustbuffer_alloc(
257+
RustBuffer ffi_places_3e8_rustbuffer_alloc(
258258
int32_t size,
259259
RustCallStatus *_Nonnull out_status
260260
);
261-
RustBuffer ffi_places_56cb_rustbuffer_from_bytes(
261+
RustBuffer ffi_places_3e8_rustbuffer_from_bytes(
262262
ForeignBytes bytes,
263263
RustCallStatus *_Nonnull out_status
264264
);
265-
void ffi_places_56cb_rustbuffer_free(
265+
void ffi_places_3e8_rustbuffer_free(
266266
RustBuffer buf,
267267
RustCallStatus *_Nonnull out_status
268268
);
269-
RustBuffer ffi_places_56cb_rustbuffer_reserve(
269+
RustBuffer ffi_places_3e8_rustbuffer_reserve(
270270
RustBuffer buf,int32_t additional,
271271
RustCallStatus *_Nonnull out_status
272272
);

0 commit comments

Comments
 (0)