Merge branch 'develop' into try/remove-pods-folder

Author: koke

.travis.yml

@@ -1,8 +1,7 @@
-osx_image: xcode7
+osx_image: xcode8.2
 language: objective-c
-xcode_workspace: ./Example/EditorDemo.xcworkspace
-xcode_scheme: EditorDemo
-xcode_sdk: iphonesimulator9.0
 notifications:
   email: true
 sudo: false
+script:
+  - set -o pipefail && xcodebuild -workspace Example/EditorDemo.xcworkspace -scheme EditorDemo -sdk iphonesimulator | xcpretty

Assets/editor.css

@@ -1,25 +1,25 @@
 
 @font-face {
-    font-family: 'Merriweather';
-    src: local("Merriweather Light");
+    font-family: 'NotoSerif';
+    src: local("NotoSerif-Regular");
     font-weight: normal;
     font-style: normal;
 }
 @font-face {
-    font-family: 'Merriweather';
-    src: local("Merriweather-Italic");
+    font-family: 'Noto Serif';
+    src: local("NotoSerif-Italic");
     font-weight: normal;
     font-style: italic;
 }
 @font-face {
-    font-family: 'Merriweather';
-    src: local("Merriweather-Bold");
+    font-family: 'Noto Serif';
+    src: local("NotoSerif-Bold");
     font-weight: bold;
     font-style: normal;
 }
 @font-face {
-    font-family: 'Merriweather';
-    src: local("Merriweather-BoldItalic");
+    font-family: 'Noto Serif';
+    src: local("NotoSerif-BoldItalic");
     font-weight: bold;
     font-style: italic;
 }
@@ -36,7 +36,7 @@ html {
 
 html, body {
     margin:0;
-    font-family:'Merriweather', sans-serif;
+    font-family:'Noto Serif', sans-serif;
     font-size:1em;
     color:#2D2D2D;
 }
@@ -378,7 +378,7 @@ div.field[placeholderText][contenteditable=true]:empty:focus:before {
 }
 
 #zss_field_title, #zss_field_title p {
-    font-family:'Merriweather', serif;
+    font-family:'Noto Serif', serif;
     font-weight: bold;
     font-size: 24px;
     line-height: 32px;

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_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";
 			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_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";
 			showEnvVarsInLog = 0;
 		};
 		D3F5DB2B0020A9B77E64179A /* [CP] Copy Pods Resources */ = {

Example/EditorDemo/WPTestLegacyEditorViewController.m

@@ -41,7 +41,7 @@ - (void)viewDidLoad
 - (void)customizeAppearance
 {
     [super customizeAppearance];
-    [self setTitleFont:[WPFontManager merriweatherBoldFontOfSize:24.0]];
+    [self setTitleFont:[WPFontManager notoBoldFontOfSize:24.0]];
     [self setTitleColor:[WPStyleGuide darkGrey]];
     [self setBodyFont:[UIFont fontWithName: @"Menlo-Regular" size:14.0f]];
     [self setBodyColor:[WPStyleGuide darkGrey]];

Example/EditorDemo/WPViewController.m

@@ -35,14 +35,10 @@ - (void)viewDidLoad
 - (void)customizeAppearance
 {
     [super customizeAppearance];
-    [WPFontManager merriweatherBoldFontOfSize:16.0];
-    [WPFontManager merriweatherBoldItalicFontOfSize:16.0];
-    [WPFontManager merriweatherItalicFontOfSize:16.0];
-    [WPFontManager merriweatherLightFontOfSize:16.0];
-    [WPFontManager merriweatherRegularFontOfSize:16.0];
+    [WPFontManager loadNotoFontFamily];
 
     self.placeholderColor = [WPStyleGuide grey];
-    self.editorView.sourceViewTitleField.font = [WPFontManager merriweatherBoldFontOfSize:24.0];
+    self.editorView.sourceViewTitleField.font = [WPFontManager notoBoldFontOfSize:24.0];
     self.editorView.sourceContentDividerView.backgroundColor = [WPStyleGuide greyLighten30];
     [self.toolbarView setBorderColor:[WPStyleGuide greyLighten10]];
     [self.toolbarView setItemTintColor: [WPStyleGuide greyLighten10]];

Example/Podfile

@@ -6,7 +6,7 @@ use_frameworks!
 target 'EditorDemo' do
   pod 'WordPress-iOS-Editor', :path => '../'
   pod 'CocoaLumberjack', '~>2.2.0', :inhibit_warnings => true
-  pod 'WordPress-iOS-Shared', '~>0.5.0', :inhibit_warnings => true
+  pod 'WordPress-iOS-Shared', '~>0.8.0', :inhibit_warnings => true
   pod 'WordPressCom-Analytics-iOS', '~>0.1.0', :inhibit_warnings => true
 end
 

Example/Podfile.lock

@@ -12,14 +12,14 @@ PODS:
     - CocoaLumberjack (~> 2.2.0)
     - NSObject-SafeExpectations (~> 0.0.2)
     - WordPressCom-Analytics-iOS (~> 0.1.0)
-  - WordPress-iOS-Shared (0.5.9):
+  - WordPress-iOS-Shared (0.8.0):
     - CocoaLumberjack (~> 2.2.0)
   - WordPressCom-Analytics-iOS (0.1.15)
 
 DEPENDENCIES:
   - CocoaLumberjack (~> 2.2.0)
   - WordPress-iOS-Editor (from `../`)
-  - WordPress-iOS-Shared (~> 0.5.0)
+  - WordPress-iOS-Shared (~> 0.8.0)
   - WordPressCom-Analytics-iOS (~> 0.1.0)
 
 EXTERNAL SOURCES:
@@ -30,9 +30,9 @@ SPEC CHECKSUMS:
   CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
   NSObject-SafeExpectations: 7d7f48df90df4e11da7cfe86b64f45eff7a7f521
   WordPress-iOS-Editor: 3118f5d6b142b6bf322f3393a7dd98a28bca68cb
-  WordPress-iOS-Shared: 50a7bd7056b8721e86c3cbe167eab49ef85ec07b
+  WordPress-iOS-Shared: 4d073fb8efa96f3c902d1e1ac2557bb720f416d7
   WordPressCom-Analytics-iOS: e1a7111255e98561c4b5a33ef4baa75a68e0d5d3
 
-PODFILE CHECKSUM: 33e0b5312e2d220c5a6e0e29251cbd5cd92f03e1
+PODFILE CHECKSUM: c5af8aa4a9723c2a470c04ad3589d2b2934feb38
 
 COCOAPODS: 1.1.1