Skip to content

Commit bc7adae

Browse files
authored
Merge pull request #1230 from russellwheatley/swift-example-fixes
fix: swift example app fixes
2 parents 5b8c6fb + a5c06a9 commit bc7adae

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

samples/swift/FirebaseUI-demo-swift/FUIAppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import FirebaseAuth
2121
import FirebaseAuthUI
2222
import GTMSessionFetcher
2323

24-
@UIApplicationMain
24+
@main
2525
class AppDelegate: UIResponder, UIApplicationDelegate {
2626

2727
var window: UIWindow?

samples/swift/FirebaseUI-demo-swift/Samples/Auth/FUICustomAuthUIDelegate.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import UIKit
1818
import FirebaseAuth
1919
import FirebaseEmailAuthUI
2020

21-
class FUICustomAuthDelegate: NSObject, FUIAuthDelegate {
21+
class FUICustomAuthDelegate: NSObject, @preconcurrency FUIAuthDelegate {
2222

2323
@objc func authUI(_ authUI: FUIAuth, didSignInWith authDataResult: AuthDataResult?, error: Error?) {
2424
switch error {
@@ -33,41 +33,41 @@ class FUICustomAuthDelegate: NSObject, FUIAuthDelegate {
3333
}
3434
}
3535

36-
func authPickerViewController(forAuthUI authUI: FUIAuth) -> FUIAuthPickerViewController {
36+
@MainActor func authPickerViewController(forAuthUI authUI: FUIAuth) -> FUIAuthPickerViewController {
3737
return FUICustomAuthPickerViewController(nibName: "FUICustomAuthPickerViewController",
3838
bundle: Bundle.main,
3939
authUI: authUI)
4040
}
4141

42-
func emailEntryViewController(forAuthUI authUI: FUIAuth) -> FUIEmailEntryViewController {
42+
@MainActor func emailEntryViewController(forAuthUI authUI: FUIAuth) -> FUIEmailEntryViewController {
4343
return FUICustomEmailEntryViewController(nibName: "FUICustomEmailEntryViewController",
4444
bundle: Bundle.main,
4545
authUI: authUI)
4646
}
4747

48-
func passwordRecoveryViewController(forAuthUI authUI: FUIAuth, email: String?) -> FUIPasswordRecoveryViewController {
48+
@MainActor func passwordRecoveryViewController(forAuthUI authUI: FUIAuth, email: String?) -> FUIPasswordRecoveryViewController {
4949
return FUICustomPasswordRecoveryViewController(nibName: "FUICustomPasswordRecoveryViewController",
5050
bundle: Bundle.main,
5151
authUI: authUI,
5252
email: email)
5353
}
5454

55-
func passwordSignInViewController(forAuthUI authUI: FUIAuth, email: String?) -> FUIPasswordSignInViewController {
55+
@MainActor func passwordSignInViewController(forAuthUI authUI: FUIAuth, email: String?) -> FUIPasswordSignInViewController {
5656
return FUICustomPasswordSignInViewController(nibName: "FUICustomPasswordSignInViewController",
5757
bundle: Bundle.main,
5858
authUI: authUI,
5959
email: email)
6060
}
6161

62-
func passwordSignUpViewController(forAuthUI authUI: FUIAuth, email: String) -> FUIPasswordSignUpViewController {
62+
@MainActor func passwordSignUpViewController(forAuthUI authUI: FUIAuth, email: String) -> FUIPasswordSignUpViewController {
6363
return FUICustomPasswordSignUpViewController(nibName: "FUICustomPasswordSignUpViewController",
6464
bundle: Bundle.main,
6565
authUI: authUI,
6666
email: email,
6767
requireDisplayName: true)
6868
}
6969

70-
func passwordVerificationViewController(forAuthUI authUI: FUIAuth, email: String?, newCredential: AuthCredential) -> FUIPasswordVerificationViewController {
70+
@MainActor func passwordVerificationViewController(forAuthUI authUI: FUIAuth, email: String?, newCredential: AuthCredential) -> FUIPasswordVerificationViewController {
7171
return FUICustomPasswordVerificationViewController(nibName: "FUICustomPasswordVerificationViewController",
7272
bundle: Bundle.main,
7373
authUI: authUI,

samples/swift/FirebaseUI-demo-swift/Samples/Sample.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ enum Sample: Int, RawRepresentable {
5555
}
5656
}
5757

58-
func controller() -> UIViewController {
58+
@MainActor func controller() -> UIViewController {
5959
switch self {
6060
case .chat:
6161
return UIStoryboard.instantiateViewController("Main", identifier: "ChatViewController")

0 commit comments

Comments
 (0)