Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latest version of MQTTClient #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 4 additions & 36 deletions MQTTChat.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,6 @@
84FB53AB1B52A6F50033C370 /* Sources */,
84FB53AC1B52A6F50033C370 /* Frameworks */,
84FB53AD1B52A6F50033C370 /* Resources */,
FE08F37913D4727283DD183E /* [CP] Embed Pods Frameworks */,
B16156B32A35402CEC33C1D3 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -182,21 +180,6 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
B16156B32A35402CEC33C1D3 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MQTTChat/Pods-MQTTChat-resources.sh\"\n";
showEnvVarsInLog = 0;
};
D572E19FD0E3B4FC5E8EC6BA /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -215,21 +198,6 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
FE08F37913D4727283DD183E /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MQTTChat/Pods-MQTTChat-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down Expand Up @@ -311,7 +279,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -356,7 +324,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
Expand All @@ -370,7 +338,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = C652JFWU23;
INFOPLIST_FILE = MQTTChat/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.owntracks.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -384,7 +352,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = C652JFWU23;
INFOPLIST_FILE = MQTTChat/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.owntracks.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
8 changes: 8 additions & 0 deletions MQTTChat.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
22 changes: 15 additions & 7 deletions MQTTChat/ViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,23 @@ - (void)viewDidLoad {
auth:false
user:nil
pass:nil
will:YES
willTopic:[NSString stringWithFormat:@"%@/%@-%@",
self.base,
[UIDevice currentDevice].name,
self.tabBarItem.title]
will:[@"offline" dataUsingEncoding:NSUTF8StringEncoding]
willMsg:[@"offline" dataUsingEncoding:NSUTF8StringEncoding]
willQos:MQTTQosLevelExactlyOnce
willRetainFlag:FALSE
withClientId:nil];
willRetainFlag:NO
withClientId:nil
securityPolicy:nil
certificates:nil
protocolLevel:MQTTProtocolVersion311
connectHandler:^(NSError *error) {
}];
} else {
[self.manager connectToLast];
[self.manager connectToLast:^(NSError *error) {
}];
}

/*
Expand Down Expand Up @@ -155,7 +162,8 @@ - (IBAction)connect:(id)sender {
* MQTTClient: connect to same broker again
*/

[self.manager connectToLast];
[self.manager connectToLast:^(NSError *error) {
}];
}

- (IBAction)disconnect:(id)sender {
Expand All @@ -169,8 +177,8 @@ - (IBAction)disconnect:(id)sender {
self.tabBarItem.title]
qos:MQTTQosLevelExactlyOnce
retain:FALSE];
[[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1.0]];
[self.manager disconnect];
[self.manager disconnectWithDisconnectHandler:^(NSError *error) {
}];
}

- (IBAction)send:(id)sender {
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '8.4'
platform :ios, '9.0'

pod 'MQTTClient'

Expand Down
20 changes: 12 additions & 8 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
PODS:
- MQTTClient (0.9.9):
- MQTTClient/Core (= 0.9.9)
- MQTTClient/Core (0.9.9):
- MQTTClient (0.15.2):
- MQTTClient/Core (= 0.15.2)
- MQTTClient/Core (0.15.2):
- MQTTClient/Manager
- MQTTClient/Min
- MQTTClient/Manager (0.9.9):
- MQTTClient/Manager (0.15.2):
- MQTTClient/Min
- MQTTClient/Min (0.9.9)
- MQTTClient/Min (0.15.2)

DEPENDENCIES:
- MQTTClient

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- MQTTClient

SPEC CHECKSUMS:
MQTTClient: 5a59e0ebcad95f86ad8fc04dd4b819a944e58e0c
MQTTClient: 902c7bcac1501595f3d0b15178c7205b40331fb0

PODFILE CHECKSUM: f21fe868713ee483e2201d4f6640c81ef5d6fee3
PODFILE CHECKSUM: 86123608644e5652aed2d96bf7f928150f9e9fec

COCOAPODS: 1.4.0.beta.1
COCOAPODS: 1.5.2
1 change: 1 addition & 0 deletions Pods/Headers/Private/MQTTClient/GCDTimer.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Public/MQTTClient/GCDTimer.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions Pods/MQTTClient/MQTTClient/MQTTClient/GCDTimer.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

59 changes: 59 additions & 0 deletions Pods/MQTTClient/MQTTClient/MQTTClient/GCDTimer.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Pods/MQTTClient/MQTTClient/MQTTClient/MQTTCFSocketDecoder.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 5 additions & 10 deletions Pods/MQTTClient/MQTTClient/MQTTClient/MQTTCFSocketDecoder.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Pods/MQTTClient/MQTTClient/MQTTClient/MQTTCFSocketEncoder.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading