Merge pull request #87 from matt-curtis/development

1.7.3
matt-curtis · Mar 1, 2016 · 4e46ba1 · 4e46ba1
2 parents f4f763f + e7c7ec2
commit 4e46ba1
Show file tree

Hide file tree

Showing 51 changed files with 40 additions and 31 deletions.
diff --git a/...tchConstraints.bundle/Contents/Info.plist → ...esources/Fluid.bundle/Contents/Info.plist b/...tchConstraints.bundle/Contents/Info.plist → ...esources/Fluid.bundle/Contents/Info.plist
@@ -3,21 +3,21 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14F1505</string>
+	<string>14F1605</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
-	<string>MCSketchConstraints</string>
+	<string>Fluid</string>
 	<key>CFBundleIdentifier</key>
-	<string>matt-curtis.MCSketchConstraints</string>
+	<string>matt-curtis.Fluid</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>MCSketchConstraints</string>
+	<string>Fluid</string>
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2</string>
+	<string>1.7.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -29,17 +29,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7C68</string>
+	<string>7C1002</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
 	<string>15C43</string>
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0720</string>
+	<string>0721</string>
 	<key>DTXcodeBuild</key>
-	<string>7C68</string>
+	<string>7C1002</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2015 Matt. All rights reserved.</string>
 </dict>

diff --git a/Fluid.sketchplugin/Contents/Resources/Fluid.bundle/Contents/MacOS/Fluid b/Fluid.sketchplugin/Contents/Resources/Fluid.bundle/Contents/MacOS/Fluid
diff --git a/...ints.bundle/Contents/Resources/Assets.car → ...luid.bundle/Contents/Resources/Assets.car b/...ints.bundle/Contents/Resources/Assets.car → ...luid.bundle/Contents/Resources/Assets.car
diff --git a/...ces/MCArtboardPreviewWindowController.nib → ...ces/MCArtboardPreviewWindowController.nib b/...ces/MCArtboardPreviewWindowController.nib → ...ces/MCArtboardPreviewWindowController.nib
diff --git a/...Resources/MCLayerConstraintsInspector.nib → ...Resources/MCLayerConstraintsInspector.nib b/...Resources/MCLayerConstraintsInspector.nib → ...Resources/MCLayerConstraintsInspector.nib
diff --git a/...undle/Contents/Resources/MCSActionBar.nib → ...undle/Contents/Resources/MCSActionBar.nib b/...undle/Contents/Resources/MCSActionBar.nib → ...undle/Contents/Resources/MCSActionBar.nib
diff --git a/.../Contents/Resources/MCSSettingsWindow.nib → .../Contents/Resources/MCSSettingsWindow.nib b/.../Contents/Resources/MCSSettingsWindow.nib → .../Contents/Resources/MCSSettingsWindow.nib
diff --git a/...tents/Resources/MCSizePresetsListView.nib → ...tents/Resources/MCSizePresetsListView.nib b/...tents/Resources/MCSizePresetsListView.nib → ...tents/Resources/MCSizePresetsListView.nib
diff --git a/...k.framework/Headers/MCSPluginController.h → ...k.framework/Headers/MCSPluginController.h b/...k.framework/Headers/MCSPluginController.h → ...k.framework/Headers/MCSPluginController.h
diff --git a/...ork/Versions/A/Headers/MCSPluginUpdater.h → ...work.framework/Headers/MCSPluginUpdater.h b/...ork/Versions/A/Headers/MCSPluginUpdater.h → ...work.framework/Headers/MCSPluginUpdater.h
@@ -13,6 +13,9 @@
 
 	@property (nonatomic) NSString *pluginIdentifier;
 
+	@property (nonatomic) NSString *pluginName;
+
+
 	- (BOOL) isNewerPluginBundleAvailableLocally:(NSString*)loadedVersion;
 
 	- (void) showUpdateRestartPrompt;

diff --git a/...framework/Headers/MCSPluginUserDefaults.h → ...framework/Headers/MCSPluginUserDefaults.h b/...framework/Headers/MCSPluginUserDefaults.h → ...framework/Headers/MCSPluginUserDefaults.h
diff --git a/...Headers/MCSPluginUserDefaultsController.h → ...Headers/MCSPluginUserDefaultsController.h b/...Headers/MCSPluginUserDefaultsController.h → ...Headers/MCSPluginUserDefaultsController.h
diff --git a/...amework/Headers/MCSketchPluginFramework.h → ...amework/Headers/MCSketchPluginFramework.h b/...amework/Headers/MCSketchPluginFramework.h → ...amework/Headers/MCSketchPluginFramework.h
diff --git a/...ramework.framework/Headers/MochaRuntime.h → ...ramework.framework/Headers/MochaRuntime.h b/...ramework.framework/Headers/MochaRuntime.h → ...ramework.framework/Headers/MochaRuntime.h
diff --git a/...mework/Versions/A/Headers/SketchRuntime.h → ...amework.framework/Headers/SketchRuntime.h b/...mework/Versions/A/Headers/SketchRuntime.h → ...amework.framework/Headers/SketchRuntime.h
@@ -240,7 +240,7 @@
 
 @interface MSExporter : NSObject
 
-	+ (instancetype) exporterForRequest:(MSExportRequest*)exportRequest colorSpace:(NSColorSpace*)colorSpace allowSubpixelAntialiasing:(BOOL)allowSubpixelAntialiasing;
+	+ (instancetype) exporterForRequest:(MSExportRequest*)exportRequest colorSpace:(NSColorSpace*)colorSpace;
 
 	- (NSData*) PNGData;
 

diff --git a/...inFramework.framework/Headers/Utilities.h → ...inFramework.framework/Headers/Utilities.h b/...inFramework.framework/Headers/Utilities.h → ...inFramework.framework/Headers/Utilities.h
diff --git a/...Fluid.bundle/Contents/Resources/MCSketchPluginFramework.framework/MCSketchPluginFramework b/...Fluid.bundle/Contents/Resources/MCSketchPluginFramework.framework/MCSketchPluginFramework
diff --git a/...mework.framework/Modules/module.modulemap → ...mework.framework/Modules/module.modulemap b/...mework.framework/Modules/module.modulemap → ...mework.framework/Modules/module.modulemap
diff --git a/...nFramework.framework/Resources/Info.plist → ...nFramework.framework/Resources/Info.plist b/...nFramework.framework/Resources/Info.plist → ...nFramework.framework/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14F1505</string>
+	<string>14F1605</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -29,17 +29,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7C68</string>
+	<string>7C1002</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
 	<string>15C43</string>
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0720</string>
+	<string>0721</string>
 	<key>DTXcodeBuild</key>
-	<string>7C68</string>
+	<string>7C1002</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2015 Matt. All rights reserved.</string>
 </dict>

diff --git a/...Resources/MCSPluginUpdatePromptWindow.nib → ...Resources/MCSPluginUpdatePromptWindow.nib b/...Resources/MCSPluginUpdatePromptWindow.nib → ...Resources/MCSPluginUpdatePromptWindow.nib
diff --git a/.../Versions/A/Headers/MCSPluginController.h → .../Versions/A/Headers/MCSPluginController.h b/.../Versions/A/Headers/MCSPluginController.h → .../Versions/A/Headers/MCSPluginController.h
diff --git a/...rsions/Current/Headers/MCSPluginUpdater.h → ...ork/Versions/A/Headers/MCSPluginUpdater.h b/...rsions/Current/Headers/MCSPluginUpdater.h → ...ork/Versions/A/Headers/MCSPluginUpdater.h
@@ -13,6 +13,9 @@
 
 	@property (nonatomic) NSString *pluginIdentifier;
 
+	@property (nonatomic) NSString *pluginName;
+
+
 	- (BOOL) isNewerPluginBundleAvailableLocally:(NSString*)loadedVersion;
 
 	- (void) showUpdateRestartPrompt;

diff --git a/...ersions/A/Headers/MCSPluginUserDefaults.h → ...ersions/A/Headers/MCSPluginUserDefaults.h b/...ersions/A/Headers/MCSPluginUserDefaults.h → ...ersions/A/Headers/MCSPluginUserDefaults.h
diff --git a/...Headers/MCSPluginUserDefaultsController.h → ...Headers/MCSPluginUserDefaultsController.h b/...Headers/MCSPluginUserDefaultsController.h → ...Headers/MCSPluginUserDefaultsController.h
diff --git a/...sions/A/Headers/MCSketchPluginFramework.h → ...sions/A/Headers/MCSketchPluginFramework.h b/...sions/A/Headers/MCSketchPluginFramework.h → ...sions/A/Headers/MCSketchPluginFramework.h
diff --git a/...amework/Versions/A/Headers/MochaRuntime.h → ...amework/Versions/A/Headers/MochaRuntime.h b/...amework/Versions/A/Headers/MochaRuntime.h → ...amework/Versions/A/Headers/MochaRuntime.h
diff --git a/.../Versions/Current/Headers/SketchRuntime.h → ...mework/Versions/A/Headers/SketchRuntime.h b/.../Versions/Current/Headers/SketchRuntime.h → ...mework/Versions/A/Headers/SketchRuntime.h
@@ -240,7 +240,7 @@
 
 @interface MSExporter : NSObject
 
-	+ (instancetype) exporterForRequest:(MSExportRequest*)exportRequest colorSpace:(NSColorSpace*)colorSpace allowSubpixelAntialiasing:(BOOL)allowSubpixelAntialiasing;
+	+ (instancetype) exporterForRequest:(MSExportRequest*)exportRequest colorSpace:(NSColorSpace*)colorSpace;
 
 	- (NSData*) PNGData;
 

diff --git a/....framework/Versions/A/Headers/Utilities.h → ....framework/Versions/A/Headers/Utilities.h b/....framework/Versions/A/Headers/Utilities.h → ....framework/Versions/A/Headers/Utilities.h
diff --git a/...e/Contents/Resources/MCSketchPluginFramework.framework/Versions/A/MCSketchPluginFramework b/...e/Contents/Resources/MCSketchPluginFramework.framework/Versions/A/MCSketchPluginFramework
diff --git a/...ework/Versions/A/Modules/module.modulemap → ...ework/Versions/A/Modules/module.modulemap b/...ework/Versions/A/Modules/module.modulemap → ...ework/Versions/A/Modules/module.modulemap
diff --git a/...framework/Versions/A/Resources/Info.plist → ...framework/Versions/A/Resources/Info.plist b/...framework/Versions/A/Resources/Info.plist → ...framework/Versions/A/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14F1505</string>
+	<string>14F1605</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -29,17 +29,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7C68</string>
+	<string>7C1002</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
 	<string>15C43</string>
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0720</string>
+	<string>0721</string>
 	<key>DTXcodeBuild</key>
-	<string>7C68</string>
+	<string>7C1002</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2015 Matt. All rights reserved.</string>
 </dict>

diff --git a/...Resources/MCSPluginUpdatePromptWindow.nib → ...Resources/MCSPluginUpdatePromptWindow.nib b/...Resources/MCSPluginUpdatePromptWindow.nib → ...Resources/MCSPluginUpdatePromptWindow.nib
diff --git a/...ons/Current/Headers/MCSPluginController.h → ...ons/Current/Headers/MCSPluginController.h b/...ons/Current/Headers/MCSPluginController.h → ...ons/Current/Headers/MCSPluginController.h
diff --git a/...work.framework/Headers/MCSPluginUpdater.h → ...rsions/Current/Headers/MCSPluginUpdater.h b/...work.framework/Headers/MCSPluginUpdater.h → ...rsions/Current/Headers/MCSPluginUpdater.h
@@ -13,6 +13,9 @@
 
 	@property (nonatomic) NSString *pluginIdentifier;
 
+	@property (nonatomic) NSString *pluginName;
+
+
 	- (BOOL) isNewerPluginBundleAvailableLocally:(NSString*)loadedVersion;
 
 	- (void) showUpdateRestartPrompt;

diff --git a/...s/Current/Headers/MCSPluginUserDefaults.h → ...s/Current/Headers/MCSPluginUserDefaults.h b/...s/Current/Headers/MCSPluginUserDefaults.h → ...s/Current/Headers/MCSPluginUserDefaults.h
diff --git a/...Headers/MCSPluginUserDefaultsController.h → ...Headers/MCSPluginUserDefaultsController.h b/...Headers/MCSPluginUserDefaultsController.h → ...Headers/MCSPluginUserDefaultsController.h
diff --git a/...Current/Headers/MCSketchPluginFramework.h → ...Current/Headers/MCSketchPluginFramework.h b/...Current/Headers/MCSketchPluginFramework.h → ...Current/Headers/MCSketchPluginFramework.h
diff --git a/...k/Versions/Current/Headers/MochaRuntime.h → ...k/Versions/Current/Headers/MochaRuntime.h b/...k/Versions/Current/Headers/MochaRuntime.h → ...k/Versions/Current/Headers/MochaRuntime.h
diff --git a/...amework.framework/Headers/SketchRuntime.h → .../Versions/Current/Headers/SketchRuntime.h b/...amework.framework/Headers/SketchRuntime.h → .../Versions/Current/Headers/SketchRuntime.h
@@ -240,7 +240,7 @@
 
 @interface MSExporter : NSObject
 
-	+ (instancetype) exporterForRequest:(MSExportRequest*)exportRequest colorSpace:(NSColorSpace*)colorSpace allowSubpixelAntialiasing:(BOOL)allowSubpixelAntialiasing;
+	+ (instancetype) exporterForRequest:(MSExportRequest*)exportRequest colorSpace:(NSColorSpace*)colorSpace;
 
 	- (NSData*) PNGData;
 

diff --git a/...work/Versions/Current/Headers/Utilities.h → ...work/Versions/Current/Headers/Utilities.h b/...work/Versions/Current/Headers/Utilities.h → ...work/Versions/Current/Headers/Utilities.h
diff --git a/...ents/Resources/MCSketchPluginFramework.framework/Versions/Current/MCSketchPluginFramework b/...ents/Resources/MCSketchPluginFramework.framework/Versions/Current/MCSketchPluginFramework
diff --git a/...Versions/Current/Modules/module.modulemap → ...Versions/Current/Modules/module.modulemap b/...Versions/Current/Modules/module.modulemap → ...Versions/Current/Modules/module.modulemap
diff --git a/...ork/Versions/Current/Resources/Info.plist → ...ork/Versions/Current/Resources/Info.plist b/...ork/Versions/Current/Resources/Info.plist → ...ork/Versions/Current/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14F1505</string>
+	<string>14F1605</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -29,17 +29,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7C68</string>
+	<string>7C1002</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
 	<string>15C43</string>
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0720</string>
+	<string>0721</string>
 	<key>DTXcodeBuild</key>
-	<string>7C68</string>
+	<string>7C1002</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2015 Matt. All rights reserved.</string>
 </dict>

diff --git a/...Resources/MCSPluginUpdatePromptWindow.nib → ...Resources/MCSPluginUpdatePromptWindow.nib b/...Resources/MCSPluginUpdatePromptWindow.nib → ...Resources/MCSPluginUpdatePromptWindow.nib
diff --git a/...chplugin/Contents/Resources/MCSketchConstraints.bundle/Contents/MacOS/MCSketchConstraints b/...chplugin/Contents/Resources/MCSketchConstraints.bundle/Contents/MacOS/MCSketchConstraints
diff --git a/...aints.bundle/Contents/Resources/MCSketchPluginFramework.framework/MCSketchPluginFramework b/...aints.bundle/Contents/Resources/MCSketchPluginFramework.framework/MCSketchPluginFramework
diff --git a/...e/Contents/Resources/MCSketchPluginFramework.framework/Versions/A/MCSketchPluginFramework b/...e/Contents/Resources/MCSketchPluginFramework.framework/Versions/A/MCSketchPluginFramework
diff --git a/...ents/Resources/MCSketchPluginFramework.framework/Versions/Current/MCSketchPluginFramework b/...ents/Resources/MCSketchPluginFramework.framework/Versions/Current/MCSketchPluginFramework
diff --git a/Fluid.sketchplugin/Contents/Sketch/main.js b/Fluid.sketchplugin/Contents/Sketch/main.js
@@ -3,10 +3,10 @@
 //	Load Bundle
 
 if($.runtime.classExists("MCFluidPluginController") == false){
-	$.runtime.loadBundle($.paths.resourcesPath+"/MCSketchConstraints.bundle");
+	$.runtime.loadBundle($.paths.resourcesPath+"/Fluid.bundle");
 
 	/*
-		Note to self and whoever else reads these (say hi on twitter :) special word: efficacy):
+		Note to self and whoever else reads these (say hi on twitter :) special word: loneliness):
 		A more robust method for detecting/identifying the existing plugin in the runtime is needed...
 	*/
 }

diff --git a/Fluid.sketchplugin/Contents/Sketch/manifest.json b/Fluid.sketchplugin/Contents/Sketch/manifest.json
@@ -3,7 +3,7 @@
 	"description": "Auto Layout-like constraints in Sketch",
 	"author": "Matt Curtis",
 	"homepage": "https://github.com/matt-curtis/Fluid-for-Sketch",
-	"version": "1.7.2",
+	"version": "1.7.3",
 
 	"identifier": "com.matt-curtis.sketch.constraints",
 	"updateURL": "https://raw.githubusercontent.com/matt-curtis/Fluid-for-Sketch/master/Fluid.sketchplugin/Contents/Sketch/manifest.json",

diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
-# :droplet: Fluid for Sketch 1.7.2
+# :droplet: Fluid for Sketch 1.7.3
 
 > *A collaborative project brought to you by [Matt Curtis](https://twitter.com/matt_sven) & [Cat Noone](https://twitter.com/imcatnoone)*
 
 Fluid is a Sketch plugin that provides a means to create more constraint-based, responsive designs. It is based on Auto Layout constraints.
 
-:package: [Download Plugin (.zip)](https://github.com/matt-curtis/Fluid-for-Sketch/releases/download/v1.7.2/Fluid.sketchplugin.zip) | :star: [Changelog](https://github.com/matt-curtis/Fluid-for-Sketch/releases) | :arrow_down: [Download the Demo Sketch Document](https://github.com/matt-curtis/Fluid-for-Sketch/raw/master/Constraint%20Demos.sketch)
+:package: [Download Plugin (.zip)](https://github.com/matt-curtis/Fluid-for-Sketch/releases/download/v1.7.3/Fluid.sketchplugin.zip) | :star: [Changelog](https://github.com/matt-curtis/Fluid-for-Sketch/releases) | :arrow_down: [Download the Demo Sketch Document](https://github.com/matt-curtis/Fluid-for-Sketch/raw/master/Constraint%20Demos.sketch)
 --- | --- | ---
 
 --