Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Experiment – Use WordPressKit with smaller footprint #838

Draft
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 12 additions & 6 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
1 change: 0 additions & 1 deletion WordPressAuthenticator/NUX/Button/NUXButton.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import UIKit
import WordPressShared
import WordPressUI
import WordPressKit

Expand Down
1 change: 0 additions & 1 deletion WordPressAuthenticator/Services/LoginFacade.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Foundation
import WordPressKit

/// Extension for handling 2FA authentication.
Expand Down
1 change: 0 additions & 1 deletion WordPressAuthenticator/Services/SignupService.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Foundation
import WordPressShared
import WordPressKit

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Foundation
import WordPressKit

// MARK: - WordPressComAccountService
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Foundation
import WordPressKit

// MARK: - WordPress.com BlogService
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import Foundation

import WordPressKit

@objc public protocol WordPressComOAuthClientFacadeProtocol {
Expand Down
3 changes: 0 additions & 3 deletions WordPressAuthenticator/Services/WordPressXMLRPCAPIFacade.m
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#import "WordPressXMLRPCAPIFacade.h"
#import <WPXMLRPC/WPXMLRPC.h>
#import "WPAuthenticator-Swift.h"

@import WordPressKit;



@interface WordPressXMLRPCAPIFacade ()

@property (nonatomic, strong) NSString *userAgent;
Expand Down
1 change: 0 additions & 1 deletion WordPressAuthenticator/Signin/AppleAuthenticator.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Foundation
import AuthenticationServices
import WordPressKit
import SVProgressHUD
Expand Down