Merge pull request #887 from wordpress-mobile/cocoalumberjack-3.2.0

Updates project to CocoaLumberjack 3.2.0
wordpress-mobile · Jun 12, 2017 · 584d11b · 584d11b
2 parents e296f6e + c116ce8
commit 584d11b
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 48 deletions.
diff --git a/Example/EditorDemo.xcodeproj/project.pbxproj b/Example/EditorDemo.xcodeproj/project.pbxproj
@@ -351,7 +351,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			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";
+			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";
 			showEnvVarsInLog = 0;
 		};
 		4695D4EE8336F768836ED41D /* [CP] Embed Pods Frameworks */ = {
@@ -396,7 +396,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			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";
+			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";
 			showEnvVarsInLog = 0;
 		};
 		D3F5DB2B0020A9B77E64179A /* [CP] Copy Pods Resources */ = {

diff --git a/Example/EditorDemo/WPAppDelegate.m b/Example/EditorDemo/WPAppDelegate.m
@@ -4,8 +4,6 @@
 #import <WordPressEditor/WPEditorViewController.h>
 #import <WordPressEditor/WPLegacyEditorViewController.h>
 #import <WordPressEditor/WPEditorFormatbarView.h>
-#import <WordPressShared/WPStyleGuide.h>
-#import <WordPressShared/WPFontManager.h>
 #import <WordPressEditor/WPEditorView.h>
 
 @implementation WPAppDelegate

diff --git a/Example/EditorDemo/WPTestLegacyEditorViewController.m b/Example/EditorDemo/WPTestLegacyEditorViewController.m
@@ -1,6 +1,4 @@
 #import "WPTestLegacyEditorViewController.h"
-#import <WordPressShared/WPStyleGuide.h>
-#import <WordPressShared/WPFontManager.h>
 #import <WordPressEditor/WPLegacyEditorFormatToolbar.h>
 @import Photos;
 @import AVFoundation;
@@ -41,14 +39,14 @@ - (void)viewDidLoad
 - (void)customizeAppearance
 {
     [super customizeAppearance];
-    [self setTitleFont:[WPFontManager notoBoldFontOfSize:24.0]];
-    [self setTitleColor:[WPStyleGuide darkGrey]];
+//    [self setTitleFont:[WPFontManager notoBoldFontOfSize:24.0]];
+//    [self setTitleColor:[WPStyleGuide darkGrey]];
     [self setBodyFont:[UIFont fontWithName: @"Menlo-Regular" size:14.0f]];
-    [self setBodyColor:[WPStyleGuide darkGrey]];
-    [self setPlaceholderColor:[WPStyleGuide textFieldPlaceholderGrey]];
-    [self setSeparatorColor:[WPStyleGuide greyLighten20]];
-
-    [[WPLegacyEditorFormatToolbar appearance] setTintColor:[WPStyleGuide greyLighten10]];
+//    [self setBodyColor:[WPStyleGuide darkGrey]];
+//    [self setPlaceholderColor:[WPStyleGuide textFieldPlaceholderGrey]];
+//    [self setSeparatorColor:[WPStyleGuide greyLighten20]];
+//
+//    [[WPLegacyEditorFormatToolbar appearance] setTintColor:[WPStyleGuide greyLighten10]];
     [[WPLegacyEditorFormatToolbar appearance] setBackgroundColor:[UIColor colorWithRed:0xF9/255.0 green:0xFB/255.0 blue:0xFC/255.0 alpha:1]];
 }
 

diff --git a/Example/EditorDemo/WPViewController.m b/Example/EditorDemo/WPViewController.m
@@ -3,8 +3,6 @@
 @import Photos;
 @import AVFoundation;
 @import MobileCoreServices;
-#import <WordPressShared/WPStyleGuide.h>
-#import <WordPressShared/WPFontManager.h>
 #import <CocoaLumberjack/CocoaLumberjack.h>
 #import "WPEditorField.h"
 #import "WPEditorView.h"
@@ -35,19 +33,21 @@ - (void)viewDidLoad
 - (void)customizeAppearance
 {
     [super customizeAppearance];
+    // Note 12-June-2017 - Commented out all of the code originally referencing the WordPressShared pod which no longer exists.
+
     // WORKAROUND: Preload the Noto regular font to ensure it is not overridden
     // by any of the Noto varients.  Size is arbitrary.
     // See: https://github.com/wordpress-mobile/WordPress-Shared-iOS/issues/79
     // Remove this when #79 is resolved.
-    [WPFontManager notoRegularFontOfSize:16.0];
-    [WPFontManager loadNotoFontFamily];
-
-    self.placeholderColor = [WPStyleGuide grey];
-    self.editorView.sourceViewTitleField.font = [WPFontManager notoBoldFontOfSize:24.0];
-    self.editorView.sourceContentDividerView.backgroundColor = [WPStyleGuide greyLighten30];
-    [self.toolbarView setBorderColor:[WPStyleGuide greyLighten10]];
-    [self.toolbarView setItemTintColor: [WPStyleGuide greyLighten10]];
-    [self.toolbarView setSelectedItemTintColor: [WPStyleGuide baseDarkerBlue]];
+//    [WPFontManager notoRegularFontOfSize:16.0];
+//    [WPFontManager loadNotoFontFamily];
+
+//    self.placeholderColor = [WPStyleGuide grey];
+//    self.editorView.sourceViewTitleField.font = [WPFontManager notoBoldFontOfSize:24.0];
+//    self.editorView.sourceContentDividerView.backgroundColor = [WPStyleGuide greyLighten30];
+//    [self.toolbarView setBorderColor:[WPStyleGuide greyLighten10]];
+//    [self.toolbarView setItemTintColor: [WPStyleGuide greyLighten10]];
+//    [self.toolbarView setSelectedItemTintColor: [WPStyleGuide baseDarkerBlue]];
     [self.toolbarView setDisabledItemTintColor:[UIColor colorWithRed:0.78 green:0.84 blue:0.88 alpha:0.5]];
     // Explicit design decision to use non-standard colors. See:
     // https://github.com/wordpress-mobile/WordPress-Editor-iOS/issues/657#issuecomment-113651034

diff --git a/Example/Podfile b/Example/Podfile
@@ -5,12 +5,11 @@ use_frameworks!
 
 target 'EditorDemo' do
   pod 'WordPress-iOS-Editor', :path => '../'
-  pod 'CocoaLumberjack', '~>2.2.0', :inhibit_warnings => true
-  pod 'WordPress-iOS-Shared', '~>0.8.0', :inhibit_warnings => true
+  pod 'CocoaLumberjack', '~> 3.2.0', :inhibit_warnings => true
   pod 'WordPressCom-Analytics-iOS', '~>0.1.0', :inhibit_warnings => true
 end
 
 target 'EditorDemoTests' do
-  pod 'CocoaLumberjack', '~>2.2.0', :inhibit_warnings => true
+  pod 'CocoaLumberjack', '~> 3.2.0', :inhibit_warnings => true
 end
 
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,38 +1,32 @@
 PODS:
-  - CocoaLumberjack (2.2.0):
-    - CocoaLumberjack/Default (= 2.2.0)
-    - CocoaLumberjack/Extensions (= 2.2.0)
-  - CocoaLumberjack/Core (2.2.0)
-  - CocoaLumberjack/Default (2.2.0):
-    - CocoaLumberjack/Core
-  - CocoaLumberjack/Extensions (2.2.0):
+  - CocoaLumberjack (3.2.0):
+    - CocoaLumberjack/Default (= 3.2.0)
+    - CocoaLumberjack/Extensions (= 3.2.0)
+  - CocoaLumberjack/Default (3.2.0)
+  - CocoaLumberjack/Extensions (3.2.0):
     - CocoaLumberjack/Default
   - NSObject-SafeExpectations (0.0.2)
-  - WordPress-iOS-Editor (1.9.1):
-    - CocoaLumberjack (~> 2.2.0)
+  - WordPress-iOS-Editor (1.9.2):
+    - CocoaLumberjack (~> 3.2.0)
     - NSObject-SafeExpectations (~> 0.0.2)
     - WordPressCom-Analytics-iOS (~> 0.1.0)
-  - WordPress-iOS-Shared (0.8.2):
-    - CocoaLumberjack (~> 2.2.0)
   - WordPressCom-Analytics-iOS (0.1.25)
 
 DEPENDENCIES:
-  - CocoaLumberjack (~> 2.2.0)
+  - CocoaLumberjack (~> 3.2.0)
   - WordPress-iOS-Editor (from `../`)
-  - WordPress-iOS-Shared (~> 0.8.0)
   - WordPressCom-Analytics-iOS (~> 0.1.0)
 
 EXTERNAL SOURCES:
   WordPress-iOS-Editor:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
-  CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
+  CocoaLumberjack: 9b4aed7073d242f29cc2f62068d995faf67f703a
   NSObject-SafeExpectations: 7d7f48df90df4e11da7cfe86b64f45eff7a7f521
-  WordPress-iOS-Editor: 995f47fbf745f34fb392103ec97c0edb7f062f21
-  WordPress-iOS-Shared: 999f5bfcf5744f94ebe9cb7459a138f5990fbf3a
+  WordPress-iOS-Editor: e71fa013ac3bf8f448d0ee43421beed3f56500f0
   WordPressCom-Analytics-iOS: ec36976259d733430ba0fc2f8a51765947d2c7ba
 
-PODFILE CHECKSUM: c5af8aa4a9723c2a470c04ad3589d2b2934feb38
+PODFILE CHECKSUM: 9d7155cbcbabb6020cd8a669ba72e4ae0a4b1e20
 
-COCOAPODS: 1.1.1
+COCOAPODS: 1.2.1
diff --git a/WordPress-iOS-Editor.podspec b/WordPress-iOS-Editor.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "WordPress-iOS-Editor"
-  s.version          = "1.9.1"
+  s.version          = "1.9.2"
   s.summary      = "Reusable component rich text editor for WordPress.com in an iOS application."
 
   s.description  = <<-DESC
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
   s.prefix_header_file = "Classes/WordPress-iOS-Editor-Prefix.pch"
   s.exclude_files = 'Classes/exclude'
   s.requires_arc = true
-  s.dependency 'CocoaLumberjack', '~> 2.2.0'
+  s.dependency 'CocoaLumberjack', '~> 3.2.0'
   s.dependency 'WordPressCom-Analytics-iOS', '~>0.1.0'
   s.dependency 'NSObject-SafeExpectations', '~>0.0.2'
   s.header_dir = 'WordPressEditor'