Merge branch 'release-1.1.1'

Cocoanetics · Oct 1, 2014 · 6654086 · 6654086
2 parents 9b038cf + 7999c04
commit 6654086
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 17 deletions.
diff --git a/Core/Source/DTBonjourDataConnection.h b/Core/Source/DTBonjourDataConnection.h
@@ -26,7 +26,7 @@ typedef NS_ENUM(NSUInteger, DTBonjourDataConnectionContentType)
 };
 
 extern NSString * DTBonjourDataConnectionErrorDomain;
-extern CGFloat DTBonjourDataConnectionDefaultTimeout;
+extern NSTimeInterval DTBonjourDataConnectionDefaultTimeout;
 
 @class DTBonjourDataConnection, DTBonjourDataChunk;
 
@@ -154,7 +154,7 @@ extern CGFloat DTBonjourDataConnectionDefaultTimeout;
  @param timeout Timeout in seconds after which to cancel the stream opening.
  @returns `YES` if the connection could be established.
  */
-- (BOOL)openWithTimeout:(CGFloat)timeout;
+- (BOOL)openWithTimeout:(NSTimeInterval)timeout;
 
 /**
  Closes the connection

diff --git a/Core/Source/DTBonjourDataConnection.m b/Core/Source/DTBonjourDataConnection.m
@@ -14,7 +14,7 @@
 
 #define kDTBonjourQNetworkAdditionsCheckSEL NSSelectorFromString(@"netService:didAcceptConnectionWithInputStream:outputStream:")
 
-CGFloat DTBonjourDataConnectionDefaultTimeout = 60.0;
+NSTimeInterval DTBonjourDataConnectionDefaultTimeout = 60.0;
 NSString * DTBonjourDataConnectionErrorDomain = @"DTBonjourDataConnection";
 
 @interface NSNetService (QNetworkAdditions)
@@ -171,7 +171,7 @@ - (id)initWithService:(NSNetService *)service
       // streams see the `QNetworkAdditions` above. (If the delegate does not
       // implement the `kDTBonjourQNetworkAdditionsCheck` selector, we can
       // simply use the patched version.
-      if ([service qNetworkAdditions_getInputStream:&in outputStream:&out])
+      if (![service qNetworkAdditions_getInputStream:&in outputStream:&out])
         return nil;
     }
     else
@@ -209,12 +209,12 @@ - (void)dealloc
 	[self close];
 }
 
-- (BOOL)openWithTimeout:(CGFloat)timeout
+- (BOOL)openWithTimeout:(NSTimeInterval)timeout
 {
 	[_inputStream  setDelegate:self];
 	[_outputStream setDelegate:self];
-	[_inputStream  scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];
-	[_outputStream scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];
+	[_inputStream  scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
+	[_outputStream scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
 	[_inputStream  open];
 	[_outputStream open];
 
@@ -247,8 +247,8 @@ - (void)close
 	[_outputStream setDelegate:nil];
 	[_inputStream  close];
 	[_outputStream close];
-	[_inputStream  removeFromRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];
-	[_outputStream removeFromRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];
+	[_inputStream  removeFromRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
+	[_outputStream removeFromRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
 	_inputStream = nil;
 	_outputStream = nil;
 

diff --git a/DTBonjour.podspec b/DTBonjour.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = 'DTBonjour'
-  spec.version      = '1.1.0'
+  spec.version      = '1.1.1'
   spec.summary      = "Client/Server Communication of NSObjects over WiFi."
   spec.homepage     = "https://github.com/Cocoanetics/DTBonjour"
   spec.author       = { "Oliver Drobnik" => "[email protected]" }

diff --git a/DTBonjour.xcodeproj/project.pbxproj b/DTBonjour.xcodeproj/project.pbxproj
@@ -195,7 +195,7 @@
 		A719021116A7F5E300C1EC52 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0500;
+				LastUpgradeCheck = 0510;
 				ORGANIZATIONNAME = "Drobnik KG";
 			};
 			buildConfigurationList = A719021416A7F5E300C1EC52 /* Build configuration list for PBXProject "DTBonjour" */;
@@ -330,7 +330,6 @@
 		A719022816A7F5E300C1EC52 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				DSTROOT = /tmp/DTBonjour.dst;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Core/DTBonjour-Prefix.pch";
@@ -341,7 +340,6 @@
 		A719022916A7F5E300C1EC52 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				DSTROOT = /tmp/DTBonjour.dst;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Core/DTBonjour-Prefix.pch";
@@ -352,7 +350,6 @@
 		A719029416A7F93000C1EC52 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -367,7 +364,6 @@
 		A719029516A7F93000C1EC52 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;

diff --git a/DTBonjour.xcodeproj/xcshareddata/xcschemes/DTBonjour (OS X).xcscheme b/DTBonjour.xcodeproj/xcshareddata/xcschemes/DTBonjour (OS X).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0460"
+   LastUpgradeVersion = "0510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DTBonjour.xcodeproj/xcshareddata/xcschemes/DTBonjour (iOS).xcscheme b/DTBonjour.xcodeproj/xcshareddata/xcschemes/DTBonjour (iOS).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0460"
+   LastUpgradeVersion = "0510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Documentation/Change Log-template.markdown b/Documentation/Change Log-template.markdown
@@ -3,6 +3,12 @@ Change Log
 
 This is the history of version updates.
 
+**Version 1.1.1**
+
+- FIXED: Various Xcode warnings
+- FIXED: Issue when initializing on older iOS (<7.0) or OSX (<10.9) version
+- CHANGED: run loop scheduling to common modes
+
 **Version 1.1.0**
 
 - FIXED: Various type warnings