Auto update with latest AS Release v92.0.0 (#44)

* Updates Package.swift with v92.0.0 release * Version 92.0.0 Co-authored-by: Firefox Sync Engineering <[email protected]>
mozilla · Mar 24, 2022 · 5432686 · 5432686
1 parent 29772c8
commit 5432686
Show file tree

Hide file tree

Showing 10 changed files with 124 additions and 183 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,8 +1,8 @@
 // swift-tools-version:5.4
 import PackageDescription
 
-let checksum = "16545b8edb256f06ca9f37e9da233ed4324d4a5545f406603b9150208f9290ce"
-let version = "v91.1.0"
+let checksum = "554787eac2c80f4f045ef66fb8e5f503322ed02bc4feedca041dc4a0f9fce50e"
+let version = "v92.0.0"
 let url = "https://github.com/mozilla/application-services/releases/download/\(version)/MozillaRustComponents.xcframework.zip"
 
 let package = Package(

diff --git a/swift-source/Generated/Metrics/Metrics.swift b/swift-source/Generated/Metrics/Metrics.swift
@@ -22,7 +22,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: 2022, month: 2, day: 16, hour: 17, minute: 5, second: 28))
+        public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2022, month: 3, day: 17, hour: 21, minute: 7, second: 57))
     }
 
     enum NimbusEvents {

diff --git a/swift-source/Generated/places.swift b/swift-source/Generated/places.swift
diff --git a/swift-source/Generated/placesFFI.h b/swift-source/Generated/placesFFI.h
@@ -46,231 +46,227 @@ typedef struct RustCallStatus {
 // ⚠️ increment the version suffix in all instances of UNIFFI_SHARED_HEADER_V4 in this file.           ⚠️
 #endif // def UNIFFI_SHARED_H
 
-void ffi_places_de65_SqlInterruptHandle_object_free(
+void ffi_places_d815_SqlInterruptHandle_object_free(
       void*_Nonnull ptr,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_SqlInterruptHandle_interrupt(
+void places_d815_SqlInterruptHandle_interrupt(
       void*_Nonnull ptr,
     RustCallStatus *_Nonnull out_status
     );
-void ffi_places_de65_PlacesApi_object_free(
+void ffi_places_d815_PlacesApi_object_free(
       void*_Nonnull ptr,
     RustCallStatus *_Nonnull out_status
     );
-void*_Nonnull places_de65_PlacesApi_new_connection(
+void*_Nonnull places_d815_PlacesApi_new_connection(
       void*_Nonnull ptr,RustBuffer conn_type,
     RustCallStatus *_Nonnull out_status
     );
-void*_Nonnull places_de65_PlacesApi_new_sync_conn_interrupt_handle(
+void places_d815_PlacesApi_register_with_sync_manager(
       void*_Nonnull ptr,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_PlacesApi_register_with_sync_manager(
+void places_d815_PlacesApi_reset_history(
       void*_Nonnull ptr,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_PlacesApi_reset_history(
-      void*_Nonnull ptr,
-    RustCallStatus *_Nonnull out_status
-    );
-RustBuffer places_de65_PlacesApi_history_sync(
+RustBuffer places_d815_PlacesApi_history_sync(
       void*_Nonnull ptr,RustBuffer key_id,RustBuffer access_token,RustBuffer sync_key,RustBuffer tokenserver_url,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesApi_bookmarks_sync(
+RustBuffer places_d815_PlacesApi_bookmarks_sync(
       void*_Nonnull ptr,RustBuffer key_id,RustBuffer access_token,RustBuffer sync_key,RustBuffer tokenserver_url,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesApi_places_pinned_sites_import_from_fennec(
+RustBuffer places_d815_PlacesApi_places_pinned_sites_import_from_fennec(
       void*_Nonnull ptr,RustBuffer db_path,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesApi_places_history_import_from_fennec(
+RustBuffer places_d815_PlacesApi_places_history_import_from_fennec(
       void*_Nonnull ptr,RustBuffer db_path,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesApi_places_bookmarks_import_from_fennec(
+RustBuffer places_d815_PlacesApi_places_bookmarks_import_from_fennec(
       void*_Nonnull ptr,RustBuffer db_path,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_PlacesApi_places_bookmarks_import_from_ios(
+void places_d815_PlacesApi_places_bookmarks_import_from_ios(
       void*_Nonnull ptr,RustBuffer db_path,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_PlacesApi_bookmarks_reset(
+void places_d815_PlacesApi_bookmarks_reset(
       void*_Nonnull ptr,
     RustCallStatus *_Nonnull out_status
     );
-void ffi_places_de65_PlacesConnection_object_free(
+void ffi_places_d815_PlacesConnection_object_free(
       void*_Nonnull ptr,
     RustCallStatus *_Nonnull out_status
     );
-void*_Nonnull places_de65_PlacesConnection_new_interrupt_handle(
+void*_Nonnull places_d815_PlacesConnection_new_interrupt_handle(
       void*_Nonnull ptr,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_get_latest_history_metadata_for_url(
+RustBuffer places_d815_PlacesConnection_get_latest_history_metadata_for_url(
       void*_Nonnull ptr,RustBuffer url,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_get_history_metadata_between(
+RustBuffer places_d815_PlacesConnection_get_history_metadata_between(
       void*_Nonnull ptr,int64_t start,int64_t end,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_get_history_metadata_since(
+RustBuffer places_d815_PlacesConnection_get_history_metadata_since(
       void*_Nonnull ptr,int64_t since,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_query_autocomplete(
+RustBuffer places_d815_PlacesConnection_query_autocomplete(
       void*_Nonnull ptr,RustBuffer search,int32_t limit,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_PlacesConnection_accept_result(
+void places_d815_PlacesConnection_accept_result(
       void*_Nonnull ptr,RustBuffer search_string,RustBuffer url,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_match_url(
+RustBuffer places_d815_PlacesConnection_match_url(
       void*_Nonnull ptr,RustBuffer query,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_query_history_metadata(
+RustBuffer places_d815_PlacesConnection_query_history_metadata(
       void*_Nonnull ptr,RustBuffer query,int32_t limit,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_get_history_highlights(
+RustBuffer places_d815_PlacesConnection_get_history_highlights(
       void*_Nonnull ptr,RustBuffer weights,int32_t limit,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_PlacesConnection_note_history_metadata_observation(
+void places_d815_PlacesConnection_note_history_metadata_observation(
       void*_Nonnull ptr,RustBuffer data,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_PlacesConnection_metadata_delete(
+void places_d815_PlacesConnection_metadata_delete(
       void*_Nonnull ptr,RustBuffer url,RustBuffer referrer_url,RustBuffer search_term,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_PlacesConnection_metadata_delete_older_than(
+void places_d815_PlacesConnection_metadata_delete_older_than(
       void*_Nonnull ptr,int64_t older_than,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_PlacesConnection_apply_observation(
+void places_d815_PlacesConnection_apply_observation(
       void*_Nonnull ptr,RustBuffer visit,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_get_visited_urls_in_range(
+RustBuffer places_d815_PlacesConnection_get_visited_urls_in_range(
       void*_Nonnull ptr,int64_t start,int64_t end,int8_t include_remote,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_get_visit_infos(
+RustBuffer places_d815_PlacesConnection_get_visit_infos(
       void*_Nonnull ptr,int64_t start_date,int64_t end_date,int32_t exclude_types,
     RustCallStatus *_Nonnull out_status
     );
-int64_t places_de65_PlacesConnection_get_visit_count(
+int64_t places_d815_PlacesConnection_get_visit_count(
       void*_Nonnull ptr,int32_t exclude_types,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_get_visit_page(
+RustBuffer places_d815_PlacesConnection_get_visit_page(
       void*_Nonnull ptr,int64_t offset,int64_t count,int32_t exclude_types,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_get_visit_page_with_bound(
+RustBuffer places_d815_PlacesConnection_get_visit_page_with_bound(
       void*_Nonnull ptr,int64_t bound,int64_t offset,int64_t count,int32_t exclude_types,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_get_visited(
+RustBuffer places_d815_PlacesConnection_get_visited(
       void*_Nonnull ptr,RustBuffer urls,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_PlacesConnection_delete_visits_for(
+void places_d815_PlacesConnection_delete_visits_for(
       void*_Nonnull ptr,RustBuffer url,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_PlacesConnection_delete_visits_between(
+void places_d815_PlacesConnection_delete_visits_between(
       void*_Nonnull ptr,int64_t start,int64_t end,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_PlacesConnection_delete_visit(
+void places_d815_PlacesConnection_delete_visit(
       void*_Nonnull ptr,RustBuffer url,int64_t timestamp,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_get_top_frecent_site_infos(
+RustBuffer places_d815_PlacesConnection_get_top_frecent_site_infos(
       void*_Nonnull ptr,int32_t num_items,RustBuffer threshold_option,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_PlacesConnection_wipe_local_history(
+void places_d815_PlacesConnection_wipe_local_history(
       void*_Nonnull ptr,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_PlacesConnection_delete_everything_history(
+void places_d815_PlacesConnection_delete_everything_history(
       void*_Nonnull ptr,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_PlacesConnection_prune_destructively(
+void places_d815_PlacesConnection_prune_destructively(
       void*_Nonnull ptr,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_PlacesConnection_run_maintenance(
+void places_d815_PlacesConnection_run_maintenance(
       void*_Nonnull ptr,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_bookmarks_get_tree(
+RustBuffer places_d815_PlacesConnection_bookmarks_get_tree(
       void*_Nonnull ptr,RustBuffer item_guid,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_bookmarks_get_by_guid(
+RustBuffer places_d815_PlacesConnection_bookmarks_get_by_guid(
       void*_Nonnull ptr,RustBuffer guid,int8_t get_direct_children,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_bookmarks_get_all_with_url(
+RustBuffer places_d815_PlacesConnection_bookmarks_get_all_with_url(
       void*_Nonnull ptr,RustBuffer url,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_bookmarks_search(
+RustBuffer places_d815_PlacesConnection_bookmarks_search(
       void*_Nonnull ptr,RustBuffer query,int32_t limit,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_bookmarks_get_recent(
+RustBuffer places_d815_PlacesConnection_bookmarks_get_recent(
       void*_Nonnull ptr,int32_t limit,
     RustCallStatus *_Nonnull out_status
     );
-int8_t places_de65_PlacesConnection_bookmarks_delete(
+int8_t places_d815_PlacesConnection_bookmarks_delete(
       void*_Nonnull ptr,RustBuffer id,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_PlacesConnection_bookmarks_delete_everything(
+void places_d815_PlacesConnection_bookmarks_delete_everything(
       void*_Nonnull ptr,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_bookmarks_get_url_for_keyword(
+RustBuffer places_d815_PlacesConnection_bookmarks_get_url_for_keyword(
       void*_Nonnull ptr,RustBuffer keyword,
     RustCallStatus *_Nonnull out_status
     );
-void places_de65_PlacesConnection_bookmarks_update(
+void places_d815_PlacesConnection_bookmarks_update(
       void*_Nonnull ptr,RustBuffer data,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer places_de65_PlacesConnection_bookmarks_insert(
+RustBuffer places_d815_PlacesConnection_bookmarks_insert(
       void*_Nonnull ptr,RustBuffer bookmark,
     RustCallStatus *_Nonnull out_status
     );
-void*_Nonnull places_de65_places_api_new(
+void*_Nonnull places_d815_places_api_new(
       RustBuffer db_path,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer ffi_places_de65_rustbuffer_alloc(
+RustBuffer ffi_places_d815_rustbuffer_alloc(
       int32_t size,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer ffi_places_de65_rustbuffer_from_bytes(
+RustBuffer ffi_places_d815_rustbuffer_from_bytes(
       ForeignBytes bytes,
     RustCallStatus *_Nonnull out_status
     );
-void ffi_places_de65_rustbuffer_free(
+void ffi_places_d815_rustbuffer_free(
       RustBuffer buf,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer ffi_places_de65_rustbuffer_reserve(
+RustBuffer ffi_places_d815_rustbuffer_reserve(
       RustBuffer buf,int32_t additional,
     RustCallStatus *_Nonnull out_status
     );
diff --git a/swift-source/Logins/LoginsStorage.swift b/swift-source/Logins/LoginsStorage.swift
@@ -3,16 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import Foundation
+import Glean
 import UIKit
-#if canImport(Sync15)
-    import Sync15
-#endif
-#if canImport(MozillaRustComponents)
-    import MozillaRustComponents
-#endif
-#if canImport(Glean)
-    @_exported import Glean
-#endif
 
 typealias LoginsStoreError = LoginsStorageError
 

diff --git a/swift-source/Nimbus/GleanPlumbHelpers.swift b/swift-source/Nimbus/GleanPlumbHelpers.swift
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import Foundation
+import Glean
 
 /**
  * Instances of this class are useful for implementing a messaging service based upon

diff --git a/swift-source/Nimbus/Nimbus.swift b/swift-source/Nimbus/Nimbus.swift
@@ -3,17 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import Foundation
-
-// Depending on build setup, we may be importing Glean as a Swift module
-// or we may be compiled together with it. This detects whether Glean is
-// an external module and makes it available to our entire package if so.
-//
-// Note that the files under `./Utils` are copies of internal files from
-// Glean, and it's very important they they be excluded from any build
-// that is compiling us together with Glean.
-#if canImport(Glean)
-    @_exported import Glean
-#endif
+import Glean
 
 public class Nimbus: NimbusApi {
     private let nimbusClient: NimbusClientProtocol

diff --git a/swift-source/Nimbus/NimbusApi.swift b/swift-source/Nimbus/NimbusApi.swift
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import Foundation
+import Glean
 
 /// This is the main experiments API, which is exposed through the global [Nimbus] object.
 ///

diff --git a/swift-source/Nimbus/NimbusCreate.swift b/swift-source/Nimbus/NimbusCreate.swift
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import Foundation
+import UIKit
 
 private let logTag = "Nimbus.swift"
 private let logger = Logger(tag: logTag)