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

Commit fa62c6b

Browse files
lorematteiloremattei
authored
Merge pull request #195 from wordpress-mobile/release/4.5.2
Release/4.5.2
2 parents 688298c + bc3a936 commit fa62c6b

File tree

10 files changed

+52
-37
lines changed

10 files changed

+52
-37
lines changed

‎.circleci/config.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
version: 2.1
22

33
orbs:
4-
# This uses the iOS Orb located at https://github.com/wordpress-mobile/circleci-orbs
5-
ios: wordpress-mobile/ios@0.0.35
4+
# Using 1.0 of our Orbs means it will use the latest 1.0.x version from https://github.com/wordpress-mobile/circleci-orbs
5+
ios: wordpress-mobile/ios@1.0
66

77
workflows:
88
test_and_validate:
@@ -14,15 +14,18 @@ workflows:
1414
scheme: WordPressKitTests
1515
device: iPhone Xs
1616
ios-version: "12.2"
17+
bundle-install: true
18+
pod-install: true
1719
- ios/validate-podspec:
1820
name: Validate Podspec
1921
xcode-version: "10.2.0"
2022
podspec-path: WordPressKit.podspec
21-
update-specs-repo: true
23+
bundle-install: true
2224
- ios/publish-podspec:
2325
name: Publish to Trunk
2426
xcode-version: "10.2.0"
2527
podspec-path: WordPressKit.podspec
28+
bundle-install: true
2629
post-to-slack: true
2730
filters:
2831
tags:

‎Gemfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
source 'https://rubygems.org' do
2-
gem 'cocoapods', '1.6.1'
3-
gem 'cocoapods-repo-update'
2+
gem 'cocoapods', '1.8.3'
43
end

‎Gemfile.lock‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,63 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.0)
4+
CFPropertyList (3.0.1)
55
activesupport (4.2.11.1)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10+
algoliasearch (1.27.1)
11+
httpclient (~> 2.8, >= 2.8.3)
12+
json (>= 1.5.1)
1013
atomos (0.1.3)
11-
claide (1.0.2)
12-
cocoapods (1.6.1)
14+
claide (1.0.3)
15+
cocoapods (1.8.3)
1316
activesupport (>= 4.0.2, < 5)
1417
claide (>= 1.0.2, < 2.0)
15-
cocoapods-core (= 1.6.1)
16-
cocoapods-deintegrate (>= 1.0.2, < 2.0)
18+
cocoapods-core (= 1.8.3)
19+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
1720
cocoapods-downloader (>= 1.2.2, < 2.0)
1821
cocoapods-plugins (>= 1.0.0, < 2.0)
1922
cocoapods-search (>= 1.0.0, < 2.0)
2023
cocoapods-stats (>= 1.0.0, < 2.0)
21-
cocoapods-trunk (>= 1.3.1, < 2.0)
24+
cocoapods-trunk (>= 1.4.0, < 2.0)
2225
cocoapods-try (>= 1.1.0, < 2.0)
2326
colored2 (~> 3.1)
2427
escape (~> 0.0.4)
25-
fourflusher (>= 2.2.0, < 3.0)
28+
fourflusher (>= 2.3.0, < 3.0)
2629
gh_inspector (~> 1.0)
2730
molinillo (~> 0.6.6)
2831
nap (~> 1.0)
2932
ruby-macho (~> 1.4)
30-
xcodeproj (>= 1.8.1, < 2.0)
31-
cocoapods-core (1.6.1)
33+
xcodeproj (>= 1.11.1, < 2.0)
34+
cocoapods-core (1.8.3)
3235
activesupport (>= 4.0.2, < 6)
36+
algoliasearch (~> 1.0)
37+
concurrent-ruby (~> 1.1)
3338
fuzzy_match (~> 2.0.4)
3439
nap (~> 1.0)
3540
cocoapods-deintegrate (1.0.4)
3641
cocoapods-downloader (1.2.2)
3742
cocoapods-plugins (1.0.0)
3843
nap
39-
cocoapods-repo-update (0.0.4)
40-
cocoapods (~> 1.0, >= 1.3.0)
4144
cocoapods-search (1.0.0)
4245
cocoapods-stats (1.1.0)
43-
cocoapods-trunk (1.3.1)
46+
cocoapods-trunk (1.4.1)
4447
nap (>= 0.8, < 2.0)
4548
netrc (~> 0.11)
4649
cocoapods-try (1.1.0)
4750
colored2 (3.1.2)
4851
concurrent-ruby (1.1.5)
4952
escape (0.0.4)
50-
fourflusher (2.2.0)
53+
fourflusher (2.3.1)
5154
fuzzy_match (2.0.4)
5255
gh_inspector (1.1.3)
56+
httpclient (2.8.3)
5357
i18n (0.9.5)
5458
concurrent-ruby (~> 1.0)
55-
minitest (5.11.3)
59+
json (2.2.0)
60+
minitest (5.12.2)
5661
molinillo (0.6.6)
5762
nanaimo (0.2.6)
5863
nap (1.1.0)
@@ -61,7 +66,7 @@ GEM
6166
thread_safe (0.3.6)
6267
tzinfo (1.2.5)
6368
thread_safe (~> 0.1)
64-
xcodeproj (1.8.2)
69+
xcodeproj (1.12.0)
6570
CFPropertyList (>= 2.3.3, < 4.0)
6671
atomos (~> 0.1.3)
6772
claide (>= 1.0.2, < 2.0)
@@ -72,8 +77,7 @@ PLATFORMS
7277
ruby
7378

7479
DEPENDENCIES
75-
cocoapods (= 1.6.1)!
76-
cocoapods-repo-update!
80+
cocoapods (= 1.8.3)!
7781

7882
BUNDLED WITH
79-
1.17.2
83+
2.0.2

‎Podfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
source 'https://github.com/CocoaPods/Specs.git'
1+
source 'https://cdn.cocoapods.org/'
22

33
inhibit_all_warnings!
44
use_frameworks!
55

66
platform :ios, '11.0'
7-
plugin 'cocoapods-repo-update'
87

98
def wordpresskit_pods
109
pod 'Alamofire', '~> 4.7.3'

‎Podfile.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ PODS:
2727
- OHHTTPStubs/Swift (6.1.0):
2828
- OHHTTPStubs/Default
2929
- UIDeviceIdentifier (1.1.4)
30-
- WordPressShared (1.8.3-beta.1):
30+
- WordPressShared (1.8.8-beta.1):
3131
- CocoaLumberjack (~> 3.4)
3232
- FormatterKit/TimeIntervalFormatter (= 1.8.2)
3333
- wpxmlrpc (0.8.4)
@@ -44,7 +44,7 @@ DEPENDENCIES:
4444
- wpxmlrpc (= 0.8.4)
4545

4646
SPEC REPOS:
47-
https://github.com/cocoapods/specs.git:
47+
trunk:
4848
- Alamofire
4949
- CocoaLumberjack
5050
- FormatterKit
@@ -63,9 +63,9 @@ SPEC CHECKSUMS:
6363
OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab
6464
OHHTTPStubs: 1e21c7d2c084b8153fc53d48400d8919d2d432d0
6565
UIDeviceIdentifier: 8f8a24b257a4d978c8d40ad1e7355b944ffbfa8c
66-
WordPressShared: 7f3007a57331b4567c2c5bc539990818dd9a9965
66+
WordPressShared: 43343deb20fa5a094d31b18646986a1bd1cbc0d8
6767
wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2
6868

69-
PODFILE CHECKSUM: b9712dd8c2440cef21248d82e0878f6c786adf74
69+
PODFILE CHECKSUM: cb9caae9de544a5f1a1d6ee29288a88b7e00720c
7070

71-
COCOAPODS: 1.6.1
71+
COCOAPODS: 1.8.3

‎WordPressKit.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "WordPressKit"
3-
s.version = "4.5.1"
3+
s.version = "4.5.2"
44
s.summary = "WordPressKit offers a clean and simple WordPress.com and WordPress.org API."
55

66
s.description = <<-DESC

‎WordPressKit/AccountServiceRemoteREST.m‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ - (void)requestWPComAuthLinkForEmail:(NSString *)email
202202
path:path
203203
clientID:clientID
204204
clientSecret:clientSecret
205+
extraParams: nil
205206
wpcomScheme:scheme
206207
success:success
207208
failure:failure];
@@ -217,11 +218,14 @@ - (void)requestWPComSignupLinkForEmail:(NSString *)email
217218

218219
NSString *path = [self pathForEndpoint:@"auth/send-signup-email"
219220
withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
220-
221+
222+
NSDictionary *signupFlowParam = @{@"signup_flow_name": @"mobile-ios"};
223+
221224
[self requestWPComMagicLinkForEmail:email
222225
path:path
223226
clientID:clientID
224227
clientSecret:clientSecret
228+
extraParams:signupFlowParam
225229
wpcomScheme:scheme
226230
success:success
227231
failure:failure];
@@ -231,6 +235,7 @@ - (void)requestWPComMagicLinkForEmail:(NSString *)email
231235
path:(NSString *)path
232236
clientID:(NSString *)clientID
233237
clientSecret:(NSString *)clientSecret
238+
extraParams:(nullable NSDictionary *)extraParams
234239
wpcomScheme:(NSString *)scheme
235240
success:(void (^)(void))success
236241
failure:(void (^)(NSError *error))failure
@@ -241,10 +246,15 @@ - (void)requestWPComMagicLinkForEmail:(NSString *)email
241246
@"email": email,
242247
@"client_id": clientID,
243248
@"client_secret": clientSecret
244-
}];
249+
}];
250+
245251
if (![@"wordpress" isEqualToString:scheme]) {
246252
[params setObject:scheme forKey:@"scheme"];
247253
}
254+
255+
if (extraParams != nil) {
256+
[params addEntriesFromDictionary:extraParams];
257+
}
248258

249259
[self.wordPressComRestApi POST:path
250260
parameters:[NSDictionary dictionaryWithDictionary:params]

‎WordPressKit/NSAttributedString+extensions.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ extension NSAttributedString {
44
/// This helper method returns a new NSAttributedString instance, with all of the the leading / trailing newLines
55
/// characters removed.
66
///
7-
@objc func trimNewlines() -> NSAttributedString {
7+
@objc public func trimNewlines() -> NSAttributedString {
88
guard let trimmed = mutableCopy() as? NSMutableAttributedString else {
99
return self
1010
}

‎WordPressKit/NSMutableParagraphStyle+extensions.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import Foundation
22

33
extension NSMutableParagraphStyle {
4-
@objc convenience init(minLineHeight: CGFloat, lineBreakMode: NSLineBreakMode, alignment: NSTextAlignment) {
4+
@objc convenience public init(minLineHeight: CGFloat, lineBreakMode: NSLineBreakMode, alignment: NSTextAlignment) {
55
self.init()
66
self.minimumLineHeight = minLineHeight
77
self.lineBreakMode = lineBreakMode
88
self.alignment = alignment
99
}
1010

11-
@objc convenience init(minLineHeight: CGFloat, maxLineHeight: CGFloat, lineBreakMode: NSLineBreakMode, alignment: NSTextAlignment) {
11+
@objc convenience public init(minLineHeight: CGFloat, maxLineHeight: CGFloat, lineBreakMode: NSLineBreakMode, alignment: NSTextAlignment) {
1212
self.init(minLineHeight: minLineHeight, lineBreakMode: lineBreakMode, alignment: alignment)
1313
self.maximumLineHeight = maxLineHeight
1414
}

‎WordPressKit/NSString+MD5.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#import <CommonCrypto/CommonDigest.h>
33

44

5-
@implementation NSString (Gravatar)
5+
@implementation NSString (MD5)
66

77
- (NSString *)md5
88
{

0 commit comments

Comments
 (0)