Skip to content

Commit 03370a1

Browse files
author
Firefox Sync Engineering
committed
Nightly auto-update (118.0.20230818144233)
1 parent ad44136 commit 03370a1

19 files changed

+65
-65
lines changed

‎Package.swift

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

4-
let checksum = "3771d0d04aeaf622eba0748c70113200e14d4c699799fe8946d9de92e8fb3f65"
5-
let version = "118.0.20230817050326"
6-
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.118.20230817050326/artifacts/public/build/MozillaRustComponents.xcframework.zip"
4+
let checksum = "2595558db971142e66136c6af093f57d992615840ca3bb0e866f2135ce85b2ee"
5+
let version = "118.0.20230818144233"
6+
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.118.20230818144233/artifacts/public/build/MozillaRustComponents.xcframework.zip"
77

88
// Focus xcframework
9-
let focusChecksum = "e5ae4e93d8399434539a89d55dcd0262d79de6b9e2091f17f5e070c455807e05"
10-
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.118.20230817050326/artifacts/public/build/FocusRustComponents.xcframework.zip"
9+
let focusChecksum = "b0a8c9b39a1ce234c9e7eb080b518fb4f2b31238e2ed0f487336b2e0fe7e318c"
10+
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.118.20230818144233/artifacts/public/build/FocusRustComponents.xcframework.zip"
1111
let package = Package(
1212
name: "MozillaRustComponentsSwift",
1313
platforms: [.iOS(.v14)],

‎swift-source/all/FxAClient/FxAccountDeviceConstellation.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,14 @@ public class DeviceConstellation {
130130

131131
/// This allows us to be helpful in certain circumstances e.g. refreshing the device list
132132
/// if we see a "device disconnected" push notification.
133-
internal func processAccountEvent(_ event: AccountEvent) {
133+
func processAccountEvent(_ event: AccountEvent) {
134134
switch event {
135135
case .deviceDisconnected, .deviceConnected: refreshState()
136136
default: return
137137
}
138138
}
139139

140-
internal func initDevice(name: String, type: DeviceType, capabilities: [DeviceCapability]) {
140+
func initDevice(name: String, type: DeviceType, capabilities: [DeviceCapability]) {
141141
// This method is called by `FxAccountManager` on its own asynchronous queue, hence
142142
// no wrapping in a `DispatchQueue.global().async`.
143143
assert(!Thread.isMainThread)
@@ -148,7 +148,7 @@ public class DeviceConstellation {
148148
}
149149
}
150150

151-
internal func ensureCapabilities(capabilities: [DeviceCapability]) {
151+
func ensureCapabilities(capabilities: [DeviceCapability]) {
152152
// This method is called by `FxAccountManager` on its own asynchronous queue, hence
153153
// no wrapping in a `DispatchQueue.global().async`.
154154
assert(!Thread.isMainThread)

‎swift-source/all/FxAClient/FxAccountLogging.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ class FxALog {
1111
category: "FxAccountManager"
1212
)
1313

14-
internal static func info(_ msg: String) {
14+
static func info(_ msg: String) {
1515
log(msg, type: .info)
1616
}
1717

18-
internal static func debug(_ msg: String) {
18+
static func debug(_ msg: String) {
1919
log(msg, type: .debug)
2020
}
2121

22-
internal static func error(_ msg: String) {
22+
static func error(_ msg: String) {
2323
log(msg, type: .error)
2424
}
2525

‎swift-source/all/FxAClient/FxAccountManager.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ open class FxAccountManager {
317317

318318
let fxaFsmQueue = DispatchQueue(label: "com.mozilla.fxa-mgr-queue")
319319

320-
internal func processEvent(event: Event, completionHandler: @escaping () -> Void) {
320+
func processEvent(event: Event, completionHandler: @escaping () -> Void) {
321321
fxaFsmQueue.async {
322322
var toProcess: Event? = event
323323
while let evt = toProcess {
@@ -340,7 +340,7 @@ open class FxAccountManager {
340340
}
341341

342342
// swiftlint:disable function_body_length
343-
internal func stateActions(forState: AccountState, via: Event) -> Event? {
343+
func stateActions(forState: AccountState, via: Event) -> Event? {
344344
switch forState {
345345
case .start: do {
346346
switch via {
@@ -539,19 +539,19 @@ open class FxAccountManager {
539539
return nil
540540
}
541541

542-
internal func createAccount() -> PersistedFirefoxAccount {
542+
func createAccount() -> PersistedFirefoxAccount {
543543
return PersistedFirefoxAccount(config: config.rustConfig)
544544
}
545545

546-
internal func tryRestoreAccount() -> PersistedFirefoxAccount? {
546+
func tryRestoreAccount() -> PersistedFirefoxAccount? {
547547
return accountStorage.read()
548548
}
549549

550-
internal func makeDeviceConstellation(account: PersistedFirefoxAccount) -> DeviceConstellation {
550+
func makeDeviceConstellation(account: PersistedFirefoxAccount) -> DeviceConstellation {
551551
return DeviceConstellation(account: account)
552552
}
553553

554-
internal func postAuthenticated(authType: FxaAuthType) {
554+
func postAuthenticated(authType: FxaAuthType) {
555555
DispatchQueue.main.async {
556556
NotificationCenter.default.post(
557557
name: .accountAuthenticated,
@@ -562,7 +562,7 @@ open class FxAccountManager {
562562
requireConstellation().refreshState()
563563
}
564564

565-
internal func setupInternalListeners() {
565+
func setupInternalListeners() {
566566
// Handle auth exceptions caught in classes that don't hold a reference to the manager.
567567
_ = NotificationCenter.default.addObserver(forName: .accountAuthException, object: nil, queue: nil) { _ in
568568
self.processEvent(event: .authenticationError) {}
@@ -584,14 +584,14 @@ open class FxAccountManager {
584584
}
585585
}
586586

587-
internal func requireAccount() -> PersistedFirefoxAccount {
587+
func requireAccount() -> PersistedFirefoxAccount {
588588
if let acct = account {
589589
return acct
590590
}
591591
preconditionFailure("initialize() must be called first.")
592592
}
593593

594-
internal func requireConstellation() -> DeviceConstellation {
594+
func requireConstellation() -> DeviceConstellation {
595595
if let cstl = constellation {
596596
return cstl
597597
}
@@ -627,7 +627,7 @@ public enum FxaAuthType {
627627
case recovered
628628
case other(reason: String)
629629

630-
internal static func fromActionQueryParam(_ action: String) -> FxaAuthType {
630+
static func fromActionQueryParam(_ action: String) -> FxaAuthType {
631631
switch action {
632632
case "signin": return .signin
633633
case "signup": return .signup

‎swift-source/all/FxAClient/FxAccountState.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import Foundation
77
/**
88
* States of the [FxAccountManager].
99
*/
10-
internal enum AccountState {
10+
enum AccountState {
1111
case start
1212
case notAuthenticated
1313
case authenticationProblem
@@ -19,7 +19,7 @@ internal enum AccountState {
1919
* Base class for [FxAccountManager] state machine events.
2020
* Events aren't a simple enum class because we might want to pass data along with some of the events.
2121
*/
22-
internal enum Event {
22+
enum Event {
2323
case initialize
2424
case accountNotFound
2525
case accountRestored

‎swift-source/all/FxAClient/FxAccountStorage.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import Foundation
66

77
class KeyChainAccountStorage {
8-
internal var keychainWrapper: MZKeychainWrapper
9-
internal static var keychainKey: String = "accountJSON"
10-
internal static var accessibility: MZKeychainItemAccessibility = .afterFirstUnlock
8+
var keychainWrapper: MZKeychainWrapper
9+
static var keychainKey: String = "accountJSON"
10+
static var accessibility: MZKeychainItemAccessibility = .afterFirstUnlock
1111

1212
init(keychainAccessGroup: String?) {
1313
keychainWrapper = MZKeychainWrapper.sharedAppContainerKeychain(keychainAccessGroup: keychainAccessGroup)

‎swift-source/all/FxAClient/MZKeychain/KeychainItemAccessibility.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// KeychainOptions.swift
2+
// KeychainItemAccessibility.swift
33
// SwiftKeychainWrapper
44
//
55
// Created by James Blair on 4/24/16.

‎swift-source/all/FxAClient/PersistedFirefoxAccount.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ class PersistedFirefoxAccount {
257257
}
258258
}
259259

260-
internal func notifyAuthErrors<T>(_ cb: () throws -> T) rethrows -> T {
260+
func notifyAuthErrors<T>(_ cb: () throws -> T) rethrows -> T {
261261
do {
262262
return try cb()
263263
} catch let error as FxaError {
@@ -269,7 +269,7 @@ class PersistedFirefoxAccount {
269269
}
270270
}
271271

272-
internal func notifyAuthError() {
272+
func notifyAuthError() {
273273
NotificationCenter.default.post(name: .accountAuthException, object: nil)
274274
}
275275
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// -*- mode: Swift -*-
22

3-
// AUTOGENERATED BY glean_parser v7.2.1. DO NOT EDIT. DO NOT COMMIT.
3+
// AUTOGENERATED BY glean_parser v8.1.1. DO NOT EDIT. DO NOT COMMIT.
44

55
#if canImport(Foundation)
66
import Foundation
@@ -25,7 +25,7 @@ extension GleanMetrics {
2525
// Intentionally left private, no external user can instantiate a new global object.
2626
}
2727

28-
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 8, day: 17, hour: 13, minute: 54, second: 13))
28+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 8, day: 18, hour: 15, minute: 28, second: 45))
2929
}
3030

3131
enum NimbusEvents {

‎swift-source/all/Nimbus/Dictionary+.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import Foundation
66

7-
internal extension Dictionary where Key == String, Value == Any {
7+
extension Dictionary where Key == String, Value == Any {
88
func stringify() throws -> String {
99
let data = try JSONSerialization.data(withJSONObject: self)
1010
guard let s = String(data: data, encoding: .utf8) else {

0 commit comments

Comments
 (0)