Fixes for warnings. Updated version.

wiaio · May 19, 2016 · 700d398 · 700d398
1 parent 50b9f3a
commit 700d398
Show file tree

Hide file tree

Showing 8 changed files with 111 additions and 12 deletions.
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Wia.xcodeproj/project.pbxproj b/Example/Wia.xcodeproj/project.pbxproj
@@ -446,7 +446,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -488,7 +488,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -560,7 +560,7 @@
 			baseConfigurationReference = ADC72658881EFCAD6D2D51F6 /* Pods-Wia_Example-Wia_Tests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch";
@@ -582,7 +582,7 @@
 			baseConfigurationReference = 431285D55A34F726E60C4683 /* Pods-Wia_Example-Wia_Tests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch";

diff --git a/Wia.podspec b/Wia.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "Wia"
-  s.version          = "0.2.0"
+  s.version          = "0.2.1"
   s.summary          = "Client SDK for Wia. A real-time API for the Internet of Things."
 
   s.description      = "Client SDK for Wia to allow users to build applications around the platform. We provide a real-time API for the Internet of Things."

diff --git a/Wia/WiaClient.h b/Wia/WiaClient.h
@@ -6,8 +6,6 @@
 //
 //
 
-#import <Foundation/Foundation.h>
-#import "MQTTClient.h"
 #import "WiaClient.h"
 #import "WiaDevice.h"
 #import "WiaEvent.h"
@@ -19,6 +17,7 @@
 #import "WiaDeviceApiKeys.h"
 #import "WiaFunction.h"
 #import "WiaSensor.h"
+@import MQTTClient;
 
 @protocol WiaClientDelegate <NSObject>
 

diff --git a/Wia/WiaClient.m b/Wia/WiaClient.m
@@ -840,13 +840,13 @@ - (void)unsubAckReceived:(MQTTSession *)session msgID:(UInt16)msgID {
     WiaLogger(@"unsubAckReceived.");
 }
 
-- (void)sending:(MQTTSession *)session type:(int)type qos:(MQTTQosLevel)qos retained:(BOOL)retained duped:(BOOL)duped mid:(UInt16)mid data:(NSData *)data {
+-(void)sending:(MQTTSession *)session type:(MQTTCommandType)type qos:(MQTTQosLevel)qos retained:(BOOL)retained duped:(BOOL)duped mid:(UInt16)mid data:(NSData *)data {
     WiaLogger(@"sending.");
     if (data)
         WiaLogger(@"sending data: %@", [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]);
 }
 
-- (void)received:(MQTTSession *)session type:(int)type qos:(MQTTQosLevel)qos retained:(BOOL)retained duped:(BOOL)duped mid:(UInt16)mid data:(NSData *)data {
+-(void)received:(MQTTSession *)session type:(MQTTCommandType)type qos:(MQTTQosLevel)qos retained:(BOOL)retained duped:(BOOL)duped mid:(UInt16)mid data:(NSData *)data {
     WiaLogger(@"received.");
     if (data)
         WiaLogger(@"received data: %@", [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]);

diff --git a/Wia/WiaEvent.m b/Wia/WiaEvent.m
@@ -32,7 +32,7 @@ - (instancetype)initWithDictionary:(NSDictionary *)dict {
 
 - (id)copyWithZone:(NSZone *)zone
 {
-    id copy = [[[self class] alloc] init];
+    WiaEvent *copy = [[[self class] alloc] init];
 
     if (copy) {
         [copy setId:self.id];

diff --git a/Wia/WiaLog.m b/Wia/WiaLog.m
@@ -28,7 +28,7 @@ - (instancetype)initWithDictionary:(NSDictionary *)dict {
 
 - (id)copyWithZone:(NSZone *)zone
 {
-    id copy = [[[self class] alloc] init];
+    WiaLog *copy = [[[self class] alloc] init];
 
     if (copy) {
         [copy setId:self.id];

diff --git a/Wia/WiaSensor.m b/Wia/WiaSensor.m
@@ -29,7 +29,7 @@ - (instancetype)initWithDictionary:(NSDictionary *)dict {
 
 - (id)copyWithZone:(NSZone *)zone
 {
-    id copy = [[[self class] alloc] init];
+    WiaSensor *copy = [[[self class] alloc] init];
 
     if (copy) {
         [copy setId:self.id];