Merge pull request #44 from armadsen/1.7.0

Merge 1.7.0 branch into master for 1.7.0 release.
armadsen · Mar 15, 2015 · b69e9a8 · b69e9a8
2 parents 7d579a5 + b4ba9a0
commit b69e9a8
Show file tree

Hide file tree

Showing 35 changed files with 3,388 additions and 169 deletions.
diff --git a/.cocoadocs.yml b/.cocoadocs.yml
@@ -0,0 +1,17 @@
+highlight-font: '"GT Walsheim", "gt_walsheim_regular", "Avant Garde Gothic ITCW01Dm", "Avant Garde", "Helvetica Neue", "Arial" '
+body: '"Helvetica Neue", "Arial", san-serif'
+code: '"Monaco", "Menlo", "Consolas", "Courier New", monospace'
+
+highlight-color: "#19C2A5"
+highlight-dark-color: "#16AB91"
+darker-color: "#0E705F"
+darker-dark-color: "#09453A"
+background-color: "#9B9B9B"
+alt-link-color: "#B094B7"
+warning-color: "#B80E3D"
+
+additional_guides:
+    - https://github.com/armadsen/ORSSerialPort/wiki/Installing-ORSSerialPort
+    - https://github.com/armadsen/ORSSerialPort/wiki/Getting-Started
+    - https://github.com/armadsen/ORSSerialPort/wiki/Request-Response-API
+    - https://github.com/armadsen/ORSSerialPort/wiki/System-Requirements
diff --git a/Examples/CocoaDemo/ORSSerialPortCocoaDemo.xcodeproj/project.pbxproj b/Examples/CocoaDemo/ORSSerialPortCocoaDemo.xcodeproj/project.pbxproj
@@ -17,6 +17,18 @@
 		9D66D83D159BCC6400EE6D09 /* ORSSerialPortDemoController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D66D83C159BCC6400EE6D09 /* ORSSerialPortDemoController.m */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		9D3FF0EA1AB09AA100E9B6F9 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		9D66D80E159BCAB800EE6D09 /* ORSSerialPortCocoaDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ORSSerialPortCocoaDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		9D66D81A159BCAB800EE6D09 /* ORSSerialPortCocoaDemo-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ORSSerialPortCocoaDemo-Info.plist"; sourceTree = "<group>"; };
@@ -116,6 +128,7 @@
 			buildPhases = (
 				9D66D80A159BCAB800EE6D09 /* Sources */,
 				9D66D80C159BCAB800EE6D09 /* Resources */,
+				9D3FF0EA1AB09AA100E9B6F9 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -133,7 +146,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = ORS;
-				LastUpgradeCheck = 0450;
+				LastUpgradeCheck = 0610;
 				ORGANIZATIONNAME = "Open Reel Software";
 			};
 			buildConfigurationList = 9D66D808159BCAB800EE6D09 /* Build configuration list for PBXProject "ORSSerialPortCocoaDemo" */;
@@ -213,7 +226,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_ENABLE_MODULES = YES;
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -230,7 +242,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 			};
@@ -240,7 +252,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_ENABLE_MODULES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -251,7 +262,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				SDKROOT = macosx;
 			};
 			name = Release;
@@ -260,10 +271,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = YES;
+				COMBINE_HIDPI_IMAGES = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Sources/ORSSerialPortCocoaDemo-Prefix.pch";
 				INFOPLIST_FILE = "Resources/ORSSerialPortCocoaDemo-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PRODUCT_NAME = ORSSerialPortCocoaDemo;
 				WRAPPER_EXTENSION = app;
 			};
@@ -273,10 +284,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = YES;
+				COMBINE_HIDPI_IMAGES = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Sources/ORSSerialPortCocoaDemo-Prefix.pch";
 				INFOPLIST_FILE = "Resources/ORSSerialPortCocoaDemo-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PRODUCT_NAME = ORSSerialPortCocoaDemo;
 				WRAPPER_EXTENSION = app;
 			};

diff --git a/Examples/CocoaDemo/Resources/en.lproj/MainMenu.xib b/Examples/CocoaDemo/Resources/en.lproj/MainMenu.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6254" systemVersion="14C109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7519.1" systemVersion="14C109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment version="1060" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7519.1"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -956,7 +956,7 @@
                         </textFieldCell>
                     </textField>
                     <button id="654">
-                        <rect key="frame" x="178" y="466" width="77" height="18"/>
+                        <rect key="frame" x="178" y="466" width="80" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="RTS/CTS" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="663">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>

diff --git a/Examples/CocoaDemo/Sources/ORSAppDelegate.m b/Examples/CocoaDemo/Sources/ORSAppDelegate.m
@@ -30,10 +30,4 @@
 
 @implementation ORSAppDelegate
 
-- (void)applicationWillTerminate:(NSNotification *)notification
-{
-	NSArray *ports = [[ORSSerialPortManager sharedSerialPortManager] availablePorts];
-	for (ORSSerialPort *port in ports) { [port close]; } 
-}
-
 @end
diff --git a/Examples/ORSSerialPortSwiftDemo/Sources/AppDelegate.swift b/Examples/ORSSerialPortSwiftDemo/Sources/AppDelegate.swift
@@ -12,17 +12,5 @@ import Cocoa
 class AppDelegate: NSObject, NSApplicationDelegate {
 
 	@IBOutlet weak var window: NSWindow!
-
-
-	func applicationDidFinishLaunching(aNotification: NSNotification) {
-		// Insert code here to initialize your application
-	}
-
-	func applicationWillTerminate(aNotification: NSNotification) {
-		let ports = ORSSerialPortManager.sharedSerialPortManager().availablePorts as [ORSSerialPort]
-		for port in ports { port.close() }
-	}
-
-
 }