From f0a7c40fb5b01f7bf41239563218305b94c20ae6 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 23 Feb 2024 12:51:15 +1100 Subject: [PATCH 1/2] Remove some unnecessary imports --- WordPressAuthenticator/NUX/Button/NUXButton.swift | 1 - WordPressAuthenticator/Services/LoginFacade.swift | 1 - WordPressAuthenticator/Services/SignupService.swift | 1 - .../Services/WordPressComAccountService.swift | 1 - WordPressAuthenticator/Services/WordPressComBlogService.swift | 1 - .../Services/WordPressComOAuthClientFacadeProtocol.swift | 2 -- WordPressAuthenticator/Services/WordPressXMLRPCAPIFacade.m | 3 --- WordPressAuthenticator/Signin/AppleAuthenticator.swift | 1 - 8 files changed, 11 deletions(-) diff --git a/WordPressAuthenticator/NUX/Button/NUXButton.swift b/WordPressAuthenticator/NUX/Button/NUXButton.swift index 665d180e2..8f166a529 100644 --- a/WordPressAuthenticator/NUX/Button/NUXButton.swift +++ b/WordPressAuthenticator/NUX/Button/NUXButton.swift @@ -1,5 +1,4 @@ import UIKit -import WordPressShared import WordPressUI import WordPressKit diff --git a/WordPressAuthenticator/Services/LoginFacade.swift b/WordPressAuthenticator/Services/LoginFacade.swift index f968a12e2..8e380f597 100644 --- a/WordPressAuthenticator/Services/LoginFacade.swift +++ b/WordPressAuthenticator/Services/LoginFacade.swift @@ -1,4 +1,3 @@ -import Foundation import WordPressKit /// Extension for handling 2FA authentication. diff --git a/WordPressAuthenticator/Services/SignupService.swift b/WordPressAuthenticator/Services/SignupService.swift index bbd7c8434..4f3075952 100644 --- a/WordPressAuthenticator/Services/SignupService.swift +++ b/WordPressAuthenticator/Services/SignupService.swift @@ -1,4 +1,3 @@ -import Foundation import WordPressShared import WordPressKit diff --git a/WordPressAuthenticator/Services/WordPressComAccountService.swift b/WordPressAuthenticator/Services/WordPressComAccountService.swift index ac348b557..6a82c4725 100644 --- a/WordPressAuthenticator/Services/WordPressComAccountService.swift +++ b/WordPressAuthenticator/Services/WordPressComAccountService.swift @@ -1,4 +1,3 @@ -import Foundation import WordPressKit // MARK: - WordPressComAccountService diff --git a/WordPressAuthenticator/Services/WordPressComBlogService.swift b/WordPressAuthenticator/Services/WordPressComBlogService.swift index edd0daee6..290d09d87 100644 --- a/WordPressAuthenticator/Services/WordPressComBlogService.swift +++ b/WordPressAuthenticator/Services/WordPressComBlogService.swift @@ -1,4 +1,3 @@ -import Foundation import WordPressKit // MARK: - WordPress.com BlogService diff --git a/WordPressAuthenticator/Services/WordPressComOAuthClientFacadeProtocol.swift b/WordPressAuthenticator/Services/WordPressComOAuthClientFacadeProtocol.swift index a455ca633..da64bdf58 100644 --- a/WordPressAuthenticator/Services/WordPressComOAuthClientFacadeProtocol.swift +++ b/WordPressAuthenticator/Services/WordPressComOAuthClientFacadeProtocol.swift @@ -1,5 +1,3 @@ -import Foundation - import WordPressKit @objc public protocol WordPressComOAuthClientFacadeProtocol { diff --git a/WordPressAuthenticator/Services/WordPressXMLRPCAPIFacade.m b/WordPressAuthenticator/Services/WordPressXMLRPCAPIFacade.m index 77b7d349c..3a4843f72 100644 --- a/WordPressAuthenticator/Services/WordPressXMLRPCAPIFacade.m +++ b/WordPressAuthenticator/Services/WordPressXMLRPCAPIFacade.m @@ -1,11 +1,8 @@ #import "WordPressXMLRPCAPIFacade.h" #import #import "WPAuthenticator-Swift.h" - @import WordPressKit; - - @interface WordPressXMLRPCAPIFacade () @property (nonatomic, strong) NSString *userAgent; diff --git a/WordPressAuthenticator/Signin/AppleAuthenticator.swift b/WordPressAuthenticator/Signin/AppleAuthenticator.swift index 8b8512b78..4e0773159 100644 --- a/WordPressAuthenticator/Signin/AppleAuthenticator.swift +++ b/WordPressAuthenticator/Signin/AppleAuthenticator.swift @@ -1,4 +1,3 @@ -import Foundation import AuthenticationServices import WordPressKit import SVProgressHUD From 493ec1fff78b3933ca8aeea7df7839146b2e73c9 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 23 Feb 2024 12:58:03 +1100 Subject: [PATCH 2/2] Point to WIP WordPressKit version --- Podfile | 3 ++- Podfile.lock | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Podfile b/Podfile index 986af5764..8f9c10bbc 100644 --- a/Podfile +++ b/Podfile @@ -31,7 +31,8 @@ def wordpress_authenticator_pods ## These should match the version requirement from the podspec. pod 'Gridicons', '~> 1.0' pod 'WordPressUI', '~> 1.7-beta' - pod 'WordPressKit', '~> 13.0' + # pod 'WordPressKit', '~> 13.0' + pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', commit: 'd6dce6de4277a7e2046fef76c71de570d2a8acd0' pod 'WordPressShared', '~> 2.1-beta' third_party_pods diff --git a/Podfile.lock b/Podfile.lock index 1d8c7d80a..ed4a7ee0f 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -16,7 +16,7 @@ PODS: - WordPressKit (~> 13.0) - WordPressShared (~> 2.1-beta) - WordPressUI (~> 1.7-beta) - - WordPressKit (13.0.0): + - WordPressKit (13.1.0): - Alamofire (~> 4.8.0) - NSObject-SafeExpectations (~> 0.0.4) - UIDeviceIdentifier (~> 2.0) @@ -35,13 +35,11 @@ DEPENDENCIES: - SVProgressHUD (= 2.2.5) - SwiftLint (~> 0.49) - WordPressAuthenticator (from `.`) - - WordPressKit (~> 13.0) + - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `d6dce6de4277a7e2046fef76c71de570d2a8acd0`) - WordPressShared (~> 2.1-beta) - WordPressUI (~> 1.7-beta) SPEC REPOS: - https://github.com/wordpress-mobile/cocoapods-specs.git: - - WordPressKit trunk: - Alamofire - Expecta @@ -60,6 +58,14 @@ SPEC REPOS: EXTERNAL SOURCES: WordPressAuthenticator: :path: "." + WordPressKit: + :commit: d6dce6de4277a7e2046fef76c71de570d2a8acd0 + :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git + +CHECKOUT OPTIONS: + WordPressKit: + :commit: d6dce6de4277a7e2046fef76c71de570d2a8acd0 + :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git SPEC CHECKSUMS: Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3 @@ -73,11 +79,11 @@ SPEC CHECKSUMS: SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211 UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17 WordPressAuthenticator: ba69878bfa1368636e92d29fcfb5bd1e0a11a3ef - WordPressKit: 5eb7d27d27f84e875266a72281d0a4b80c825b74 + WordPressKit: c1ba7b4f531693a0914f676423808fdffd820d81 WordPressShared: 87f3ee89b0a3e83106106f13a8b71605fb8eb6d2 WordPressUI: a491454affda3b0fb812812e637dc5e8f8f6bd06 wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd -PODFILE CHECKSUM: 403e1fb88c6b793469ae1895887ac6fdca395e9f +PODFILE CHECKSUM: f1f3b0f0ca8634aa9c6a9ef1467bc690c1ef0f44 COCOAPODS: 1.14.3