diff --git a/CHANGELOG.md b/CHANGELOG.md index a9feb5f8..2d3ba330 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ MQTT-Client-Framework iOS/OSX/tvOS Release Notes ================================================ +## MQTT-Client-Framework 0.6.5 +> Release date 2016-01-21 + +[FIX] turn off verbose logging by default closes #97 +[FIX] MQTTFramework.h includes all necessary files now #62 + ## MQTT-Client-Framework 0.6.4 > Release date 2016-01-17 diff --git a/MQTTClient.podspec b/MQTTClient.podspec index 95235600..102e4da3 100644 --- a/MQTTClient.podspec +++ b/MQTTClient.podspec @@ -1,13 +1,13 @@ Pod::Spec.new do |mqttc| mqttc.name = "MQTTClient" - mqttc.version = "0.6.4" + mqttc.version = "0.6.5" mqttc.summary = "iOS, OSX and tvOS native ObjectiveC MQTT Client Framework" mqttc.homepage = "https://github.com/ckrey/MQTT-Client-Framework" mqttc.license = { :type => "EPLv1", :file => "LICENSE" } mqttc.author = { "Christoph Krey" => "krey.christoph@gmail.com" } mqttc.source = { :git => "https://github.com/ckrey/MQTT-Client-Framework.git", - :tag => "0.6.4", + :tag => "0.6.5", :submodules => true } diff --git a/MQTTClient/MQTTClient.xcodeproj/project.pbxproj b/MQTTClient/MQTTClient.xcodeproj/project.pbxproj index f333e837..9d6180f9 100644 --- a/MQTTClient/MQTTClient.xcodeproj/project.pbxproj +++ b/MQTTClient/MQTTClient.xcodeproj/project.pbxproj @@ -22,6 +22,8 @@ /* Begin PBXBuildFile section */ 1F838A529097FBBD2C31D8B5 /* libPods-MQTTClientTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7A7CCD16D485D0855A2E6999 /* libPods-MQTTClientTests.a */; }; + 840487611C51212700569C79 /* MQTTFrameworkTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 840487601C51212700569C79 /* MQTTFrameworkTests.m */; }; + 840487631C51212700569C79 /* MQTTFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE9EF5C51C0628B1009EF667 /* MQTTFramework.framework */; }; 840507C5193DCF2E002EBBD2 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 840507C4193DCF2E002EBBD2 /* UIKit.framework */; }; 840715FA1BBE999700FBB3CB /* mosquitto.org.cer in Resources */ = {isa = PBXBuildFile; fileRef = 8482D3C91B49332700D81CC8 /* mosquitto.org.cer */; }; 840715FC1BBE999700FBB3CB /* KreyChristoph.p12 in Resources */ = {isa = PBXBuildFile; fileRef = 8482D3C31B49110200D81CC8 /* KreyChristoph.p12 */; }; @@ -115,21 +117,21 @@ 841D0A921C35880B006A82DC /* MQTTSSLSecurityPolicyTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A7F1C35876E006A82DC /* MQTTSSLSecurityPolicyTransport.h */; settings = {ATTRIBUTES = (Public, ); }; }; 841D0A931C358818006A82DC /* MQTTSSLSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A791C35876E006A82DC /* MQTTSSLSecurityPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; }; 841D0A941C358819006A82DC /* MQTTSSLSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A791C35876E006A82DC /* MQTTSSLSecurityPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 841D0A951C35881A006A82DC /* MQTTSSLSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A791C35876E006A82DC /* MQTTSSLSecurityPolicy.h */; }; + 841D0A951C35881A006A82DC /* MQTTSSLSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A791C35876E006A82DC /* MQTTSSLSecurityPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; }; 841D0A961C35881D006A82DC /* MQTTSSLSecurityPolicyDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A7B1C35876E006A82DC /* MQTTSSLSecurityPolicyDecoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; 841D0A971C35881E006A82DC /* MQTTSSLSecurityPolicyDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A7B1C35876E006A82DC /* MQTTSSLSecurityPolicyDecoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 841D0A981C35881F006A82DC /* MQTTSSLSecurityPolicyDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A7B1C35876E006A82DC /* MQTTSSLSecurityPolicyDecoder.h */; }; + 841D0A981C35881F006A82DC /* MQTTSSLSecurityPolicyDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A7B1C35876E006A82DC /* MQTTSSLSecurityPolicyDecoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; 841D0A991C358821006A82DC /* MQTTSSLSecurityPolicyEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A7D1C35876E006A82DC /* MQTTSSLSecurityPolicyEncoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; 841D0A9A1C358822006A82DC /* MQTTSSLSecurityPolicyEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A7D1C35876E006A82DC /* MQTTSSLSecurityPolicyEncoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 841D0A9B1C358823006A82DC /* MQTTSSLSecurityPolicyEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A7D1C35876E006A82DC /* MQTTSSLSecurityPolicyEncoder.h */; }; - 841D0A9C1C358826006A82DC /* MQTTSSLSecurityPolicyTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A7F1C35876E006A82DC /* MQTTSSLSecurityPolicyTransport.h */; }; - 841D0A9D1C358829006A82DC /* MQTTWebsocketTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 84B633BC1C176ECA0024CE2E /* MQTTWebsocketTransport.h */; }; + 841D0A9B1C358823006A82DC /* MQTTSSLSecurityPolicyEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A7D1C35876E006A82DC /* MQTTSSLSecurityPolicyEncoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 841D0A9C1C358826006A82DC /* MQTTSSLSecurityPolicyTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A7F1C35876E006A82DC /* MQTTSSLSecurityPolicyTransport.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 841D0A9D1C358829006A82DC /* MQTTWebsocketTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 84B633BC1C176ECA0024CE2E /* MQTTWebsocketTransport.h */; settings = {ATTRIBUTES = (Public, ); }; }; 841D0A9E1C35883E006A82DC /* MQTTCoreDataPersistence.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A891C358785006A82DC /* MQTTCoreDataPersistence.h */; settings = {ATTRIBUTES = (Public, ); }; }; 841D0A9F1C35883F006A82DC /* MQTTCoreDataPersistence.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A891C358785006A82DC /* MQTTCoreDataPersistence.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 841D0AA01C35883F006A82DC /* MQTTCoreDataPersistence.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A891C358785006A82DC /* MQTTCoreDataPersistence.h */; }; + 841D0AA01C35883F006A82DC /* MQTTCoreDataPersistence.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A891C358785006A82DC /* MQTTCoreDataPersistence.h */; settings = {ATTRIBUTES = (Public, ); }; }; 841D0AA11C358842006A82DC /* MQTTInMemoryPersistence.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A8D1C358793006A82DC /* MQTTInMemoryPersistence.h */; settings = {ATTRIBUTES = (Public, ); }; }; 841D0AA21C358843006A82DC /* MQTTInMemoryPersistence.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A8D1C358793006A82DC /* MQTTInMemoryPersistence.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 841D0AA31C358843006A82DC /* MQTTInMemoryPersistence.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A8D1C358793006A82DC /* MQTTInMemoryPersistence.h */; }; + 841D0AA31C358843006A82DC /* MQTTInMemoryPersistence.h in Headers */ = {isa = PBXBuildFile; fileRef = 841D0A8D1C358793006A82DC /* MQTTInMemoryPersistence.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8425D70D1BBE8D68005AD733 /* MQTTSSLSecurityPolicyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C21D3C701B1EBD730012DD2F /* MQTTSSLSecurityPolicyTests.m */; }; 8425D70E1BBE8D68005AD733 /* MQTTClientSubscriptionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C21D3C6E1B1EBB0E0012DD2F /* MQTTClientSubscriptionTests.m */; }; 8425D70F1BBE8D68005AD733 /* MQTTClientTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 846191491883E56800101409 /* MQTTClientTests.m */; }; @@ -146,17 +148,17 @@ 8439D5831C2EB3F000C24F4D /* MQTTSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 846191EB1883E8B900101409 /* MQTTSession.m */; }; 8442BEE91A97B15100D00E55 /* SwiftTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8442BEE81A97B15100D00E55 /* SwiftTests.swift */; }; 844C93AB1A81645D00CA4A03 /* MQTTACLTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 844C93AA1A81645D00CA4A03 /* MQTTACLTests.m */; }; - 84517CF01C17904D006FE09B /* MQTTClient-Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 846191311883E56800101409 /* MQTTClient-Prefix.pch */; }; + 84517CF01C17904D006FE09B /* MQTTClient-Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 846191311883E56800101409 /* MQTTClient-Prefix.pch */; settings = {ATTRIBUTES = (Public, ); }; }; 84517CF41C182F06006FE09B /* MQTTTestHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 84517CF31C182F06006FE09B /* MQTTTestHelpers.m */; }; 84517CF51C182F06006FE09B /* MQTTTestHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 84517CF31C182F06006FE09B /* MQTTTestHelpers.m */; }; 84517CF61C182F06006FE09B /* MQTTTestHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 84517CF31C182F06006FE09B /* MQTTTestHelpers.m */; }; 845922A21C175AA400CCE27E /* MQTTTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 84B6A18F1C14E1BB00618573 /* MQTTTransport.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 845922A51C175AA400CCE27E /* MQTTCFSocketEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 846191FD1883E8FD00101409 /* MQTTCFSocketEncoder.h */; }; - 845922A61C175AA400CCE27E /* MQTTCFSocketDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 84B6A1971C15C2F600618573 /* MQTTCFSocketDecoder.h */; }; + 845922A51C175AA400CCE27E /* MQTTCFSocketEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 846191FD1883E8FD00101409 /* MQTTCFSocketEncoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 845922A61C175AA400CCE27E /* MQTTCFSocketDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 84B6A1971C15C2F600618573 /* MQTTCFSocketDecoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; 845922A71C175AA400CCE27E /* MQTTCFSocketDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 84B6A1981C15C2F700618573 /* MQTTCFSocketDecoder.m */; }; 845922A81C175AA400CCE27E /* MQTTCFSocketTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = 84B6A1931C14E7E700618573 /* MQTTCFSocketTransport.h */; settings = {ATTRIBUTES = (Public, ); }; }; 845922A91C175AA400CCE27E /* MQTTCFSocketTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = 84B6A1941C14E7E700618573 /* MQTTCFSocketTransport.m */; }; - 845922AB1C175AAB00CCE27E /* MQTTClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 846191321883E56800101409 /* MQTTClient.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 845922AB1C175AAB00CCE27E /* MQTTClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 846191321883E56800101409 /* MQTTClient.h */; }; 8461913C1883E56800101409 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8461913B1883E56800101409 /* XCTest.framework */; }; 8461913D1883E56800101409 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8461912D1883E56800101409 /* Foundation.framework */; }; 846191481883E56800101409 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 846191461883E56800101409 /* InfoPlist.strings */; }; @@ -216,6 +218,16 @@ F15DABEB90D746034947DA38 /* libPods-MQTTClientTVTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5796BDC723CE945ECBC8DBF2 /* libPods-MQTTClientTVTests.a */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 840487641C51212700569C79 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 846191221883E56800101409 /* Project object */; + proxyType = 1; + remoteGlobalIDString = DE9EF5C41C0628B1009EF667; + remoteInfo = MQTTFramework; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ 18B40FC8D44344802D9A114C /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; 22A31FA7164B1DFF756BDD4E /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = ""; }; @@ -238,6 +250,9 @@ 70CD22E87C034B361D11433E /* libPods-MQTTClientOSX.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MQTTClientOSX.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 78947B46F631F9278FE90AB8 /* Pods-MQTTClientOSX.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MQTTClientOSX.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MQTTClientOSX/Pods-MQTTClientOSX.debug.xcconfig"; sourceTree = ""; }; 7A7CCD16D485D0855A2E6999 /* libPods-MQTTClientTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MQTTClientTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 8404875E1C51212600569C79 /* MQTTFrameworkTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MQTTFrameworkTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 840487601C51212700569C79 /* MQTTFrameworkTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MQTTFrameworkTests.m; sourceTree = ""; }; + 840487621C51212700569C79 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 840507C2193DCE4B002EBBD2 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; 840507C4193DCF2E002EBBD2 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 840716321BBEF13A00FBB3CB /* MQTTClientOSXTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MQTTClientOSXTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -330,6 +345,14 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 8404875B1C51212600569C79 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 840487631C51212700569C79 /* MQTTFramework.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 8407162F1BBEF13A00FBB3CB /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -420,6 +443,15 @@ path = SelfSigned; sourceTree = ""; }; + 8404875F1C51212700569C79 /* MQTTFrameworkTests */ = { + isa = PBXGroup; + children = ( + 840487601C51212700569C79 /* MQTTFrameworkTests.m */, + 840487621C51212700569C79 /* Info.plist */, + ); + path = MQTTFrameworkTests; + sourceTree = ""; + }; 840621441C3069510096ABB3 /* InMemory */ = { isa = PBXGroup; children = ( @@ -493,6 +525,7 @@ 840716151BBEEF9C00FBB3CB /* MQTTClientOSX */, 840716331BBEF13A00FBB3CB /* MQTTClientOSXTests */, DE9EF5C61C0628B1009EF667 /* MQTTFramework */, + 8404875F1C51212700569C79 /* MQTTFrameworkTests */, 8461912C1883E56800101409 /* Frameworks */, 8461912B1883E56800101409 /* Products */, C68FB15078050E672FED917E /* Pods */, @@ -506,6 +539,7 @@ 8425D7011BBE8D3D005AD733 /* MQTTClientTVTests.xctest */, 840716321BBEF13A00FBB3CB /* MQTTClientOSXTests.xctest */, DE9EF5C51C0628B1009EF667 /* MQTTFramework.framework */, + 8404875E1C51212600569C79 /* MQTTFrameworkTests.xctest */, ); name = Products; sourceTree = ""; @@ -768,33 +802,51 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 841D0AA31C358843006A82DC /* MQTTInMemoryPersistence.h in Headers */, - 841D0A9C1C358826006A82DC /* MQTTSSLSecurityPolicyTransport.h in Headers */, 84B7E60C1C09A87C00FD087E /* MQTTFramework.h in Headers */, DE9EF5D71C062907009EF667 /* MQTTDecoder.h in Headers */, + DE9EF5D91C062907009EF667 /* MQTTMessage.h in Headers */, + DE9EF5DA1C062907009EF667 /* MQTTSession.h in Headers */, + 845922A81C175AA400CCE27E /* MQTTCFSocketTransport.h in Headers */, + 841D0AA31C358843006A82DC /* MQTTInMemoryPersistence.h in Headers */, + 841D0A9C1C358826006A82DC /* MQTTSSLSecurityPolicyTransport.h in Headers */, 845922A51C175AA400CCE27E /* MQTTCFSocketEncoder.h in Headers */, 84517CF01C17904D006FE09B /* MQTTClient-Prefix.pch in Headers */, 841D0A9D1C358829006A82DC /* MQTTWebsocketTransport.h in Headers */, 841D0A9B1C358823006A82DC /* MQTTSSLSecurityPolicyEncoder.h in Headers */, - DE9EF5D91C062907009EF667 /* MQTTMessage.h in Headers */, - DE9EF5DA1C062907009EF667 /* MQTTSession.h in Headers */, - 845922A81C175AA400CCE27E /* MQTTCFSocketTransport.h in Headers */, - 84998C841C0ED7EF00119061 /* MQTTSessionLegacy.h in Headers */, - 845922AB1C175AAB00CCE27E /* MQTTClient.h in Headers */, 841D0A951C35881A006A82DC /* MQTTSSLSecurityPolicy.h in Headers */, 841D0AA01C35883F006A82DC /* MQTTCoreDataPersistence.h in Headers */, 841D0A981C35881F006A82DC /* MQTTSSLSecurityPolicyDecoder.h in Headers */, + 845922A61C175AA400CCE27E /* MQTTCFSocketDecoder.h in Headers */, + 84998C841C0ED7EF00119061 /* MQTTSessionLegacy.h in Headers */, 84998C8D1C0EE26600119061 /* MQTTSessionSynchron.h in Headers */, 845922A21C175AA400CCE27E /* MQTTTransport.h in Headers */, - 845922A61C175AA400CCE27E /* MQTTCFSocketDecoder.h in Headers */, DE9EF5DB1C062907009EF667 /* MQTTPersistence.h in Headers */, DE9EF5DD1C062907009EF667 /* MQTTSessionManager.h in Headers */, + 845922AB1C175AAB00CCE27E /* MQTTClient.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ + 8404875D1C51212600569C79 /* MQTTFrameworkTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 840487681C51212700569C79 /* Build configuration list for PBXNativeTarget "MQTTFrameworkTests" */; + buildPhases = ( + 8404875A1C51212600569C79 /* Sources */, + 8404875B1C51212600569C79 /* Frameworks */, + 8404875C1C51212600569C79 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 840487651C51212700569C79 /* PBXTargetDependency */, + ); + name = MQTTFrameworkTests; + productName = MQTTFrameworkTests; + productReference = 8404875E1C51212600569C79 /* MQTTFrameworkTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; 840716311BBEF13A00FBB3CB /* MQTTClientOSXTests */ = { isa = PBXNativeTarget; buildConfigurationList = 8407163A1BBEF13A00FBB3CB /* Build configuration list for PBXNativeTarget "MQTTClientOSXTests" */; @@ -886,6 +938,9 @@ LastUpgradeCheck = 0710; ORGANIZATIONNAME = "Christoph Krey"; TargetAttributes = { + 8404875D1C51212600569C79 = { + CreatedOnToolsVersion = 7.2; + }; 840716311BBEF13A00FBB3CB = { CreatedOnToolsVersion = 7.1; }; @@ -919,11 +974,19 @@ 840716311BBEF13A00FBB3CB /* MQTTClientOSXTests */, DE9EF5C41C0628B1009EF667 /* MQTTFramework */, 84B739AA1A66EDFC00B103F4 /* Doxygen Docs */, + 8404875D1C51212600569C79 /* MQTTFrameworkTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 8404875C1C51212600569C79 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 840716301BBEF13A00FBB3CB /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1155,6 +1218,14 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 8404875A1C51212600569C79 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 840487611C51212700569C79 /* MQTTFrameworkTests.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 8407162E1BBEF13A00FBB3CB /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1239,6 +1310,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 840487651C51212700569C79 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = DE9EF5C41C0628B1009EF667 /* MQTTFramework */; + targetProxy = 840487641C51212700569C79 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ 846191461883E56800101409 /* InfoPlist.strings */ = { isa = PBXVariantGroup; @@ -1251,6 +1330,43 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 840487661C51212700569C79 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_UNREACHABLE_CODE = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = MQTTFrameworkTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.2; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_BUNDLE_IDENTIFIER = org.owntracks.MQTTFrameworkTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 840487671C51212700569C79 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_UNREACHABLE_CODE = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = MQTTFrameworkTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.2; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = org.owntracks.MQTTFrameworkTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; 8407163B1BBEF13A00FBB3CB /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = B7776C71592113EEC9F0498B /* Pods-MQTTClientOSXTests.debug.xcconfig */; @@ -1544,6 +1660,14 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 840487681C51212700569C79 /* Build configuration list for PBXNativeTarget "MQTTFrameworkTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 840487661C51212700569C79 /* Debug */, + 840487671C51212700569C79 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; 8407163A1BBEF13A00FBB3CB /* Build configuration list for PBXNativeTarget "MQTTClientOSXTests" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/MQTTClient/MQTTClient/MQTTCFSocketDecoder.m b/MQTTClient/MQTTClient/MQTTCFSocketDecoder.m index 95fc3aaa..294027df 100644 --- a/MQTTClient/MQTTClient/MQTTCFSocketDecoder.m +++ b/MQTTClient/MQTTClient/MQTTCFSocketDecoder.m @@ -11,7 +11,7 @@ #define LOG_LEVEL_DEF ddLogLevel #import #ifdef DEBUG -static const DDLogLevel ddLogLevel = DDLogLevelVerbose; +static const DDLogLevel ddLogLevel = DDLogLevelWarning; #else static const DDLogLevel ddLogLevel = DDLogLevelWarning; #endif diff --git a/MQTTClient/MQTTClient/MQTTCFSocketEncoder.m b/MQTTClient/MQTTClient/MQTTCFSocketEncoder.m index 5a777be2..0104e926 100644 --- a/MQTTClient/MQTTClient/MQTTCFSocketEncoder.m +++ b/MQTTClient/MQTTClient/MQTTCFSocketEncoder.m @@ -11,7 +11,7 @@ #define LOG_LEVEL_DEF ddLogLevel #import #ifdef DEBUG -static const DDLogLevel ddLogLevel = DDLogLevelVerbose; +static const DDLogLevel ddLogLevel = DDLogLevelWarning; #else static const DDLogLevel ddLogLevel = DDLogLevelWarning; #endif @@ -100,7 +100,7 @@ - (void)stream:(NSStream*)sender handleEvent:(NSStreamEvent)eventCode { - (BOOL)send:(NSData *)data { @synchronized(self) { if (self.state != MQTTCFSocketEncoderStateReady) { - DDLogWarn(@"[MQTTCFSocketEncoder] not MQTTCFSocketEncoderStateReady"); + DDLogInfo(@"[MQTTCFSocketEncoder] not MQTTCFSocketEncoderStateReady"); return FALSE; } diff --git a/MQTTClient/MQTTClient/MQTTCFSocketTransport.m b/MQTTClient/MQTTClient/MQTTCFSocketTransport.m index f8426723..b43c045a 100644 --- a/MQTTClient/MQTTClient/MQTTCFSocketTransport.m +++ b/MQTTClient/MQTTClient/MQTTCFSocketTransport.m @@ -12,7 +12,7 @@ #define LOG_LEVEL_DEF ddLogLevel #import #ifdef DEBUG -static const DDLogLevel ddLogLevel = DDLogLevelVerbose; +static const DDLogLevel ddLogLevel = DDLogLevelWarning; #else static const DDLogLevel ddLogLevel = DDLogLevelWarning; #endif diff --git a/MQTTClient/MQTTClient/MQTTCoreDataPersistence.m b/MQTTClient/MQTTClient/MQTTCoreDataPersistence.m index dcb9ad40..b1ead034 100755 --- a/MQTTClient/MQTTClient/MQTTCoreDataPersistence.m +++ b/MQTTClient/MQTTClient/MQTTCoreDataPersistence.m @@ -12,7 +12,7 @@ #define LOG_LEVEL_DEF ddLogLevel #import #ifdef DEBUG -static const DDLogLevel ddLogLevel = DDLogLevelVerbose; +static const DDLogLevel ddLogLevel = DDLogLevelWarning; #else static const DDLogLevel ddLogLevel = DDLogLevelWarning; #endif diff --git a/MQTTClient/MQTTClient/MQTTDecoder.m b/MQTTClient/MQTTClient/MQTTDecoder.m index f9b026ca..eccc6ec4 100644 --- a/MQTTClient/MQTTClient/MQTTDecoder.m +++ b/MQTTClient/MQTTClient/MQTTDecoder.m @@ -11,7 +11,7 @@ #define LOG_LEVEL_DEF ddLogLevel #import #ifdef DEBUG -static const DDLogLevel ddLogLevel = DDLogLevelVerbose; +static const DDLogLevel ddLogLevel = DDLogLevelWarning; #else static const DDLogLevel ddLogLevel = DDLogLevelWarning; #endif diff --git a/MQTTClient/MQTTClient/MQTTInMemoryPersistence.m b/MQTTClient/MQTTClient/MQTTInMemoryPersistence.m index 51a0f624..915c4eff 100755 --- a/MQTTClient/MQTTClient/MQTTInMemoryPersistence.m +++ b/MQTTClient/MQTTClient/MQTTInMemoryPersistence.m @@ -12,7 +12,7 @@ #define LOG_LEVEL_DEF ddLogLevel #import #ifdef DEBUG -static const DDLogLevel ddLogLevel = DDLogLevelVerbose; +static const DDLogLevel ddLogLevel = DDLogLevelWarning; #else static const DDLogLevel ddLogLevel = DDLogLevelWarning; #endif diff --git a/MQTTClient/MQTTClient/MQTTMessage.m b/MQTTClient/MQTTClient/MQTTMessage.m index 20346518..4c8ccf72 100644 --- a/MQTTClient/MQTTClient/MQTTMessage.m +++ b/MQTTClient/MQTTClient/MQTTMessage.m @@ -23,7 +23,7 @@ #define LOG_LEVEL_DEF ddLogLevel #import #ifdef DEBUG -static const DDLogLevel ddLogLevel = DDLogLevelVerbose; +static const DDLogLevel ddLogLevel = DDLogLevelWarning; #else static const DDLogLevel ddLogLevel = DDLogLevelWarning; #endif diff --git a/MQTTClient/MQTTClient/MQTTSSLSecurityPolicyDecoder.m b/MQTTClient/MQTTClient/MQTTSSLSecurityPolicyDecoder.m index e20bd4fe..2cc53e9c 100644 --- a/MQTTClient/MQTTClient/MQTTSSLSecurityPolicyDecoder.m +++ b/MQTTClient/MQTTClient/MQTTSSLSecurityPolicyDecoder.m @@ -11,7 +11,7 @@ #define LOG_LEVEL_DEF ddLogLevel #import #ifdef DEBUG -static const DDLogLevel ddLogLevel = DDLogLevelVerbose; +static const DDLogLevel ddLogLevel = DDLogLevelWarning; #else static const DDLogLevel ddLogLevel = DDLogLevelWarning; #endif diff --git a/MQTTClient/MQTTClient/MQTTSSLSecurityPolicyEncoder.m b/MQTTClient/MQTTClient/MQTTSSLSecurityPolicyEncoder.m index 79a6bc87..dec9c4b9 100644 --- a/MQTTClient/MQTTClient/MQTTSSLSecurityPolicyEncoder.m +++ b/MQTTClient/MQTTClient/MQTTSSLSecurityPolicyEncoder.m @@ -11,7 +11,7 @@ #define LOG_LEVEL_DEF ddLogLevel #import #ifdef DEBUG -static const DDLogLevel ddLogLevel = DDLogLevelVerbose; +static const DDLogLevel ddLogLevel = DDLogLevelWarning; #else static const DDLogLevel ddLogLevel = DDLogLevelWarning; #endif diff --git a/MQTTClient/MQTTClient/MQTTSSLSecurityPolicyTransport.m b/MQTTClient/MQTTClient/MQTTSSLSecurityPolicyTransport.m index c01b973d..d840fd4c 100644 --- a/MQTTClient/MQTTClient/MQTTSSLSecurityPolicyTransport.m +++ b/MQTTClient/MQTTClient/MQTTSSLSecurityPolicyTransport.m @@ -14,7 +14,7 @@ #define LOG_LEVEL_DEF ddLogLevel #import #ifdef DEBUG -static const DDLogLevel ddLogLevel = DDLogLevelVerbose; +static const DDLogLevel ddLogLevel = DDLogLevelWarning; #else static const DDLogLevel ddLogLevel = DDLogLevelWarning; #endif diff --git a/MQTTClient/MQTTClient/MQTTSession.m b/MQTTClient/MQTTClient/MQTTSession.m index df8ef4b9..03640846 100644 --- a/MQTTClient/MQTTClient/MQTTSession.m +++ b/MQTTClient/MQTTClient/MQTTSession.m @@ -15,7 +15,7 @@ #define LOG_LEVEL_DEF ddLogLevel #import #ifdef DEBUG -static const DDLogLevel ddLogLevel = DDLogLevelVerbose; +static const DDLogLevel ddLogLevel = DDLogLevelWarning; #else static const DDLogLevel ddLogLevel = DDLogLevelWarning; #endif diff --git a/MQTTClient/MQTTClient/MQTTSessionLegacy.m b/MQTTClient/MQTTClient/MQTTSessionLegacy.m index 12ce3c4f..760b9d16 100644 --- a/MQTTClient/MQTTClient/MQTTSessionLegacy.m +++ b/MQTTClient/MQTTClient/MQTTSessionLegacy.m @@ -35,7 +35,7 @@ #define LOG_LEVEL_DEF ddLogLevel #import #ifdef DEBUG -static const DDLogLevel ddLogLevel = DDLogLevelVerbose; +static const DDLogLevel ddLogLevel = DDLogLevelWarning; #else static const DDLogLevel ddLogLevel = DDLogLevelWarning; #endif diff --git a/MQTTClient/MQTTClient/MQTTSessionManager.m b/MQTTClient/MQTTClient/MQTTSessionManager.m index ca0fa03b..559621a5 100644 --- a/MQTTClient/MQTTClient/MQTTSessionManager.m +++ b/MQTTClient/MQTTClient/MQTTSessionManager.m @@ -13,7 +13,7 @@ #define LOG_LEVEL_DEF ddLogLevel #import #ifdef DEBUG -static const DDLogLevel ddLogLevel = DDLogLevelVerbose; +static const DDLogLevel ddLogLevel = DDLogLevelWarning; #else static const DDLogLevel ddLogLevel = DDLogLevelWarning; #endif diff --git a/MQTTClient/MQTTClient/MQTTSessionSynchron.m b/MQTTClient/MQTTClient/MQTTSessionSynchron.m index a14c92f8..0433ef6e 100644 --- a/MQTTClient/MQTTClient/MQTTSessionSynchron.m +++ b/MQTTClient/MQTTClient/MQTTSessionSynchron.m @@ -20,7 +20,7 @@ #define LOG_LEVEL_DEF ddLogLevel #import #ifdef DEBUG -static const DDLogLevel ddLogLevel = DDLogLevelVerbose; +static const DDLogLevel ddLogLevel = DDLogLevelWarning; #else static const DDLogLevel ddLogLevel = DDLogLevelWarning; #endif diff --git a/MQTTClient/MQTTClient/MQTTTransport.m b/MQTTClient/MQTTClient/MQTTTransport.m index 75430185..7d0afc57 100644 --- a/MQTTClient/MQTTClient/MQTTTransport.m +++ b/MQTTClient/MQTTClient/MQTTTransport.m @@ -12,7 +12,7 @@ #define LOG_LEVEL_DEF ddLogLevel #import #ifdef DEBUG -static const DDLogLevel ddLogLevel = DDLogLevelVerbose; +static const DDLogLevel ddLogLevel = DDLogLevelWarning; #else static const DDLogLevel ddLogLevel = DDLogLevelWarning; #endif diff --git a/MQTTClient/MQTTFramework/MQTTFramework.h b/MQTTClient/MQTTFramework/MQTTFramework.h index a3eff598..36259305 100644 --- a/MQTTClient/MQTTFramework/MQTTFramework.h +++ b/MQTTClient/MQTTFramework/MQTTFramework.h @@ -8,13 +8,16 @@ #import -#import "MQTTSSLSecurityPolicy.h" +#import "MQTTSession.h" #import "MQTTDecoder.h" -#import "MQTTEncoder.h" +#import "MQTTSessionLegacy.h" +#import "MQTTSessionSynchron.h" #import "MQTTMessage.h" -#import "MQTTSession.h" -#import "MQTTPersistence.h" -#import "MQTTSessionManager.h" +#import "MQTTTransport.h" +#import "MQTTCFSocketTransport.h" +#import "MQTTCoreDataPersistence.h" +#import "MQTTSSLSecurityPolicyTransport.h" + //! Project version number for MQTTFramework. FOUNDATION_EXPORT double MQTTFrameworkVersionNumber; diff --git a/README.md b/README.md index 8540c005..21fc1a64 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,16 @@ an Objective-C native MQTT Framework http://mqtt.org Use the CocoaPod MQTTClient! +Add this to your Podfile: +``` +pod 'MQTTClient' +``` + +Additionally add this subspec if you want to use MQTT over Websockets: +``` +pod 'MQTTClient/Websocket' +``` + Or use the dynamic library created in the MQTTFramework target. Or include the source from here.