Merge pull request #158 from MForever78/master

Fixes to catch Sketch API change and workaround CocoaScript bug

README.md

@@ -6,6 +6,9 @@ Marketch is a Sketch 3 plug-in for automatically generating html page that can m
 
 ## Change Log 
 
+#### `v1.0.23 fix`
+* [fix] support sketch 46.2 and macOS 10.13
+
 #### `v1.0.22 fix`
 * [fix] multiple line text only show the first.
 

marketch.sketchplugin/Contents/Sketch/util.cocoascript

@@ -303,7 +303,7 @@ var util = {
 
     [zipTask setLaunchPath:@'/usr/bin/ditto'];
     //zip参数
-    [zipTask setArguments:[NSArray arrayWithObjects: @'-c', @'-k', @'-X', @'--rsrc', zipFile, destination, nil]];
+    [zipTask setArguments:[NSArray arrayWithArray:['-c', '-k', '-X', '--rsrc', zipFile, destination]]];
 
     [zipTask launch];
     [zipTask waitUntilExit];
@@ -422,7 +422,7 @@ var util = {
 
       //修正文字图层设置填充后颜色不正确的问题
       if(fontStyle.hasEnabledFill()){
-        var fillColor = layer.style().fill().CSSAttributeString().split(':');
+        var fillColor = layer.style().fills()[0].CSSAttributeString().split(':');
         if(fillColor.length > 1){
           layerData.style.color = util.trim(fillColor[1]);
         }

marketch.sketchplugin/Contents/Sketch/zip.cocoascript

@@ -53,7 +53,7 @@ ExportAsZip.prototype = {
             //task执行成功
             doc.showMessage(I18N.EXPORTSUCCESS);
             var zipURL = [NSURL fileURLWithPath: exportPath];
-            var fileURLs = [NSArray arrayWithObjects:zipURL, nil];
+            var fileURLs = [NSArray arrayWithArray:[zipURL]];
             [[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:fileURLs];
           }else{
             doc.showMessage(I18N.EXPORTFAIL);

package.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.22"
+  "version": "1.0.23"
 }