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

Commit 512f672

Browse files
committed
Merge branch 'release/0.5.5'
2 parents 0ed676e + e41bd51 commit 512f672

File tree

12 files changed

+155
-259
lines changed

12 files changed

+155
-259
lines changed

Podfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
source 'https://github.com/CocoaPods/Specs.git'
22

33
platform :ios, '7.0'
4-
pod 'AFNetworking', '~> 2.5'
5-
pod 'CocoaLumberjack', '= 2.0.0'
4+
5+
pod 'CocoaLumberjack', '~> 2.2.0'
66

77
target 'WordPress-iOS-SharedTests', :exclusive => true do
8-
pod 'OHHTTPStubs', '3.1.1'
8+
pod 'OHHTTPStubs'
99
pod 'OCMock'
1010
end

Podfile.lock

Lines changed: 25 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,35 @@
11
PODS:
2-
- AFNetworking (2.5.4):
3-
- AFNetworking/NSURLConnection (= 2.5.4)
4-
- AFNetworking/NSURLSession (= 2.5.4)
5-
- AFNetworking/Reachability (= 2.5.4)
6-
- AFNetworking/Security (= 2.5.4)
7-
- AFNetworking/Serialization (= 2.5.4)
8-
- AFNetworking/UIKit (= 2.5.4)
9-
- AFNetworking/NSURLConnection (2.5.4):
10-
- AFNetworking/Reachability
11-
- AFNetworking/Security
12-
- AFNetworking/Serialization
13-
- AFNetworking/NSURLSession (2.5.4):
14-
- AFNetworking/Reachability
15-
- AFNetworking/Security
16-
- AFNetworking/Serialization
17-
- AFNetworking/Reachability (2.5.4)
18-
- AFNetworking/Security (2.5.4)
19-
- AFNetworking/Serialization (2.5.4)
20-
- AFNetworking/UIKit (2.5.4):
21-
- AFNetworking/NSURLConnection
22-
- AFNetworking/NSURLSession
23-
- CocoaLumberjack (2.0.0):
24-
- CocoaLumberjack/Default (= 2.0.0)
25-
- CocoaLumberjack/Extensions (= 2.0.0)
26-
- CocoaLumberjack/Core (2.0.0)
27-
- CocoaLumberjack/Default (2.0.0):
2+
- CocoaLumberjack (2.2.0):
3+
- CocoaLumberjack/Default (= 2.2.0)
4+
- CocoaLumberjack/Extensions (= 2.2.0)
5+
- CocoaLumberjack/Core (2.2.0)
6+
- CocoaLumberjack/Default (2.2.0):
287
- CocoaLumberjack/Core
29-
- CocoaLumberjack/Extensions (2.0.0):
8+
- CocoaLumberjack/Extensions (2.2.0):
309
- CocoaLumberjack/Default
31-
- OCMock (3.1.2)
32-
- OHHTTPStubs (3.1.1)
10+
- OCMock (3.2.2)
11+
- OHHTTPStubs (5.0.0):
12+
- OHHTTPStubs/Default (= 5.0.0)
13+
- OHHTTPStubs/Core (5.0.0)
14+
- OHHTTPStubs/Default (5.0.0):
15+
- OHHTTPStubs/Core
16+
- OHHTTPStubs/JSON
17+
- OHHTTPStubs/NSURLSession
18+
- OHHTTPStubs/OHPathHelpers
19+
- OHHTTPStubs/JSON (5.0.0):
20+
- OHHTTPStubs/Core
21+
- OHHTTPStubs/NSURLSession (5.0.0):
22+
- OHHTTPStubs/Core
23+
- OHHTTPStubs/OHPathHelpers (5.0.0)
3324

3425
DEPENDENCIES:
35-
- AFNetworking (~> 2.5)
36-
- CocoaLumberjack (= 2.0.0)
26+
- CocoaLumberjack (~> 2.2.0)
3727
- OCMock
38-
- OHHTTPStubs (= 3.1.1)
28+
- OHHTTPStubs
3929

4030
SPEC CHECKSUMS:
41-
AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
42-
CocoaLumberjack: a6f77d987d65dc7ba86b0f84db7d0b9084f77bcb
43-
OCMock: a10ea9f0a6e921651f96f78b6faee95ebc813b92
44-
OHHTTPStubs: cc1b9cb45b963daf891aa736f35d29d74308f0c9
31+
CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
32+
OCMock: 18c9b7e67d4c2770e95bb77a9cc1ae0c91fe3835
33+
OHHTTPStubs: a5d2e9eea07869d42ec03338325f398bc520e159
4534

4635
COCOAPODS: 0.39.0
Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,4 @@
11
PODS:
2-
- AFNetworking (2.6.3):
3-
- AFNetworking/NSURLConnection (= 2.6.3)
4-
- AFNetworking/NSURLSession (= 2.6.3)
5-
- AFNetworking/Reachability (= 2.6.3)
6-
- AFNetworking/Security (= 2.6.3)
7-
- AFNetworking/Serialization (= 2.6.3)
8-
- AFNetworking/UIKit (= 2.6.3)
9-
- AFNetworking/NSURLConnection (2.6.3):
10-
- AFNetworking/Reachability
11-
- AFNetworking/Security
12-
- AFNetworking/Serialization
13-
- AFNetworking/NSURLSession (2.6.3):
14-
- AFNetworking/Reachability
15-
- AFNetworking/Security
16-
- AFNetworking/Serialization
17-
- AFNetworking/Reachability (2.6.3)
18-
- AFNetworking/Security (2.6.3)
19-
- AFNetworking/Serialization (2.6.3)
20-
- AFNetworking/UIKit (2.6.3):
21-
- AFNetworking/NSURLConnection
22-
- AFNetworking/NSURLSession
232
- CocoaLumberjack (2.2.0):
243
- CocoaLumberjack/Default (= 2.2.0)
254
- CocoaLumberjack/Extensions (= 2.2.0)
@@ -28,8 +7,7 @@ PODS:
287
- CocoaLumberjack/Core
298
- CocoaLumberjack/Extensions (2.2.0):
309
- CocoaLumberjack/Default
31-
- WordPress-iOS-Shared (0.5.3):
32-
- AFNetworking (~> 2.5)
10+
- WordPress-iOS-Shared (0.5.5):
3311
- CocoaLumberjack (~> 2.2.0)
3412

3513
DEPENDENCIES:
@@ -40,8 +18,7 @@ EXTERNAL SOURCES:
4018
:path: ../
4119

4220
SPEC CHECKSUMS:
43-
AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
4421
CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
45-
WordPress-iOS-Shared: 43f55f24f0685e431167084071b7914d7c7134a8
22+
WordPress-iOS-Shared: e9e81a6a3cc3b45de93c8a565422c11395813c49
4623

4724
COCOAPODS: 0.39.0

WordPress-iOS-Shared.podspec

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "WordPress-iOS-Shared"
3-
s.version = "0.5.4"
3+
s.version = "0.5.5"
44
s.summary = "Shared components used in building the WordPress iOS apps and other library components."
55

66
s.description = <<-DESC
@@ -9,9 +9,9 @@ Pod::Spec.new do |s|
99
This is the first step required to build WordPress-iOS with UI components.
1010
DESC
1111

12-
s.homepage = "http://apps.wordpress.org"
12+
s.homepage = "http://apps.wordpress.com"
1313
s.license = "GPLv2"
14-
s.author = { "Aaron Douglas" => "[email protected]" }
14+
s.author = { "Automattic" => "[email protected]", "Aaron Douglas" => "astralbodies@gmail.com", "Sergio Estevao" => "sergioestevao@gmail.com" }
1515
s.social_media_url = "http://twitter.com/WordPressiOS"
1616
s.platform = :ios, "7.0"
1717
s.source = { :git => "https://github.com/wordpress-mobile/WordPress-iOS-Shared.git", :tag => s.version.to_s }
@@ -23,6 +23,5 @@ Pod::Spec.new do |s|
2323
s.requires_arc = true
2424
s.header_dir = 'WordPressShared'
2525

26-
s.dependency 'AFNetworking', '~> 2.5'
2726
s.dependency 'CocoaLumberjack', '~> 2.2.0'
2827
end

WordPress-iOS-Shared.xcodeproj/project.pbxproj

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
744DA846194F3A76002CD6E9 /* UIImage+Util.m in Sources */ = {isa = PBXBuildFile; fileRef = 744DA845194F3A76002CD6E9 /* UIImage+Util.m */; };
1313
7462F3401961FAAB00CC8EED /* WPFontManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 74F535F71961F7E6002D4320 /* WPFontManager.m */; };
1414
9309B52D192BEECC00B69F69 /* WordPressShared.m in Sources */ = {isa = PBXBuildFile; fileRef = 9309B52C192BEECC00B69F69 /* WordPressShared.m */; };
15-
9309B533192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 9309B532192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m */; };
1615
931A0FEE192A9CDD00D3CC11 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 931A0FED192A9CDD00D3CC11 /* Foundation.framework */; };
1716
931A0FFC192A9CDD00D3CC11 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 931A0FFB192A9CDD00D3CC11 /* XCTest.framework */; };
1817
931A0FFD192A9CDD00D3CC11 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 931A0FED192A9CDD00D3CC11 /* Foundation.framework */; };
@@ -29,10 +28,10 @@
2928
931A102E192A9E3200D3CC11 /* WPTableViewSectionHeaderFooterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 931A102B192A9E3200D3CC11 /* WPTableViewSectionHeaderFooterView.m */; };
3029
931A1035192AA03600D3CC11 /* UIColor+Helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 931A1034192AA03600D3CC11 /* UIColor+Helpers.m */; };
3130
931A1038192AA34300D3CC11 /* WPImageSourceTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 931A1037192AA34300D3CC11 /* WPImageSourceTest.m */; };
32-
931A103B192AA35B00D3CC11 /* AsyncTestHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 931A103A192AA35B00D3CC11 /* AsyncTestHelper.m */; };
3331
931A103E192AA3DB00D3CC11 /* test-image.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 931A103D192AA3DB00D3CC11 /* test-image.jpg */; };
3432
F45AF04D6E344F4CBD2A4B65 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AB8B405468864FD7A0D16B74 /* libPods.a */; };
3533
FF8DDCE11B5E91050098826F /* WPTextFieldTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FF8DDCE01B5E91050098826F /* WPTextFieldTableViewCell.m */; };
34+
FFBC2B371CBBE10300B0379E /* anim-reader.gif in Resources */ = {isa = PBXBuildFile; fileRef = FFBC2B361CBBE10300B0379E /* anim-reader.gif */; };
3635
/* End PBXBuildFile section */
3736

3837
/* Begin PBXContainerItemProxy section */
@@ -68,8 +67,6 @@
6867
897FA2B40A6E81DB4E7F0435 /* Pods-WordPress-iOS-SharedTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPress-iOS-SharedTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-WordPress-iOS-SharedTests/Pods-WordPress-iOS-SharedTests.debug.xcconfig"; sourceTree = "<group>"; };
6968
9309B52B192BEECC00B69F69 /* WordPressShared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WordPressShared.h; path = Exclude/WordPressShared.h; sourceTree = "<group>"; };
7069
9309B52C192BEECC00B69F69 /* WordPressShared.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WordPressShared.m; path = Exclude/WordPressShared.m; sourceTree = "<group>"; };
71-
9309B531192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WPAnimatedImageResponseSerializer.h; sourceTree = "<group>"; };
72-
9309B532192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WPAnimatedImageResponseSerializer.m; sourceTree = "<group>"; };
7370
931A0FEA192A9CDD00D3CC11 /* libWordPress-iOS-Shared.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libWordPress-iOS-Shared.a"; sourceTree = BUILT_PRODUCTS_DIR; };
7471
931A0FED192A9CDD00D3CC11 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
7572
931A0FF1192A9CDD00D3CC11 /* WordPress-iOS-Shared-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WordPress-iOS-Shared-Prefix.pch"; sourceTree = "<group>"; };
@@ -98,14 +95,17 @@
9895
931A1033192AA03600D3CC11 /* UIColor+Helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIColor+Helpers.h"; path = "Core/UIColor+Helpers.h"; sourceTree = "<group>"; };
9996
931A1034192AA03600D3CC11 /* UIColor+Helpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIColor+Helpers.m"; path = "Core/UIColor+Helpers.m"; sourceTree = "<group>"; };
10097
931A1037192AA34300D3CC11 /* WPImageSourceTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WPImageSourceTest.m; sourceTree = "<group>"; };
101-
931A1039192AA35B00D3CC11 /* AsyncTestHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncTestHelper.h; sourceTree = "<group>"; };
102-
931A103A192AA35B00D3CC11 /* AsyncTestHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AsyncTestHelper.m; sourceTree = "<group>"; };
10398
931A103D192AA3DB00D3CC11 /* test-image.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "test-image.jpg"; sourceTree = "<group>"; };
10499
98398B801DD76BC0326A4729 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
105100
A7CDA9068CC847B2AD67DE41 /* libPods-WordPress-iOS-SharedTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-WordPress-iOS-SharedTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
106101
AB8B405468864FD7A0D16B74 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
107102
E95607083C359C14B48BA503 /* Pods-WordPress-iOS-SharedTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPress-iOS-SharedTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-WordPress-iOS-SharedTests/Pods-WordPress-iOS-SharedTests.release.xcconfig"; sourceTree = "<group>"; };
103+
FF14587C1CBE6D37004A5A0B /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
104+
FF14587D1CBE6D37004A5A0B /* Podfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Podfile; sourceTree = "<group>"; };
105+
FF14587E1CBE6D37004A5A0B /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
106+
FF1458801CBE6D59004A5A0B /* WordPress-iOS-Shared.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "WordPress-iOS-Shared.podspec"; sourceTree = "<group>"; };
108107
FF8DDCE01B5E91050098826F /* WPTextFieldTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WPTextFieldTableViewCell.m; path = Core/WPTextFieldTableViewCell.m; sourceTree = "<group>"; };
108+
FFBC2B361CBBE10300B0379E /* anim-reader.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = "anim-reader.gif"; sourceTree = "<group>"; };
109109
/* End PBXFileReference section */
110110

111111
/* Begin PBXFrameworksBuildPhase section */
@@ -136,6 +136,7 @@
136136
931A0FE1192A9CDD00D3CC11 = {
137137
isa = PBXGroup;
138138
children = (
139+
FF14587B1CBE6D24004A5A0B /* Podspec Metadata */,
139140
931A0FEF192A9CDD00D3CC11 /* WordPress-iOS-Shared */,
140141
931A1003192A9CDD00D3CC11 /* WordPress-iOS-SharedTests */,
141142
931A0FEC192A9CDD00D3CC11 /* Frameworks */,
@@ -168,7 +169,6 @@
168169
931A0FEF192A9CDD00D3CC11 /* WordPress-iOS-Shared */ = {
169170
isa = PBXGroup;
170171
children = (
171-
E13D93EF1BF235BA00CCBA7C /* Private */,
172172
E154809F1A43035700FA4EDD /* Core */,
173173
931A0FF0192A9CDD00D3CC11 /* Supporting Files */,
174174
);
@@ -198,8 +198,6 @@
198198
931A1004192A9CDD00D3CC11 /* Supporting Files */ = {
199199
isa = PBXGroup;
200200
children = (
201-
931A1039192AA35B00D3CC11 /* AsyncTestHelper.h */,
202-
931A103A192AA35B00D3CC11 /* AsyncTestHelper.m */,
203201
931A1005192A9CDD00D3CC11 /* WordPress-iOS-SharedTests-Info.plist */,
204202
931A1006192A9CDD00D3CC11 /* InfoPlist.strings */,
205203
);
@@ -259,20 +257,12 @@
259257
931A103C192AA3B500D3CC11 /* Test Data */ = {
260258
isa = PBXGroup;
261259
children = (
260+
FFBC2B361CBBE10300B0379E /* anim-reader.gif */,
262261
931A103D192AA3DB00D3CC11 /* test-image.jpg */,
263262
);
264263
name = "Test Data";
265264
sourceTree = "<group>";
266265
};
267-
E13D93EF1BF235BA00CCBA7C /* Private */ = {
268-
isa = PBXGroup;
269-
children = (
270-
9309B531192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.h */,
271-
9309B532192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m */,
272-
);
273-
path = Private;
274-
sourceTree = "<group>";
275-
};
276266
E154809F1A43035700FA4EDD /* Core */ = {
277267
isa = PBXGroup;
278268
children = (
@@ -293,6 +283,17 @@
293283
name = Pods;
294284
sourceTree = "<group>";
295285
};
286+
FF14587B1CBE6D24004A5A0B /* Podspec Metadata */ = {
287+
isa = PBXGroup;
288+
children = (
289+
FF1458801CBE6D59004A5A0B /* WordPress-iOS-Shared.podspec */,
290+
FF14587C1CBE6D37004A5A0B /* README.md */,
291+
FF14587D1CBE6D37004A5A0B /* Podfile */,
292+
FF14587E1CBE6D37004A5A0B /* LICENSE */,
293+
);
294+
name = "Podspec Metadata";
295+
sourceTree = "<group>";
296+
};
296297
/* End PBXGroup section */
297298

298299
/* Begin PBXNativeTarget section */
@@ -369,6 +370,7 @@
369370
buildActionMask = 2147483647;
370371
files = (
371372
931A1008192A9CDD00D3CC11 /* InfoPlist.strings in Resources */,
373+
FFBC2B371CBBE10300B0379E /* anim-reader.gif in Resources */,
372374
931A103E192AA3DB00D3CC11 /* test-image.jpg in Resources */,
373375
);
374376
runOnlyForDeploymentPostprocessing = 0;
@@ -468,7 +470,6 @@
468470
744DA846194F3A76002CD6E9 /* UIImage+Util.m in Sources */,
469471
931A1020192A9DD500D3CC11 /* WPNoResultsView.m in Sources */,
470472
931A1026192A9E0B00D3CC11 /* WPNUXUtility.m in Sources */,
471-
9309B533192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m in Sources */,
472473
931A1035192AA03600D3CC11 /* UIColor+Helpers.m in Sources */,
473474
931A1019192A9D6E00D3CC11 /* NSString+XMLExtensions.m in Sources */,
474475
931A101C192A9DA500D3CC11 /* WPImageSource.m in Sources */,
@@ -480,7 +481,6 @@
480481
isa = PBXSourcesBuildPhase;
481482
buildActionMask = 2147483647;
482483
files = (
483-
931A103B192AA35B00D3CC11 /* AsyncTestHelper.m in Sources */,
484484
931A1038192AA34300D3CC11 /* WPImageSourceTest.m in Sources */,
485485
);
486486
runOnlyForDeploymentPostprocessing = 0;

0 commit comments

Comments
 (0)