Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@HJianBo
HJianBo committed Oct 13, 2018
2 parents b851bda + cb78e20 commit 930fdcc
Show file tree
Hide file tree
Showing 58 changed files with 850 additions and 2,100 deletions.
7 changes: 3 additions & 4 deletions CocoaMQTT.podspec
View file
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.1.2"
s.version = "1.1.3"
s.summary = "MQTT v3.1.1 client library for iOS and OS X written with Swift 4"
s.homepage = "https://github.com/emqtt/CocoaMQTT"
s.license = { :type => "MIT" }
Expand All @@ -11,8 +11,7 @@ Pod::Spec.new do |s|
s.ios.deployment_target = "8.0"
s.tvos.deployment_target = "9.0"
# s.watchos.deployment_target = "2.0"
s.source = { :git => "https://github.com/emqtt/CocoaMQTT.git", :tag => "1.1.2"}
s.source = { :git => "https://github.com/emqtt/CocoaMQTT.git", :tag => "1.1.3"}
s.source_files = "Source/{*.h}", "Source/*.swift"
s.dependency "CocoaAsyncSocket", "~> 7.6.1"
s.dependency "SwiftyTimer", "~> 2.0.0"
s.dependency "CocoaAsyncSocket", "~> 7.6.3"
end
78 changes: 5 additions & 73 deletions CocoaMQTT.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@
0409970B1C1B0B96006B5A6D /* Frameworks */,
0409970C1C1B0B96006B5A6D /* Headers */,
0409970D1C1B0B96006B5A6D /* Resources */,
63CB873580212CDAD9D413C6 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -272,7 +271,6 @@
040997161C1B0B96006B5A6D /* Frameworks */,
040997171C1B0B96006B5A6D /* Resources */,
FBC42AF030F6410B64B3E473 /* [CP] Embed Pods Frameworks */,
5541FA7B868EC4A420C4E5BD /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -293,7 +291,6 @@
0409972C1C1B0E06006B5A6D /* Frameworks */,
0409972D1C1B0E06006B5A6D /* Headers */,
0409972E1C1B0E06006B5A6D /* Resources */,
4472D7FE2E9B528D3CAD93B1 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -331,7 +328,6 @@
040997551C1B0F7E006B5A6D /* Frameworks */,
040997561C1B0F7E006B5A6D /* Headers */,
040997571C1B0F7E006B5A6D /* Resources */,
16DF88757111777FAD6CD77E /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -376,7 +372,7 @@
};
040997181C1B0B96006B5A6D = {
CreatedOnToolsVersion = 7.1.1;
LastSwiftMigration = 0900;
LastSwiftMigration = "";
};
0409972F1C1B0E06006B5A6D = {
CreatedOnToolsVersion = 7.1.1;
Expand Down Expand Up @@ -464,36 +460,6 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
16DF88757111777FAD6CD77E /* [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-CocoaMQTT tvOS/Pods-CocoaMQTT tvOS-resources.sh\"\n";
showEnvVarsInLog = 0;
};
4472D7FE2E9B528D3CAD93B1 /* [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-CocoaMQTT OSX/Pods-CocoaMQTT OSX-resources.sh\"\n";
showEnvVarsInLog = 0;
};
4B96620CD9D21E4B857BCB38 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -512,36 +478,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;
};
5541FA7B868EC4A420C4E5BD /* [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-CocoaMQTT iOSTests/Pods-CocoaMQTT iOSTests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
63CB873580212CDAD9D413C6 /* [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-CocoaMQTT iOS/Pods-CocoaMQTT iOS-resources.sh\"\n";
showEnvVarsInLog = 0;
};
BCA9B455F6F848031D799736 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -604,12 +540,10 @@
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-CocoaMQTT iOSTests/Pods-CocoaMQTT iOSTests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/CocoaAsyncSocket-iOS/CocoaAsyncSocket.framework",
"${BUILT_PRODUCTS_DIR}/SwiftyTimer-iOS/SwiftyTimer.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaAsyncSocket.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyTimer.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -829,7 +763,7 @@
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -853,7 +787,7 @@
SKIP_INSTALL = YES;
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -865,8 +799,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.emqtt.CocoaMQTTTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -878,8 +811,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.emqtt.CocoaMQTTTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand Down
64 changes: 23 additions & 41 deletions Example/Example.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
04DB76621C1E7BB900776B4C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 04DB76601C1E7BB900776B4C /* LaunchScreen.storyboard */; };
04FE64871C2C41AE001E8F43 /* ChatViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FE64861C2C41AE001E8F43 /* ChatViewController.swift */; };
04FE64A71C2D9F75001E8F43 /* ChatLeftMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FE64A61C2D9F75001E8F43 /* ChatLeftMessageCell.swift */; };
DCA13C3025287722DD66DEF5 /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C2B190C3FBF2EC15466198C /* Pods_Example.framework */; };
F5ED7D1B70F44D3F5E5DF37A /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33EB0B12055698AEA8D71AD4 /* Pods_Example.framework */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
Expand Down Expand Up @@ -46,17 +46,17 @@
04DB76631C1E7BB900776B4C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
04FE64861C2C41AE001E8F43 /* ChatViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatViewController.swift; sourceTree = "<group>"; };
04FE64A61C2D9F75001E8F43 /* ChatLeftMessageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatLeftMessageCell.swift; sourceTree = "<group>"; };
7C2B190C3FBF2EC15466198C /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
A632A27CCA3C31D8F8120C8A /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = "<group>"; };
F464F97160EF63D352C6F1BC /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
0BC031E0076FF375408AD8D1 /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
33EB0B12055698AEA8D71AD4 /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
BE425DD5C76A2598F8AC2CC7 /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
04DB76511C1E7BB900776B4C /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
DCA13C3025287722DD66DEF5 /* Pods_Example.framework in Frameworks */,
F5ED7D1B70F44D3F5E5DF37A /* Pods_Example.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -68,8 +68,8 @@
children = (
04DB76561C1E7BB900776B4C /* Example */,
04DB76551C1E7BB900776B4C /* Products */,
DD8DF426A25B5A196C4976C1 /* Pods */,
E3D87B0BAFD8697B373C36BD /* Frameworks */,
A9FC0FAE12CD2A1911A9C955 /* Pods */,
71CBE07387F2FCF00983FC75 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -107,21 +107,21 @@
name = "Supporting Files";
sourceTree = "<group>";
};
DD8DF426A25B5A196C4976C1 /* Pods */ = {
71CBE07387F2FCF00983FC75 /* Frameworks */ = {
isa = PBXGroup;
children = (
A632A27CCA3C31D8F8120C8A /* Pods-Example.debug.xcconfig */,
F464F97160EF63D352C6F1BC /* Pods-Example.release.xcconfig */,
33EB0B12055698AEA8D71AD4 /* Pods_Example.framework */,
);
name = Pods;
name = Frameworks;
sourceTree = "<group>";
};
E3D87B0BAFD8697B373C36BD /* Frameworks */ = {
A9FC0FAE12CD2A1911A9C955 /* Pods */ = {
isa = PBXGroup;
children = (
7C2B190C3FBF2EC15466198C /* Pods_Example.framework */,
BE425DD5C76A2598F8AC2CC7 /* Pods-Example.debug.xcconfig */,
0BC031E0076FF375408AD8D1 /* Pods-Example.release.xcconfig */,
);
name = Frameworks;
name = Pods;
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand All @@ -131,13 +131,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 04DB76661C1E7BB900776B4C /* Build configuration list for PBXNativeTarget "Example" */;
buildPhases = (
B8B6F59ED9B3CFAB8AA29288 /* [CP] Check Pods Manifest.lock */,
3A3A6630BAAC2F8275FEC914 /* [CP] Check Pods Manifest.lock */,
04DB76501C1E7BB900776B4C /* Sources */,
04DB76511C1E7BB900776B4C /* Frameworks */,
04DB76521C1E7BB900776B4C /* Resources */,
04DB76C11C1E82F900776B4C /* Embed Frameworks */,
E0F8AAEF93B4208443D3BB24 /* [CP] Embed Pods Frameworks */,
B7657B971EAE8359B74B4EF1 /* [CP] Copy Pods Resources */,
69EC26ED76119B51EEE0F3F2 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -161,7 +160,7 @@
04DB76531C1E7BB900776B4C = {
CreatedOnToolsVersion = 7.1.1;
DevelopmentTeam = 2Z2KAMMN28;
LastSwiftMigration = 0910;
LastSwiftMigration = 1000;
};
};
};
Expand Down Expand Up @@ -198,22 +197,7 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
B7657B971EAE8359B74B4EF1 /* [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-Example/Pods-Example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
B8B6F59ED9B3CFAB8AA29288 /* [CP] Check Pods Manifest.lock */ = {
3A3A6630BAAC2F8275FEC914 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand All @@ -231,7 +215,7 @@
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;
};
E0F8AAEF93B4208443D3BB24 /* [CP] Embed Pods Frameworks */ = {
69EC26ED76119B51EEE0F3F2 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand All @@ -240,13 +224,11 @@
"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/CocoaAsyncSocket/CocoaAsyncSocket.framework",
"${BUILT_PRODUCTS_DIR}/CocoaMQTT/CocoaMQTT.framework",
"${BUILT_PRODUCTS_DIR}/SwiftyTimer/SwiftyTimer.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaAsyncSocket.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaMQTT.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyTimer.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -395,7 +377,7 @@
};
04DB76671C1E7BB900776B4C /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = A632A27CCA3C31D8F8120C8A /* Pods-Example.debug.xcconfig */;
baseConfigurationReference = BE425DD5C76A2598F8AC2CC7 /* Pods-Example.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
Expand All @@ -408,13 +390,13 @@
PRODUCT_BUNDLE_IDENTIFIER = io.emqtt.ChatExample;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
04DB76681C1E7BB900776B4C /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F464F97160EF63D352C6F1BC /* Pods-Example.release.xcconfig */;
baseConfigurationReference = 0BC031E0076FF375408AD8D1 /* Pods-Example.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
Expand All @@ -427,7 +409,7 @@
PRODUCT_BUNDLE_IDENTIFIER = io.emqtt.ChatExample;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion Example/Example/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}
Expand Down
2 changes: 1 addition & 1 deletion Example/Example/ChatLeftMessageCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ class ChatLeftMessageCell: UITableViewCell {

override func awakeFromNib() {
super.awakeFromNib()
selectionStyle = UITableViewCellSelectionStyle.none
selectionStyle = UITableViewCell.SelectionStyle.none
}
}
2 changes: 1 addition & 1 deletion Example/Example/ChatRightMessageCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ class ChatRightMessageCell: UITableViewCell {

override func awakeFromNib() {
super.awakeFromNib()
selectionStyle = UITableViewCellSelectionStyle.none
selectionStyle = UITableViewCell.SelectionStyle.none
}
}
Loading

0 comments on commit 930fdcc

Please sign in to comment.