Skip to content
This repository was archived by the owner on Feb 5, 2025. It is now read-only.

Commit 0437b6c

Browse files
ealeksandrovealeksandrov
authored
Merge pull request #612 from wordpress-mobile/try/apple-silicon-updated
Fix Apple Silicon compatibility and general cleanup
2 parents e7ed943 + 6ce60dc commit 0437b6c

19 files changed

+47
-80
lines changed

‎Podfile‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source 'https://cdn.cocoapods.org/'
33
inhibit_all_warnings!
44
use_frameworks!
55

6-
ios_deployment_target = Gem::Version.new('11.0')
6+
ios_deployment_target = Gem::Version.new('13.0')
77

88
platform :ios, ios_deployment_target
99

@@ -43,8 +43,6 @@ target 'WordPressAuthenticatorTests' do
4343
project 'WordPressAuthenticator.xcodeproj'
4444
wordpress_authenticator_pods
4545

46-
pod 'OHHTTPStubs', '8.0.0'
47-
pod 'OHHTTPStubs/Swift', '8.0.0'
4846
pod 'OCMock', '~> 3.4'
4947
pod 'Expecta', '1.0.6'
5048
pod 'Specta', '1.0.7'
@@ -56,7 +54,6 @@ target 'WordPressAuthenticatorTests' do
5654
#
5755
installer.pods_project.targets.each do |target|
5856
target.build_configurations.each do |configuration|
59-
configuration.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'arm64'
6057
pod_ios_deployment_target = Gem::Version.new(configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'])
6158
if pod_ios_deployment_target <= ios_deployment_target
6259
configuration.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'

‎Podfile.lock‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,7 @@ PODS:
2525
- lottie-ios (3.1.6)
2626
- NSObject-SafeExpectations (0.0.4)
2727
- "NSURL+IDN (0.4)"
28-
- OCMock (3.6)
29-
- OHHTTPStubs (8.0.0):
30-
- OHHTTPStubs/Default (= 8.0.0)
31-
- OHHTTPStubs/Core (8.0.0)
32-
- OHHTTPStubs/Default (8.0.0):
33-
- OHHTTPStubs/Core
34-
- OHHTTPStubs/JSON
35-
- OHHTTPStubs/NSURLSession
36-
- OHHTTPStubs/OHPathHelpers
37-
- OHHTTPStubs/JSON (8.0.0):
38-
- OHHTTPStubs/Core
39-
- OHHTTPStubs/NSURLSession (8.0.0):
40-
- OHHTTPStubs/Core
41-
- OHHTTPStubs/OHPathHelpers (8.0.0)
42-
- OHHTTPStubs/Swift (8.0.0):
43-
- OHHTTPStubs/Default
28+
- OCMock (3.8.1)
4429
- Specta (1.0.7)
4530
- SVProgressHUD (2.2.5)
4631
- UIDeviceIdentifier (1.6.0)
@@ -67,8 +52,6 @@ DEPENDENCIES:
6752
- lottie-ios (= 3.1.6)
6853
- "NSURL+IDN (= 0.4)"
6954
- OCMock (~> 3.4)
70-
- OHHTTPStubs (= 8.0.0)
71-
- OHHTTPStubs/Swift (= 8.0.0)
7255
- Specta (= 1.0.7)
7356
- SVProgressHUD (= 2.2.5)
7457
- WordPressKit (~> 4.18-beta)
@@ -91,7 +74,6 @@ SPEC REPOS:
9174
- NSObject-SafeExpectations
9275
- "NSURL+IDN"
9376
- OCMock
94-
- OHHTTPStubs
9577
- Specta
9678
- SVProgressHUD
9779
- UIDeviceIdentifier
@@ -114,8 +96,7 @@ SPEC CHECKSUMS:
11496
lottie-ios: 85ce835dd8c53e02509f20729fc7d6a4e6645a0a
11597
NSObject-SafeExpectations: ab8fe623d36b25aa1f150affa324e40a2f3c0374
11698
"NSURL+IDN": afc873e639c18138a1589697c3add197fe8679ca
117-
OCMock: 5ea90566be239f179ba766fd9fbae5885040b992
118-
OHHTTPStubs: 9cbce6364bec557cc3439aa6bb7514670d780881
99+
OCMock: 29f6e52085b4e7d9b075cbf03ed7c3112f82f934
119100
Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
120101
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
121102
UIDeviceIdentifier: f4bf3b343581a1beacdbf5fb1a8825bd5f05a4a4
@@ -124,6 +105,6 @@ SPEC CHECKSUMS:
124105
WordPressUI: 1cf47a3b78154faf69caa18569ee7ece1e510fa0
125106
wpxmlrpc: bf55a43a7e710bd2a4fb8c02dfe83b1246f14f13
126107

127-
PODFILE CHECKSUM: 8cba285326010a5f8e3da755a3a83ec7643e858c
108+
PODFILE CHECKSUM: 4daa851e68189bb99fb960a86c2ce1ae4de9cdef
128109

129110
COCOAPODS: 1.10.0

‎WordPressAuthenticator.podspec‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'WordPressAuthenticator'
3-
s.version = '1.41.0'
3+
s.version = '1.42.0-beta.1'
44

55
s.summary = 'WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps.'
66
s.description = <<-DESC
@@ -14,8 +14,8 @@ Pod::Spec.new do |s|
1414
s.license = { type: 'GPLv2', file: 'LICENSE' }
1515
s.author = { 'The WordPress Mobile Team' => '[email protected]' }
1616

17-
s.platform = :ios, '11.0'
18-
s.swift_version = '4.2'
17+
s.platform = :ios, '13.0'
18+
s.swift_version = '5.0'
1919

2020
s.source = { git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git',
2121
tag: s.version.to_s }
@@ -29,13 +29,8 @@ Pod::Spec.new do |s|
2929
'WordPressAuthenticator/**/*.{storyboard,xib}'
3030
]
3131
}
32-
s.static_framework = true # This is needed because GoogleSignIn vendors a static framework
3332
s.header_dir = 'WordPressAuthenticator'
3433

35-
# Fixing arm64 issue with Xcode 12: https://github.com/CocoaPods/CocoaPods/issues/10104
36-
s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
37-
s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
38-
3934
s.dependency '1PasswordExtension', '~> 1.8.6'
4035
s.dependency 'Alamofire', '~> 4.8'
4136
s.dependency 'CocoaLumberjack', '~> 3.5'

‎WordPressAuthenticator.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,12 +1026,12 @@
10261026
TargetAttributes = {
10271027
B5ED78F3207E976500A8FD8C = {
10281028
CreatedOnToolsVersion = 9.3;
1029-
LastSwiftMigration = 1000;
1029+
LastSwiftMigration = 1250;
10301030
ProvisioningStyle = Automatic;
10311031
};
10321032
B5ED78FC207E976500A8FD8C = {
10331033
CreatedOnToolsVersion = 9.3;
1034-
LastSwiftMigration = 1000;
1034+
LastSwiftMigration = 1250;
10351035
ProvisioningStyle = Automatic;
10361036
};
10371037
};
@@ -1158,7 +1158,6 @@
11581158
"${BUILT_PRODUCTS_DIR}/wpxmlrpc/wpxmlrpc.framework",
11591159
"${BUILT_PRODUCTS_DIR}/Expecta/Expecta.framework",
11601160
"${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework",
1161-
"${BUILT_PRODUCTS_DIR}/OHHTTPStubs/OHHTTPStubs.framework",
11621161
"${BUILT_PRODUCTS_DIR}/Specta/Specta.framework",
11631162
);
11641163
name = "[CP] Embed Pods Frameworks";
@@ -1183,7 +1182,6 @@
11831182
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wpxmlrpc.framework",
11841183
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Expecta.framework",
11851184
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework",
1186-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OHHTTPStubs.framework",
11871185
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Specta.framework",
11881186
);
11891187
runOnlyForDeploymentPostprocessing = 0;
@@ -1403,7 +1401,7 @@
14031401
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
14041402
GCC_WARN_UNUSED_FUNCTION = YES;
14051403
GCC_WARN_UNUSED_VARIABLE = YES;
1406-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1404+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
14071405
MTL_ENABLE_DEBUG_INFO = YES;
14081406
ONLY_ACTIVE_ARCH = YES;
14091407
SDKROOT = iphoneos;
@@ -1461,7 +1459,7 @@
14611459
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
14621460
GCC_WARN_UNUSED_FUNCTION = YES;
14631461
GCC_WARN_UNUSED_VARIABLE = YES;
1464-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1462+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
14651463
MTL_ENABLE_DEBUG_INFO = NO;
14661464
SDKROOT = iphoneos;
14671465
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -1483,16 +1481,14 @@
14831481
DYLIB_COMPATIBILITY_VERSION = 1;
14841482
DYLIB_CURRENT_VERSION = 1;
14851483
DYLIB_INSTALL_NAME_BASE = "@rpath";
1486-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
14871484
INFOPLIST_FILE = WordPressAuthenticator/Info.plist;
14881485
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1489-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
14901486
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
14911487
MARKETING_VERSION = 1.21.0;
14921488
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressAuthenticator;
14931489
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
14941490
SKIP_INSTALL = YES;
1495-
SWIFT_VERSION = 4.2;
1491+
SWIFT_VERSION = 5.0;
14961492
TARGETED_DEVICE_FAMILY = "1,2";
14971493
};
14981494
name = Debug;
@@ -1511,13 +1507,12 @@
15111507
DYLIB_INSTALL_NAME_BASE = "@rpath";
15121508
INFOPLIST_FILE = WordPressAuthenticator/Info.plist;
15131509
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1514-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
15151510
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
15161511
MARKETING_VERSION = 1.21.0;
15171512
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressAuthenticator;
15181513
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
15191514
SKIP_INSTALL = YES;
1520-
SWIFT_VERSION = 4.2;
1515+
SWIFT_VERSION = 5.0;
15211516
TARGETED_DEVICE_FAMILY = "1,2";
15221517
};
15231518
name = Release;
@@ -1529,14 +1524,13 @@
15291524
CODE_SIGN_STYLE = Automatic;
15301525
DEFINES_MODULE = YES;
15311526
DEVELOPMENT_TEAM = PZYM8XX95Q;
1532-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
15331527
INFOPLIST_FILE = WordPressAuthenticatorTests/Info.plist;
15341528
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
15351529
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressAuthenticatorTests;
15361530
PRODUCT_NAME = "$(TARGET_NAME)";
15371531
SWIFT_OBJC_BRIDGING_HEADER = "WordPressAuthenticatorTests/SupportingFiles/WordPressAuthenticatorTests-Bridging-Header.h";
15381532
SWIFT_PRECOMPILE_BRIDGING_HEADER = NO;
1539-
SWIFT_VERSION = 4.2;
1533+
SWIFT_VERSION = 5.0;
15401534
TARGETED_DEVICE_FAMILY = "1,2";
15411535
};
15421536
name = Debug;
@@ -1554,7 +1548,7 @@
15541548
PRODUCT_NAME = "$(TARGET_NAME)";
15551549
SWIFT_OBJC_BRIDGING_HEADER = "WordPressAuthenticatorTests/SupportingFiles/WordPressAuthenticatorTests-Bridging-Header.h";
15561550
SWIFT_PRECOMPILE_BRIDGING_HEADER = NO;
1557-
SWIFT_VERSION = 4.2;
1551+
SWIFT_VERSION = 5.0;
15581552
TARGETED_DEVICE_FAMILY = "1,2";
15591553
};
15601554
name = Release;
@@ -1606,7 +1600,7 @@
16061600
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
16071601
GCC_WARN_UNUSED_FUNCTION = YES;
16081602
GCC_WARN_UNUSED_VARIABLE = YES;
1609-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1603+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
16101604
MTL_ENABLE_DEBUG_INFO = NO;
16111605
SDKROOT = iphoneos;
16121606
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -1630,13 +1624,12 @@
16301624
DYLIB_INSTALL_NAME_BASE = "@rpath";
16311625
INFOPLIST_FILE = WordPressAuthenticator/Info.plist;
16321626
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1633-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
16341627
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
16351628
MARKETING_VERSION = 1.21.0;
16361629
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressAuthenticator;
16371630
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
16381631
SKIP_INSTALL = YES;
1639-
SWIFT_VERSION = 4.2;
1632+
SWIFT_VERSION = 5.0;
16401633
TARGETED_DEVICE_FAMILY = "1,2";
16411634
};
16421635
name = "Release-Internal";
@@ -1654,7 +1647,7 @@
16541647
PRODUCT_NAME = "$(TARGET_NAME)";
16551648
SWIFT_OBJC_BRIDGING_HEADER = "WordPressAuthenticatorTests/SupportingFiles/WordPressAuthenticatorTests-Bridging-Header.h";
16561649
SWIFT_PRECOMPILE_BRIDGING_HEADER = NO;
1657-
SWIFT_VERSION = 4.2;
1650+
SWIFT_VERSION = 5.0;
16581651
TARGETED_DEVICE_FAMILY = "1,2";
16591652
};
16601653
name = "Release-Internal";
@@ -1706,7 +1699,7 @@
17061699
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
17071700
GCC_WARN_UNUSED_FUNCTION = YES;
17081701
GCC_WARN_UNUSED_VARIABLE = YES;
1709-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1702+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
17101703
MTL_ENABLE_DEBUG_INFO = NO;
17111704
SDKROOT = iphoneos;
17121705
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -1730,13 +1723,12 @@
17301723
DYLIB_INSTALL_NAME_BASE = "@rpath";
17311724
INFOPLIST_FILE = WordPressAuthenticator/Info.plist;
17321725
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1733-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
17341726
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
17351727
MARKETING_VERSION = 1.21.0;
17361728
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressAuthenticator;
17371729
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
17381730
SKIP_INSTALL = YES;
1739-
SWIFT_VERSION = 4.2;
1731+
SWIFT_VERSION = 5.0;
17401732
TARGETED_DEVICE_FAMILY = "1,2";
17411733
};
17421734
name = "Release-Alpha";
@@ -1754,7 +1746,7 @@
17541746
PRODUCT_NAME = "$(TARGET_NAME)";
17551747
SWIFT_OBJC_BRIDGING_HEADER = "WordPressAuthenticatorTests/SupportingFiles/WordPressAuthenticatorTests-Bridging-Header.h";
17561748
SWIFT_PRECOMPILE_BRIDGING_HEADER = NO;
1757-
SWIFT_VERSION = 4.2;
1749+
SWIFT_VERSION = 5.0;
17581750
TARGETED_DEVICE_FAMILY = "1,2";
17591751
};
17601752
name = "Release-Alpha";

‎WordPressAuthenticator/Authenticator/WordPressAuthenticatorDelegateProtocol.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// MARK: - WordPressAuthenticator Delegate Protocol
22
//
3-
public protocol WordPressAuthenticatorDelegate: class {
3+
public protocol WordPressAuthenticatorDelegate: AnyObject {
44

55
/// Indicates if the active Authenticator can be dismissed, or not.
66
///

‎WordPressAuthenticator/Logging/CocoaLumberjack.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,23 +68,23 @@ public func _DDLogMessage(_ message: @autoclosure () -> String, level: DDLogLeve
6868
}
6969

7070
public func DDLogDebug(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) {
71-
_DDLogMessage(message, level: level, flag: .debug, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
71+
_DDLogMessage(message(), level: level, flag: .debug, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
7272
}
7373

7474
public func DDLogInfo(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) {
75-
_DDLogMessage(message, level: level, flag: .info, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
75+
_DDLogMessage(message(), level: level, flag: .info, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
7676
}
7777

7878
public func DDLogWarn(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) {
79-
_DDLogMessage(message, level: level, flag: .warning, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
79+
_DDLogMessage(message(), level: level, flag: .warning, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
8080
}
8181

8282
public func DDLogVerbose(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) {
83-
_DDLogMessage(message, level: level, flag: .verbose, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
83+
_DDLogMessage(message(), level: level, flag: .verbose, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
8484
}
8585

8686
public func DDLogError(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = false, ddlog: DDLog = DDLog.sharedInstance) {
87-
_DDLogMessage(message, level: level, flag: .error, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
87+
_DDLogMessage(message(), level: level, flag: .error, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
8888
}
8989

9090
/// Returns a String of the current filename, without full path or extension.

‎WordPressAuthenticator/NUX/NUXKeyboardResponder.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ let NUXKeyboardDefaultFormVerticalOffset: CGFloat = -64.0
66
/// A protocol and extension encapsulating common keyboard releated logic for
77
/// Signin controllers.
88
///
9-
public protocol NUXKeyboardResponder: class {
9+
public protocol NUXKeyboardResponder: AnyObject {
1010
var bottomContentConstraint: NSLayoutConstraint? {get}
1111
var verticalCenterConstraint: NSLayoutConstraint? {get}
1212

‎WordPressAuthenticator/NUX/WPNUXMainButton.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ - (void)configureButton
4444
self.titleLabel.font = [WPFontManager systemRegularFontOfSize:18.0];
4545
[self setColor:[UIColor colorWithRed:0/255.0f green:116/255.0f blue:162/255.0f alpha:1.0f]];
4646

47-
activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite];
47+
activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleMedium];
4848
activityIndicator.hidesWhenStopped = YES;
4949
[self addSubview:activityIndicator];
5050
}

‎WordPressAuthenticator/Signin/LoginPrologueLoginMethodViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class LoginPrologueLoginMethodViewController: NUXViewController {
118118
if buttonViewController?.isViewLoaded == true, let buttonsView = buttonViewController?.view {
119119
view.accessibilityElements = [
120120
buttonsView,
121-
dismissButton
121+
dismissButton as Any
122122
]
123123
}
124124
}

‎WordPressAuthenticator/Signin/LoginProloguePageViewController.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class LoginProloguePageViewController: UIPageViewController {
5353

5454
@objc func handlePageControlValueChanged(sender: UIPageControl) {
5555
guard let currentPage = viewControllers?.first,
56-
let currentIndex = pages.index(of: currentPage) else {
56+
let currentIndex = pages.firstIndex(of: currentPage) else {
5757
return
5858
}
5959

@@ -66,7 +66,7 @@ class LoginProloguePageViewController: UIPageViewController {
6666
extension LoginProloguePageViewController: UIPageViewControllerDataSource {
6767

6868
func pageViewController(_ pageViewController: UIPageViewController, viewControllerBefore viewController: UIViewController) -> UIViewController? {
69-
guard let index = pages.index(of: viewController) else {
69+
guard let index = pages.firstIndex(of: viewController) else {
7070
return nil
7171
}
7272
if index > 0 {
@@ -76,7 +76,7 @@ extension LoginProloguePageViewController: UIPageViewControllerDataSource {
7676
}
7777

7878
func pageViewController(_ pageViewController: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? {
79-
guard let index = pages.index(of: viewController) else {
79+
guard let index = pages.firstIndex(of: viewController) else {
8080
return nil
8181
}
8282
if index < pages.count - 1 {
@@ -89,7 +89,7 @@ extension LoginProloguePageViewController: UIPageViewControllerDataSource {
8989
extension LoginProloguePageViewController: UIPageViewControllerDelegate {
9090
func pageViewController(_ pageViewController: UIPageViewController, didFinishAnimating finished: Bool, previousViewControllers: [UIViewController], transitionCompleted completed: Bool) {
9191
let toVC = previousViewControllers[0]
92-
guard let index = pages.index(of: toVC) else {
92+
guard let index = pages.firstIndex(of: toVC) else {
9393
return
9494
}
9595
if !completed {
@@ -101,7 +101,7 @@ extension LoginProloguePageViewController: UIPageViewControllerDelegate {
101101

102102
func pageViewController(_ pageViewController: UIPageViewController, willTransitionTo pendingViewControllers: [UIViewController]) {
103103
let toVC = pendingViewControllers[0]
104-
guard let index = pages.index(of: toVC) else {
104+
guard let index = pages.firstIndex(of: toVC) else {
105105
return
106106
}
107107
pageControl?.currentPage = index

0 commit comments

Comments
 (0)