Skip to content
This repository was archived by the owner on Dec 13, 2017. It is now read-only.

Commit 584d11b

Browse files
astralbodiesastralbodies
authored
Merge pull request #887 from wordpress-mobile/cocoalumberjack-3.2.0
Updates project to CocoaLumberjack 3.2.0
2 parents e296f6e + c116ce8 commit 584d11b

7 files changed

Lines changed: 37 additions & 48 deletions

File tree

‎Example/EditorDemo.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@
351351
);
352352
runOnlyForDeploymentPostprocessing = 0;
353353
shellPath = /bin/sh;
354-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
354+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
355355
showEnvVarsInLog = 0;
356356
};
357357
4695D4EE8336F768836ED41D /* [CP] Embed Pods Frameworks */ = {
@@ -396,7 +396,7 @@
396396
);
397397
runOnlyForDeploymentPostprocessing = 0;
398398
shellPath = /bin/sh;
399-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
399+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
400400
showEnvVarsInLog = 0;
401401
};
402402
D3F5DB2B0020A9B77E64179A /* [CP] Copy Pods Resources */ = {

‎Example/EditorDemo/WPAppDelegate.m‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
#import <WordPressEditor/WPEditorViewController.h>
55
#import <WordPressEditor/WPLegacyEditorViewController.h>
66
#import <WordPressEditor/WPEditorFormatbarView.h>
7-
#import <WordPressShared/WPStyleGuide.h>
8-
#import <WordPressShared/WPFontManager.h>
97
#import <WordPressEditor/WPEditorView.h>
108

119
@implementation WPAppDelegate

‎Example/EditorDemo/WPTestLegacyEditorViewController.m‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
#import "WPTestLegacyEditorViewController.h"
2-
#import <WordPressShared/WPStyleGuide.h>
3-
#import <WordPressShared/WPFontManager.h>
42
#import <WordPressEditor/WPLegacyEditorFormatToolbar.h>
53
@import Photos;
64
@import AVFoundation;
@@ -41,14 +39,14 @@ - (void)viewDidLoad
4139
- (void)customizeAppearance
4240
{
4341
[super customizeAppearance];
44-
[self setTitleFont:[WPFontManager notoBoldFontOfSize:24.0]];
45-
[self setTitleColor:[WPStyleGuide darkGrey]];
42+
// [self setTitleFont:[WPFontManager notoBoldFontOfSize:24.0]];
43+
// [self setTitleColor:[WPStyleGuide darkGrey]];
4644
[self setBodyFont:[UIFont fontWithName: @"Menlo-Regular" size:14.0f]];
47-
[self setBodyColor:[WPStyleGuide darkGrey]];
48-
[self setPlaceholderColor:[WPStyleGuide textFieldPlaceholderGrey]];
49-
[self setSeparatorColor:[WPStyleGuide greyLighten20]];
50-
51-
[[WPLegacyEditorFormatToolbar appearance] setTintColor:[WPStyleGuide greyLighten10]];
45+
// [self setBodyColor:[WPStyleGuide darkGrey]];
46+
// [self setPlaceholderColor:[WPStyleGuide textFieldPlaceholderGrey]];
47+
// [self setSeparatorColor:[WPStyleGuide greyLighten20]];
48+
//
49+
// [[WPLegacyEditorFormatToolbar appearance] setTintColor:[WPStyleGuide greyLighten10]];
5250
[[WPLegacyEditorFormatToolbar appearance] setBackgroundColor:[UIColor colorWithRed:0xF9/255.0 green:0xFB/255.0 blue:0xFC/255.0 alpha:1]];
5351
}
5452

‎Example/EditorDemo/WPViewController.m‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
@import Photos;
44
@import AVFoundation;
55
@import MobileCoreServices;
6-
#import <WordPressShared/WPStyleGuide.h>
7-
#import <WordPressShared/WPFontManager.h>
86
#import <CocoaLumberjack/CocoaLumberjack.h>
97
#import "WPEditorField.h"
108
#import "WPEditorView.h"
@@ -35,19 +33,21 @@ - (void)viewDidLoad
3533
- (void)customizeAppearance
3634
{
3735
[super customizeAppearance];
36+
// Note 12-June-2017 - Commented out all of the code originally referencing the WordPressShared pod which no longer exists.
37+
3838
// WORKAROUND: Preload the Noto regular font to ensure it is not overridden
3939
// by any of the Noto varients. Size is arbitrary.
4040
// See: https://github.com/wordpress-mobile/WordPress-Shared-iOS/issues/79
4141
// Remove this when #79 is resolved.
42-
[WPFontManager notoRegularFontOfSize:16.0];
43-
[WPFontManager loadNotoFontFamily];
44-
45-
self.placeholderColor = [WPStyleGuide grey];
46-
self.editorView.sourceViewTitleField.font = [WPFontManager notoBoldFontOfSize:24.0];
47-
self.editorView.sourceContentDividerView.backgroundColor = [WPStyleGuide greyLighten30];
48-
[self.toolbarView setBorderColor:[WPStyleGuide greyLighten10]];
49-
[self.toolbarView setItemTintColor: [WPStyleGuide greyLighten10]];
50-
[self.toolbarView setSelectedItemTintColor: [WPStyleGuide baseDarkerBlue]];
42+
// [WPFontManager notoRegularFontOfSize:16.0];
43+
// [WPFontManager loadNotoFontFamily];
44+
45+
// self.placeholderColor = [WPStyleGuide grey];
46+
// self.editorView.sourceViewTitleField.font = [WPFontManager notoBoldFontOfSize:24.0];
47+
// self.editorView.sourceContentDividerView.backgroundColor = [WPStyleGuide greyLighten30];
48+
// [self.toolbarView setBorderColor:[WPStyleGuide greyLighten10]];
49+
// [self.toolbarView setItemTintColor: [WPStyleGuide greyLighten10]];
50+
// [self.toolbarView setSelectedItemTintColor: [WPStyleGuide baseDarkerBlue]];
5151
[self.toolbarView setDisabledItemTintColor:[UIColor colorWithRed:0.78 green:0.84 blue:0.88 alpha:0.5]];
5252
// Explicit design decision to use non-standard colors. See:
5353
// https://github.com/wordpress-mobile/WordPress-Editor-iOS/issues/657#issuecomment-113651034

‎Example/Podfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ use_frameworks!
55

66
target 'EditorDemo' do
77
pod 'WordPress-iOS-Editor', :path => '../'
8-
pod 'CocoaLumberjack', '~>2.2.0', :inhibit_warnings => true
9-
pod 'WordPress-iOS-Shared', '~>0.8.0', :inhibit_warnings => true
8+
pod 'CocoaLumberjack', '~> 3.2.0', :inhibit_warnings => true
109
pod 'WordPressCom-Analytics-iOS', '~>0.1.0', :inhibit_warnings => true
1110
end
1211

1312
target 'EditorDemoTests' do
14-
pod 'CocoaLumberjack', '~>2.2.0', :inhibit_warnings => true
13+
pod 'CocoaLumberjack', '~> 3.2.0', :inhibit_warnings => true
1514
end
1615

‎Example/Podfile.lock‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,32 @@
11
PODS:
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):
7-
- CocoaLumberjack/Core
8-
- CocoaLumberjack/Extensions (2.2.0):
2+
- CocoaLumberjack (3.2.0):
3+
- CocoaLumberjack/Default (= 3.2.0)
4+
- CocoaLumberjack/Extensions (= 3.2.0)
5+
- CocoaLumberjack/Default (3.2.0)
6+
- CocoaLumberjack/Extensions (3.2.0):
97
- CocoaLumberjack/Default
108
- NSObject-SafeExpectations (0.0.2)
11-
- WordPress-iOS-Editor (1.9.1):
12-
- CocoaLumberjack (~> 2.2.0)
9+
- WordPress-iOS-Editor (1.9.2):
10+
- CocoaLumberjack (~> 3.2.0)
1311
- NSObject-SafeExpectations (~> 0.0.2)
1412
- WordPressCom-Analytics-iOS (~> 0.1.0)
15-
- WordPress-iOS-Shared (0.8.2):
16-
- CocoaLumberjack (~> 2.2.0)
1713
- WordPressCom-Analytics-iOS (0.1.25)
1814

1915
DEPENDENCIES:
20-
- CocoaLumberjack (~> 2.2.0)
16+
- CocoaLumberjack (~> 3.2.0)
2117
- WordPress-iOS-Editor (from `../`)
22-
- WordPress-iOS-Shared (~> 0.8.0)
2318
- WordPressCom-Analytics-iOS (~> 0.1.0)
2419

2520
EXTERNAL SOURCES:
2621
WordPress-iOS-Editor:
27-
:path: ../
22+
:path: "../"
2823

2924
SPEC CHECKSUMS:
30-
CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
25+
CocoaLumberjack: 9b4aed7073d242f29cc2f62068d995faf67f703a
3126
NSObject-SafeExpectations: 7d7f48df90df4e11da7cfe86b64f45eff7a7f521
32-
WordPress-iOS-Editor: 995f47fbf745f34fb392103ec97c0edb7f062f21
33-
WordPress-iOS-Shared: 999f5bfcf5744f94ebe9cb7459a138f5990fbf3a
27+
WordPress-iOS-Editor: e71fa013ac3bf8f448d0ee43421beed3f56500f0
3428
WordPressCom-Analytics-iOS: ec36976259d733430ba0fc2f8a51765947d2c7ba
3529

36-
PODFILE CHECKSUM: c5af8aa4a9723c2a470c04ad3589d2b2934feb38
30+
PODFILE CHECKSUM: 9d7155cbcbabb6020cd8a669ba72e4ae0a4b1e20
3731

38-
COCOAPODS: 1.1.1
32+
COCOAPODS: 1.2.1

‎WordPress-iOS-Editor.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "WordPress-iOS-Editor"
3-
s.version = "1.9.1"
3+
s.version = "1.9.2"
44
s.summary = "Reusable component rich text editor for WordPress.com in an iOS application."
55

66
s.description = <<-DESC
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
1818
s.prefix_header_file = "Classes/WordPress-iOS-Editor-Prefix.pch"
1919
s.exclude_files = 'Classes/exclude'
2020
s.requires_arc = true
21-
s.dependency 'CocoaLumberjack', '~> 2.2.0'
21+
s.dependency 'CocoaLumberjack', '~> 3.2.0'
2222
s.dependency 'WordPressCom-Analytics-iOS', '~>0.1.0'
2323
s.dependency 'NSObject-SafeExpectations', '~>0.0.2'
2424
s.header_dir = 'WordPressEditor'

0 commit comments

Comments
 (0)