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

Commit 0ed676e

Browse files
astralbodiesastralbodies
committed
Merge branch 'develop' for 0.5.4 release
2 parents 85dce9b + bf1dd19 commit 0ed676e

File tree

17 files changed

+158
-73
lines changed

17 files changed

+158
-73
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
osx_image: xcode7.1
12
language: objective-c
23
xcode_workspace: WordPress-iOS-Shared.xcworkspace
34
xcode_scheme: WordPress-iOS-Shared
4-
xcode_sdk: iphonesimulator8.1
5+
xcode_sdk: iphonesimulator

‎Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ SPEC CHECKSUMS:
4343
OCMock: a10ea9f0a6e921651f96f78b6faee95ebc813b92
4444
OHHTTPStubs: cc1b9cb45b963daf891aa736f35d29d74308f0c9
4545

46-
COCOAPODS: 0.37.2
46+
COCOAPODS: 0.39.0

‎WordPress-iOS-Shared-Example/Podfile.lock‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
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):
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):
1010
- AFNetworking/Reachability
1111
- AFNetworking/Security
1212
- AFNetworking/Serialization
13-
- AFNetworking/NSURLSession (2.5.4):
13+
- AFNetworking/NSURLSession (2.6.3):
1414
- AFNetworking/Reachability
1515
- AFNetworking/Security
1616
- 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):
17+
- AFNetworking/Reachability (2.6.3)
18+
- AFNetworking/Security (2.6.3)
19+
- AFNetworking/Serialization (2.6.3)
20+
- AFNetworking/UIKit (2.6.3):
2121
- AFNetworking/NSURLConnection
2222
- 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):
23+
- CocoaLumberjack (2.2.0):
24+
- CocoaLumberjack/Default (= 2.2.0)
25+
- CocoaLumberjack/Extensions (= 2.2.0)
26+
- CocoaLumberjack/Core (2.2.0)
27+
- CocoaLumberjack/Default (2.2.0):
2828
- CocoaLumberjack/Core
29-
- CocoaLumberjack/Extensions (2.0.0):
29+
- CocoaLumberjack/Extensions (2.2.0):
3030
- CocoaLumberjack/Default
31-
- WordPress-iOS-Shared (0.4.3):
31+
- WordPress-iOS-Shared (0.5.3):
3232
- AFNetworking (~> 2.5)
33-
- CocoaLumberjack (= 2.0.0)
33+
- CocoaLumberjack (~> 2.2.0)
3434

3535
DEPENDENCIES:
3636
- WordPress-iOS-Shared (from `../`)
@@ -40,8 +40,8 @@ EXTERNAL SOURCES:
4040
:path: ../
4141

4242
SPEC CHECKSUMS:
43-
AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
44-
CocoaLumberjack: a6f77d987d65dc7ba86b0f84db7d0b9084f77bcb
45-
WordPress-iOS-Shared: 20307f6ca50f833cf6bbf98f3a7ef7643d90ce8c
43+
AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
44+
CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
45+
WordPress-iOS-Shared: 43f55f24f0685e431167084071b7914d7c7134a8
4646

47-
COCOAPODS: 0.37.2
47+
COCOAPODS: 0.39.0

‎WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
852FBB42197755CC002C5249 /* Frameworks */,
157157
852FBB43197755CC002C5249 /* Resources */,
158158
BB9A98FF658A4D29953551D1 /* Copy Pods Resources */,
159+
20790AE04201DFFC0FF9F3EB /* Embed Pods Frameworks */,
159160
);
160161
buildRules = (
161162
);
@@ -207,6 +208,21 @@
207208
/* End PBXResourcesBuildPhase section */
208209

209210
/* Begin PBXShellScriptBuildPhase section */
211+
20790AE04201DFFC0FF9F3EB /* Embed Pods Frameworks */ = {
212+
isa = PBXShellScriptBuildPhase;
213+
buildActionMask = 2147483647;
214+
files = (
215+
);
216+
inputPaths = (
217+
);
218+
name = "Embed Pods Frameworks";
219+
outputPaths = (
220+
);
221+
runOnlyForDeploymentPostprocessing = 0;
222+
shellPath = /bin/sh;
223+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WordPress-iOS-Shared-Example/Pods-WordPress-iOS-Shared-Example-frameworks.sh\"\n";
224+
showEnvVarsInLog = 0;
225+
};
210226
601245E04F1A43469E176EE1 /* Check Pods Manifest.lock */ = {
211227
isa = PBXShellScriptBuildPhase;
212228
buildActionMask = 2147483647;

‎WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/ColorsTableViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#import "ColorsTableViewController.h"
2-
#import <WordPress-iOS-Shared/WPStyleGuide.h>
2+
#import <WordPressShared/WPStyleGuide.h>
33

44
@interface ColorsTableViewController ()
55

‎WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/DeviceTableViewController.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#import "DeviceTableViewCell.h"
33
#import "DeviceTest.h"
44
#import "FontTableViewCell.h"
5-
#import <WordPress-iOS-Shared/WPDeviceIdentification.h>
6-
#import <WordPress-iOS-Shared/WPStyleGuide.h>
7-
#import <WordPress-iOS-Shared/WPFontManager.h>
5+
#import <WordPressShared/WPDeviceIdentification.h>
6+
#import <WordPressShared/WPStyleGuide.h>
7+
#import <WordPressShared/WPFontManager.h>
88

99
@interface DeviceTableViewController ()
1010

‎WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/FontsTableViewController.m‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#import "FontsTableViewController.h"
22
#import "FontTableViewCell.h"
3-
#import <WordPress-iOS-Shared/WPStyleGuide.h>
4-
#import <WordPress-iOS-Shared/WPFontManager.h>
3+
#import <WordPressShared/WPStyleGuide.h>
4+
#import <WordPressShared/WPFontManager.h>
55

66
static const CGFloat FontSize = 20.0;
77

@@ -96,7 +96,13 @@ - (NSArray *)fontDetails {
9696
@{@"title": NSLocalizedString(@"OpenSans Light Italic",nil), @"font": [WPFontManager openSansLightItalicFontOfSize:FontSize]},
9797
@{@"title": NSLocalizedString(@"OpenSans Semi-Bold",nil), @"font": [WPFontManager openSansSemiBoldFontOfSize:FontSize]},
9898
@{@"title": NSLocalizedString(@"OpenSans Semi-Bold Italic",nil), @"font": [WPFontManager openSansSemiBoldItalicFontOfSize:FontSize]},
99-
99+
100+
@{@"title": NSLocalizedString(@"System",nil), @"font": [WPFontManager systemRegularFontOfSize:FontSize]},
101+
@{@"title": NSLocalizedString(@"System Bold",nil), @"font": [WPFontManager systemBoldFontOfSize:FontSize]},
102+
@{@"title": NSLocalizedString(@"System Italic",nil), @"font": [WPFontManager systemItalicFontOfSize:FontSize]},
103+
@{@"title": NSLocalizedString(@"System Light",nil), @"font": [WPFontManager systemLightFontOfSize:FontSize]},
104+
@{@"title": NSLocalizedString(@"System Semi-Bold",nil), @"font": [WPFontManager systemSemiBoldFontOfSize:FontSize]},
105+
100106
@{@"title": NSLocalizedString(@"Large Post Title Font", nil), @"font": [WPStyleGuide largePostTitleFont], @"attributes": [WPStyleGuide largePostTitleAttributes]},
101107
@{@"title": NSLocalizedString(@"Post Title Font", nil), @"font": [WPStyleGuide postTitleFont], @"attributes": [WPStyleGuide postTitleAttributes]},
102108
@{@"title": NSLocalizedString(@"Post Title Font Bold", nil), @"font": [WPStyleGuide postTitleFontBold], @"attributes": [WPStyleGuide postTitleAttributesBold]},

‎WordPress-iOS-Shared.podspec‎

Lines changed: 5 additions & 3 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.4.4"
3+
s.version = "0.5.4"
44
s.summary = "Shared components used in building the WordPress iOS apps and other library components."
55

66
s.description = <<-DESC
@@ -15,12 +15,14 @@ Pod::Spec.new do |s|
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 }
18-
s.source_files = 'WordPress-iOS-Shared/Core'
18+
s.source_files = [ 'WordPress-iOS-Shared/Core', 'WordPress-iOS-Shared/Private' ]
19+
s.public_header_files = 'WordPress-iOS-Shared/Core/*.h'
1920
s.ios.resource_bundle = { 'WordPress-iOS-Shared' => 'WordPress-iOS-Shared/Assets/*.{ttf,otf}' }
2021
s.exclude_files = 'WordPress-iOS-Shared/Exclude'
2122
s.prefix_header_file = "WordPress-iOS-Shared/WordPress-iOS-Shared-Prefix.pch"
2223
s.requires_arc = true
24+
s.header_dir = 'WordPressShared'
2325

2426
s.dependency 'AFNetworking', '~> 2.5'
25-
s.dependency 'CocoaLumberjack', '= 2.0.0'
27+
s.dependency 'CocoaLumberjack', '~> 2.2.0'
2628
end

‎WordPress-iOS-Shared.xcodeproj/project.pbxproj‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
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>"; };
6969
9309B52B192BEECC00B69F69 /* WordPressShared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WordPressShared.h; path = Exclude/WordPressShared.h; sourceTree = "<group>"; };
7070
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; name = WPAnimatedImageResponseSerializer.h; path = Core/WPAnimatedImageResponseSerializer.h; sourceTree = "<group>"; };
72-
9309B532192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WPAnimatedImageResponseSerializer.m; path = Core/WPAnimatedImageResponseSerializer.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>"; };
7373
931A0FEA192A9CDD00D3CC11 /* libWordPress-iOS-Shared.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libWordPress-iOS-Shared.a"; sourceTree = BUILT_PRODUCTS_DIR; };
7474
931A0FED192A9CDD00D3CC11 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
7575
931A0FF1192A9CDD00D3CC11 /* WordPress-iOS-Shared-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WordPress-iOS-Shared-Prefix.pch"; sourceTree = "<group>"; };
@@ -168,6 +168,7 @@
168168
931A0FEF192A9CDD00D3CC11 /* WordPress-iOS-Shared */ = {
169169
isa = PBXGroup;
170170
children = (
171+
E13D93EF1BF235BA00CCBA7C /* Private */,
171172
E154809F1A43035700FA4EDD /* Core */,
172173
931A0FF0192A9CDD00D3CC11 /* Supporting Files */,
173174
);
@@ -210,8 +211,6 @@
210211
children = (
211212
744DA844194F3A76002CD6E9 /* UIImage+Util.h */,
212213
744DA845194F3A76002CD6E9 /* UIImage+Util.m */,
213-
9309B531192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.h */,
214-
9309B532192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m */,
215214
931A101A192A9DA500D3CC11 /* WPImageSource.h */,
216215
931A101B192A9DA500D3CC11 /* WPImageSource.m */,
217216
931A1014192A9D5200D3CC11 /* NSString+Util.h */,
@@ -265,6 +264,15 @@
265264
name = "Test Data";
266265
sourceTree = "<group>";
267266
};
267+
E13D93EF1BF235BA00CCBA7C /* Private */ = {
268+
isa = PBXGroup;
269+
children = (
270+
9309B531192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.h */,
271+
9309B532192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m */,
272+
);
273+
path = Private;
274+
sourceTree = "<group>";
275+
};
268276
E154809F1A43035700FA4EDD /* Core */ = {
269277
isa = PBXGroup;
270278
children = (
@@ -316,6 +324,7 @@
316324
931A0FF7192A9CDD00D3CC11 /* Frameworks */,
317325
931A0FF8192A9CDD00D3CC11 /* Resources */,
318326
01EFB93CB9504D3780477772 /* Copy Pods Resources */,
327+
0DD01DEF03ABC712BB9DEA89 /* Embed Pods Frameworks */,
319328
);
320329
buildRules = (
321330
);
@@ -397,6 +406,21 @@
397406
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
398407
showEnvVarsInLog = 0;
399408
};
409+
0DD01DEF03ABC712BB9DEA89 /* Embed Pods Frameworks */ = {
410+
isa = PBXShellScriptBuildPhase;
411+
buildActionMask = 2147483647;
412+
files = (
413+
);
414+
inputPaths = (
415+
);
416+
name = "Embed Pods Frameworks";
417+
outputPaths = (
418+
);
419+
runOnlyForDeploymentPostprocessing = 0;
420+
shellPath = /bin/sh;
421+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WordPress-iOS-SharedTests/Pods-WordPress-iOS-SharedTests-frameworks.sh\"\n";
422+
showEnvVarsInLog = 0;
423+
};
400424
D2BBEB69E91E4B0798D536DF /* Copy Pods Resources */ = {
401425
isa = PBXShellScriptBuildPhase;
402426
buildActionMask = 2147483647;

‎WordPress-iOS-Shared/Core/WPFontManager.h‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,20 @@
22

33
@interface WPFontManager : NSObject
44

5-
+ (UIFont *)openSansLightFontOfSize:(CGFloat)size;
6-
+ (UIFont *)openSansItalicFontOfSize:(CGFloat)size;
7-
+ (UIFont *)openSansLightItalicFontOfSize:(CGFloat)size;
8-
+ (UIFont *)openSansBoldFontOfSize:(CGFloat)size;
9-
+ (UIFont *)openSansBoldItalicFontOfSize:(CGFloat)size;
10-
+ (UIFont *)openSansSemiBoldFontOfSize:(CGFloat)size;
11-
+ (UIFont *)openSansSemiBoldItalicFontOfSize:(CGFloat)size;
12-
+ (UIFont *)openSansRegularFontOfSize:(CGFloat)size;
5+
+ (UIFont *)openSansLightFontOfSize:(CGFloat)size __deprecated_msg("Use systemLightFontOfSize instead");
6+
+ (UIFont *)openSansItalicFontOfSize:(CGFloat)size __deprecated_msg("Use systemItalicFontOfSize instead");
7+
+ (UIFont *)openSansLightItalicFontOfSize:(CGFloat)size __deprecated_msg("Use systemLightItalicFontOfSize instead");
8+
+ (UIFont *)openSansBoldFontOfSize:(CGFloat)size __deprecated_msg("Use systemBoldFontOfSize instead");
9+
+ (UIFont *)openSansBoldItalicFontOfSize:(CGFloat)size __deprecated_msg("Use systemBoldItalicFontOfSize instead");
10+
+ (UIFont *)openSansSemiBoldFontOfSize:(CGFloat)size __deprecated_msg("Use systemSemiBoldFontOfSize instead");
11+
+ (UIFont *)openSansSemiBoldItalicFontOfSize:(CGFloat)size __deprecated_msg("Use systemSemiBoldItalicFontOfSize instead");
12+
+ (UIFont *)openSansRegularFontOfSize:(CGFloat)size __deprecated_msg("Use systemRegularFontOfSize instead");
13+
14+
+ (UIFont *)systemLightFontOfSize:(CGFloat)size;
15+
+ (UIFont *)systemItalicFontOfSize:(CGFloat)size;
16+
+ (UIFont *)systemBoldFontOfSize:(CGFloat)size;
17+
+ (UIFont *)systemSemiBoldFontOfSize:(CGFloat)size;
18+
+ (UIFont *)systemRegularFontOfSize:(CGFloat)size;
1319

1420
+ (UIFont *)merriweatherBoldFontOfSize:(CGFloat)size;
1521
+ (UIFont *)merriweatherBoldItalicFontOfSize:(CGFloat)size;

0 commit comments

Comments
 (0)