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

Commit c3e8741

Browse files
authored
Merge trunk + update README in wpios-edition (#840)
2 parents 173f1f9 + 62938ce commit c3e8741

File tree

6 files changed

+98
-48
lines changed

6 files changed

+98
-48
lines changed

.buildkite/pipeline.yml

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,11 @@ steps:
3131
# Linters
3232
#################
3333
- label: ":swift: SwiftLint"
34-
command: run_swiftlint --strict
35-
plugins: *common_plugins
34+
command: swiftlint
35+
env:
36+
SWIFTLINT_OPTION_STRICT: true
3637
notify:
3738
- github_commit_status:
38-
context: "SwiftLint"
39+
context: SwiftLint
3940
agents:
40-
queue: "default"
41-
42-
- label: "🧹 Lint"
43-
key: "lint"
44-
command: |
45-
lint_pod
46-
plugins: *common_plugins
47-
48-
#################
49-
# Publish the Podspec (if we're building a tag)
50-
#################
51-
- label: "⬆️ Publish Podspec"
52-
key: "publish"
53-
command: .buildkite/publish-pod.sh
54-
plugins: *common_plugins
55-
depends_on:
56-
- "test"
57-
- "validate"
58-
- "lint"
59-
if: build.tag != null
41+
queue: linter

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,17 @@ _None._
4848

4949
_None._
5050

51+
## 17.3.0
52+
53+
### New Features
54+
55+
- Add `upgradeURL` to `JetpackAssistantFeatureDetails` (#822)
56+
- Add support for sending magic links to nonexistent accounts (#812)
57+
58+
### Internal Changes
59+
- Bump rexml from 3.2.6 to 3.3.9
60+
- [Tooling] SwiftLint: Use `linter` agent instead of `default` agent
61+
5162
## 17.2.0
5263

5364
### New Features

Gemfile.lock

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,20 @@ GEM
55
base64
66
nkf
77
rexml
8-
activesupport (7.1.3.2)
8+
activesupport (7.2.2)
99
base64
10+
benchmark (>= 0.3)
1011
bigdecimal
11-
concurrent-ruby (~> 1.0, >= 1.0.2)
12+
concurrent-ruby (~> 1.0, >= 1.3.1)
1213
connection_pool (>= 2.2.5)
1314
drb
1415
i18n (>= 1.6, < 2)
16+
logger (>= 1.4.2)
1517
minitest (>= 5.1)
16-
mutex_m
17-
tzinfo (~> 2.0)
18-
addressable (2.8.6)
19-
public_suffix (>= 2.0.2, < 6.0)
18+
securerandom (>= 0.3)
19+
tzinfo (~> 2.0, >= 2.0.5)
20+
addressable (2.8.7)
21+
public_suffix (>= 2.0.2, < 7.0)
2022
algoliasearch (1.27.5)
2123
httpclient (~> 2.8, >= 2.8.3)
2224
json (>= 1.5.1)
@@ -41,16 +43,17 @@ GEM
4143
aws-eventstream (~> 1, >= 1.0.2)
4244
babosa (1.0.4)
4345
base64 (0.2.0)
44-
bigdecimal (3.1.7)
46+
benchmark (0.4.0)
47+
bigdecimal (3.1.8)
4548
claide (1.1.0)
4649
claide-plugins (0.9.2)
4750
cork
4851
nap
4952
open4 (~> 1.3)
50-
cocoapods (1.15.2)
53+
cocoapods (1.16.2)
5154
addressable (~> 2.8)
5255
claide (>= 1.0.2, < 2.0)
53-
cocoapods-core (= 1.15.2)
56+
cocoapods-core (= 1.16.2)
5457
cocoapods-deintegrate (>= 1.0.3, < 2.0)
5558
cocoapods-downloader (>= 2.1, < 3.0)
5659
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -64,10 +67,10 @@ GEM
6467
molinillo (~> 0.8.0)
6568
nap (~> 1.0)
6669
ruby-macho (>= 2.3.0, < 3.0)
67-
xcodeproj (>= 1.23.0, < 2.0)
70+
xcodeproj (>= 1.27.0, < 2.0)
6871
cocoapods-check (1.1.0)
6972
cocoapods (~> 1.0)
70-
cocoapods-core (1.15.2)
73+
cocoapods-core (1.16.2)
7174
activesupport (>= 5.0, < 8)
7275
addressable (~> 2.8)
7376
algoliasearch (~> 1.0)
@@ -90,7 +93,7 @@ GEM
9093
colored2 (3.1.2)
9194
commander (4.6.0)
9295
highline (~> 2.0.0)
93-
concurrent-ruby (1.2.3)
96+
concurrent-ruby (1.3.4)
9497
connection_pool (2.4.1)
9598
cork (0.3.0)
9699
colored2 (~> 3.1)
@@ -212,7 +215,7 @@ GEM
212215
xcodeproj (>= 1.13.0, < 2.0.0)
213216
xcpretty (~> 0.3.0)
214217
xcpretty-travis-formatter (>= 0.0.3)
215-
ffi (1.16.3)
218+
ffi (1.17.0)
216219
fourflusher (2.3.1)
217220
fuzzy_match (2.0.4)
218221
gh_inspector (1.1.3)
@@ -261,25 +264,25 @@ GEM
261264
http-cookie (1.0.5)
262265
domain_name (~> 0.5)
263266
httpclient (2.8.3)
264-
i18n (1.14.4)
267+
i18n (1.14.6)
265268
concurrent-ruby (~> 1.0)
266269
jmespath (1.6.2)
267-
json (2.7.1)
270+
json (2.8.2)
268271
jwt (2.8.1)
269272
base64
270273
kramdown (2.4.0)
271274
rexml
272275
kramdown-parser-gfm (1.1.0)
273276
kramdown (~> 2.0)
274277
language_server-protocol (3.17.0.3)
278+
logger (1.6.1)
275279
mini_magick (4.12.0)
276280
mini_mime (1.1.5)
277-
minitest (5.22.3)
281+
minitest (5.25.1)
278282
molinillo (0.8.0)
279283
multi_json (1.15.0)
280284
multipart-post (2.4.0)
281-
mutex_m (0.2.0)
282-
nanaimo (0.3.0)
285+
nanaimo (0.4.0)
283286
nap (1.1.0)
284287
naturally (2.2.1)
285288
netrc (0.11.0)
@@ -309,7 +312,7 @@ GEM
309312
trailblazer-option (>= 0.1.1, < 0.2.0)
310313
uber (< 0.2.0)
311314
retriable (3.1.2)
312-
rexml (3.2.6)
315+
rexml (3.3.9)
313316
rouge (2.0.7)
314317
rubocop (1.60.2)
315318
json (~> 2.3)
@@ -331,6 +334,7 @@ GEM
331334
sawyer (0.9.2)
332335
addressable (>= 2.3.5)
333336
faraday (>= 0.17.3, < 3)
337+
securerandom (0.3.2)
334338
security (0.1.3)
335339
signet (0.19.0)
336340
addressable (~> 2.8)
@@ -356,13 +360,13 @@ GEM
356360
uber (0.1.0)
357361
unicode-display_width (2.5.0)
358362
word_wrap (1.0.0)
359-
xcodeproj (1.24.0)
363+
xcodeproj (1.27.0)
360364
CFPropertyList (>= 2.3.3, < 4.0)
361365
atomos (~> 0.1.3)
362366
claide (>= 1.0.2, < 2.0)
363367
colored2 (~> 3.1)
364-
nanaimo (~> 0.3.0)
365-
rexml (~> 3.2.4)
368+
nanaimo (~> 0.4.0)
369+
rexml (>= 3.3.6, < 4.0)
366370
xcpretty (0.3.0)
367371
rouge (~> 2.0.7)
368372
xcpretty-travis-formatter (1.0.1)

README.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
# WordPressKit for iOS
22

3+
<!-- red -->
4+
> [!CAUTION]
5+
> This library is no longer fit for external contribution and community usage.
6+
>
7+
> [WordPress iOS](https://github.com/wordpress-mobile/WordPress-iOS) is its only consumer.
8+
> The repo exists standalone rather than as part of the WordPress codebase because it's convenient to fetch this lump of code that rarely changes as a binary XCFramework dependency.
9+
> See [#816](https://github.com/wordpress-mobile/WordPressKit-iOS/pull/816).
10+
11+
## XCFramework release instructions
12+
13+
- Run `.buildkite/create-xcframeworks.sh` to create binaries
14+
- Upload `.build/xcframeworks/WordPressKit.zip` to this repo
15+
- Update binary target in `Package.swift` with a new URL and checksum<sup>*</sup>
16+
- Push the new changes to your branch
17+
- After testing is done, merge changes into `trunk`
18+
19+
<sup>*</sup>_checksum is echoed at the end of the `create-xcframeworks.sh` script_
20+
321
## About
422

523
WordPressKit offers a clean and simple WordPress.com and WordPress.org API.

Sources/WordPressKit/Services/AccountServiceRemoteREST.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,21 @@ extern MagicLinkFlow const MagicLinkFlowSignup;
1717

1818
@interface AccountServiceRemoteREST : ServiceRemoteWordPressComREST <AccountServiceRemote>
1919

20+
/**
21+
* @brief Request an authentication link be sent to the email address provided.
22+
*
23+
* @param success The block that will be executed on success. Can be nil.
24+
* @param failure The block that will be executed on failure. Can be nil.
25+
*/
26+
- (void)requestWPComAuthLinkForEmail:(NSString *)email
27+
clientID:(NSString *)clientID
28+
clientSecret:(NSString *)clientSecret
29+
source:(MagicLinkSource)source
30+
wpcomScheme:(NSString *)scheme
31+
createAccountIfNotFound:(BOOL)createAccountIfNotFound
32+
success:(void (^)(void))success
33+
failure:(void (^)(NSError *error))failure;
34+
2035
/**
2136
* @brief Request an authentication link be sent to the email address provided.
2237
*

Sources/WordPressKit/Services/AccountServiceRemoteREST.m

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,17 +244,19 @@ - (void)requestWPComAuthLinkForEmail:(NSString *)email
244244
clientSecret:(NSString *)clientSecret
245245
source:(MagicLinkSource)source
246246
wpcomScheme:(NSString *)scheme
247+
createAccountIfNotFound:(BOOL)createAccountIfNotFound
247248
success:(void (^)(void))success
248249
failure:(void (^)(NSError *error))failure
249250
{
250251
NSString *path = [self pathForEndpoint:@"auth/send-login-email"
251252
withVersion:WordPressComRESTAPIVersion_1_3];
252-
253+
253254
NSDictionary *extraParams = @{
254255
MagicLinkParameterFlow: MagicLinkFlowLogin,
255-
MagicLinkParameterSource: source
256+
MagicLinkParameterSource: source,
257+
@"create_account": createAccountIfNotFound ? @"true" : @"false"
256258
};
257-
259+
258260
[self requestWPComMagicLinkForEmail:email
259261
path:path
260262
clientID:clientID
@@ -265,6 +267,24 @@ - (void)requestWPComAuthLinkForEmail:(NSString *)email
265267
failure:failure];
266268
}
267269

270+
- (void)requestWPComAuthLinkForEmail:(NSString *)email
271+
clientID:(NSString *)clientID
272+
clientSecret:(NSString *)clientSecret
273+
source:(MagicLinkSource)source
274+
wpcomScheme:(NSString *)scheme
275+
success:(void (^)(void))success
276+
failure:(void (^)(NSError *error))failure
277+
{
278+
[self requestWPComAuthLinkForEmail:email
279+
clientID:clientID
280+
clientSecret:clientSecret
281+
source:source
282+
wpcomScheme:scheme
283+
createAccountIfNotFound:NO
284+
success:success
285+
failure:failure];
286+
}
287+
268288
- (void)requestWPComSignupLinkForEmail:(NSString *)email
269289
clientID:(NSString *)clientID
270290
clientSecret:(NSString *)clientSecret

0 commit comments

Comments
 (0)