Skip to content

Commit

Permalink
Merge pull request #63 from CrazyWisdom/master
Browse files Browse the repository at this point in the history
dependency CocoaAsyncSocket
  • Loading branch information
zhangwh committed Apr 13, 2016
2 parents ae0940d + b273535 commit 2275236
Show file tree
Hide file tree
Showing 12 changed files with 1,786 additions and 10,633 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control?
#
# Pods/
Pods/
Podfile.lock

# Created by https://www.gitignore.io

Expand Down
10 changes: 5 additions & 5 deletions CocoaMQTT.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "CocoaMQTT"
s.version = "1.0.3"
s.version = "1.0.5"
s.summary = "MQTT v3.1.1 client library for iOS and OS X written with Swift 2"
s.homepage = "https://github.com/emqtt/CocoaMQTT"
s.license = { :type => "MIT" }
Expand All @@ -11,8 +11,8 @@ Pod::Spec.new do |s|
s.ios.deployment_target = "8.0"
# s.watchos.deployment_target = "2.0"
# s.tvos.deployment_target = "9.0"
s.source = { :git => "https://github.com/emqtt/CocoaMQTT.git", :tag => "1.0.3"}
s.source_files = "Source/{*.h,*.m}", "Source/*.swift"
# s.dependency "CocoaAsyncSocket", "~> 7.4.2"
# s.dependency "MSWeakTimer", "~> 1.1.0"
s.source = { :git => "https://github.com/emqtt/CocoaMQTT.git", :tag => "1.0.5"}
s.source_files = "Source/{*.h}", "Source/*.swift"
s.dependency "CocoaAsyncSocket", "~> 7.4.2"
s.dependency "MSWeakTimer", "~> 1.1.0"
end
2,661 changes: 1,767 additions & 894 deletions CocoaMQTT.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions CocoaMQTT.xcworkspace/contents.xcworkspacedata

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

4 changes: 2 additions & 2 deletions Example/Example/ChatViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ class ChatViewController: UIViewController {
tableView.dataSource = self
tableView.rowHeight = UITableViewAutomaticDimension
tableView.estimatedRowHeight = 50
NSNotificationCenter.defaultCenter().addObserver(self, selector: "receivedMessage:", name: "MQTTMessageNotification" + animal!, object: nil)
NSNotificationCenter.defaultCenter().addObserver(self, selector: "keyboardChanged:", name: UIKeyboardWillChangeFrameNotification, object: nil)
NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(ChatViewController.receivedMessage(_:)), name: "MQTTMessageNotification" + animal!, object: nil)
NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(ChatViewController.keyboardChanged(_:)), name: UIKeyboardWillChangeFrameNotification, object: nil)
}

deinit {
Expand Down
5 changes: 5 additions & 0 deletions Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
platform :ios, 9.0
use_frameworks!

pod 'CocoaAsyncSocket'
pod 'MSWeakTimer'
3 changes: 0 additions & 3 deletions Source/CocoaMQTT.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,3 @@ FOUNDATION_EXPORT double CocoaMQTTVersionNumber;
FOUNDATION_EXPORT const unsigned char CocoaMQTTVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <CocoaMQTT/PublicHeader.h>

#import "GCDAsyncSocket.h"
#import "MSWeakTimer.h"
2 changes: 2 additions & 0 deletions Source/CocoaMQTT.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
//

import Foundation
import CocoaAsyncSocket
import MSWeakTimer

/**
* MQTT Delegate
Expand Down
Loading

0 comments on commit 2275236

Please sign in to comment.