Skip to content

Move WordPressKit and Authenticator code into this repo #23366

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.

Sign up for GitHub

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

Merged
crazytonyli merged 6 commits into from
Jun 20, 2024
Merged

Move WordPressKit and Authenticator code into this repo #23366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
20a14bd
Move WordPressKit and WordPressAuthenticator source code
crazytonyli Jun 17, 2024
ec9516b
Update WordPressKit and Authenticator podspecs
crazytonyli Jun 17, 2024
ba237b2
Use local WordPressKit and Authenticator
crazytonyli Jun 17, 2024
f949de4
Address SwiftLint issues
crazytonyli Jun 17, 2024
79c10ac
Address SwiftLint warnings
crazytonyli Jun 17, 2024
b781954
Merge branch 'trunk' into tonyli-move-wpkit
crazytonyli Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 2 additions & 8 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,7 @@ def gravatar
end

def wordpress_kit
pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', commit: 'c334dad3c0e8fced5a61c5bf1d745d23d1924a9c'
# pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', branch: ''
# pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', tag: ''
# pod 'WordPressKit', path: '../WordPressKit-iOS'
pod 'WordPressKit', path: './WordPressKit'
end

def kanvas
Expand Down Expand Up @@ -152,10 +149,7 @@ abstract_target 'Apps' do

pod 'NSURL+IDN', '~> 0.4'

pod 'WordPressAuthenticator', '~> 9.0', '>= 9.0.8'
# pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: ''
# pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', branch: ''
# pod 'WordPressAuthenticator', path: '../WordPressAuthenticator-iOS'
pod 'WordPressAuthenticator', path: './WordPressAuthenticator'

pod 'MediaEditor', '~> 1.2', '>= 1.2.2'
# pod 'MediaEditor', git: 'https://github.com/wordpress-mobile/MediaEditor-iOS.git', commit: ''
Expand Down
19 changes: 8 additions & 11 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ DEPENDENCIES:
- SVProgressHUD (= 2.2.5)
- SwiftLint (= 0.54.0)
- WordPress-Editor-iOS (~> 1.19.11)
- WordPressAuthenticator (>= 9.0.8, ~> 9.0)
- WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `c334dad3c0e8fced5a61c5bf1d745d23d1924a9c`)
- WordPressAuthenticator (from `./WordPressAuthenticator`)
- WordPressKit (from `./WordPressKit`)
- WordPressShared (>= 2.3.1, ~> 2.3)
- WordPressUI (~> 1.16)
- ZendeskSupportSDK (= 5.3.0)
Expand All @@ -134,7 +134,6 @@ SPEC REPOS:
https://github.com/wordpress-mobile/cocoapods-specs.git:
- WordPress-Aztec-iOS
- WordPress-Editor-iOS
- WordPressAuthenticator
- WordPressShared
trunk:
- Alamofire
Expand Down Expand Up @@ -181,17 +180,15 @@ EXTERNAL SOURCES:
:tag: 0.2.0
Gutenberg:
:podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.1.podspec
WordPressAuthenticator:
:path: "./WordPressAuthenticator"
WordPressKit:
:commit: c334dad3c0e8fced5a61c5bf1d745d23d1924a9c
:git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
:path: "./WordPressKit"

CHECKOUT OPTIONS:
FSInteractiveMap:
:git: https://github.com/wordpress-mobile/FSInteractiveMap.git
:tag: 0.2.0
WordPressKit:
:commit: c334dad3c0e8fced5a61c5bf1d745d23d1924a9c
:git: https://github.com/wordpress-mobile/WordPressKit-iOS.git

SPEC CHECKSUMS:
Alamofire: 02b772c9910e8eba1a079227c32fbd9e46c90a24
Expand Down Expand Up @@ -225,8 +222,8 @@ SPEC CHECKSUMS:
UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17
WordPress-Aztec-iOS: 3732c6d865a5c9f35788377bdeda8a80ea10d0a1
WordPress-Editor-iOS: 453345420ced3d3ef20f0051b3df46ff10281e0c
WordPressAuthenticator: 898acaac75c5ade9b900c02622a15b9aef8fde1a
WordPressKit: 98809cdb460bacc6634b49079335a5ccace34e59
WordPressAuthenticator: dd4dec830d09a939e480944c5fca078f23845928
WordPressKit: f86126bb60393bee888cfd42ceb49db5b7f5b4d4
WordPressShared: 0160364ed24f4d67fed4e85003fefa837faad84f
WordPressUI: ec5ebcf7e63e797ba51d07513e340c1b14cf45a4
wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
Expand All @@ -239,6 +236,6 @@ SPEC CHECKSUMS:
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced

PODFILE CHECKSUM: 4e9da8dde686f4a307c1014ebf43d20c689003e6
PODFILE CHECKSUM: c85071167232a6e16ecbbf021a288276da217f2c

COCOAPODS: 1.15.2
Loading