diff --git a/.gitignore b/.gitignore index e7b722d..5bcf21b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +StompWebSocketExample + # OS X .DS_Store diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ad9487..e157c57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Change Log +## [Unreleased](https://github.com/wrathchaos/StompClientLib/tree/HEAD) + +[Full Changelog](https://github.com/wrathchaos/StompClientLib/compare/1.2.7...HEAD) + +**Closed issues:** + +- Delegate StompClientDidConnect not called after connect-\>disconnect-\>connect [\#15](https://github.com/WrathChaos/StompClientLib/issues/15) + +## [1.2.7](https://github.com/wrathchaos/StompClientLib/tree/1.2.7) (2018-10-23) +[Full Changelog](https://github.com/wrathchaos/StompClientLib/compare/1.2.6...1.2.7) + +## [1.2.6](https://github.com/wrathchaos/StompClientLib/tree/1.2.6) (2018-10-23) +[Full Changelog](https://github.com/wrathchaos/StompClientLib/compare/1.2.5...1.2.6) + +**Fixed bugs:** + +- Error when connected to socket [\#23](https://github.com/WrathChaos/StompClientLib/issues/23) + +**Closed issues:** + +- Auto disconnects [\#11](https://github.com/WrathChaos/StompClientLib/issues/11) + ## [1.2.5](https://github.com/wrathchaos/StompClientLib/tree/1.2.5) (2018-10-22) [Full Changelog](https://github.com/wrathchaos/StompClientLib/compare/1.2.4...1.2.5) diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 92e2a0e..9a73f6a 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -417,19 +417,20 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1020; TargetAttributes = { B831C80B9164D5EA5477BA5B1F1AF683 = { - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; }; }; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 7DB346D0F39D3F0E887471402A8071AB; productRefGroup = 7142661ED2A3A80C41B0D6E67D0573A7 /* Products */; @@ -597,7 +598,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -707,6 +708,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -785,7 +787,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -797,6 +799,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/StompClientLib.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/StompClientLib.xcscheme index 70c5d7e..83c2da5 100644 --- a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/StompClientLib.xcscheme +++ b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/StompClientLib.xcscheme @@ -1,6 +1,6 @@ Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. return true } diff --git a/Example/StompClientLib/ViewController.swift b/Example/StompClientLib/ViewController.swift index 149e0e7..1dad300 100644 --- a/Example/StompClientLib/ViewController.swift +++ b/Example/StompClientLib/ViewController.swift @@ -30,7 +30,7 @@ class ViewController: UIViewController, StompClientLibDelegate { // substring is depracated in iOS 11, use prefix instead :) let wsURL = baseURL.substring(from:baseURL.index(baseURL.startIndex, offsetBy: 7)) let completedWSURL = "ws://\(wsURL)hello/websocket" - print("Completed WS URL : \(completedWSURL)") + url = NSURL(string: completedWSURL)! socketClient.openSocketWithURLRequest(request: NSURLRequest(url: url as URL) , delegate: self as StompClientLibDelegate) } diff --git a/README.md b/README.md index d225ae7..53f7025 100644 --- a/README.md +++ b/README.md @@ -17,18 +17,15 @@ alt="platform"> Cocoapods - - -

-

+ +alt="Swift 4.2"> Swift 3.0 @@ -68,10 +65,16 @@ To run the example project, clone the repo, and run `pod install` from the Examp StompClientLib is available through [CocoaPods](http://cocoapods.org). To install it, simply add the following line to your Podfile: +#### Cocoapods ```ruby pod "StompClientLib" ``` +#### Carthage +```ruby +github "WrathChaos/StompClientLib" +``` + ## Usage ```ruby import StompClientLib @@ -217,7 +220,7 @@ socketClient.autoDisconnect(time: 3) ## Future Enhancements - [x] Complete a working Example -- [ ] Add Carthage installation option +- [x] Add Carthage installation option - [ ] Add Swift Package Manager installation option - [x] XCode 9 compatibility - [x] Swift 4 compatibility and tests @@ -225,7 +228,20 @@ socketClient.autoDisconnect(time: 3) - [ ] Re-write websocket full swift version instead of Facebook's SocketRocket lib # Change Log - +> +> ## [1.2.7](https://github.com/wrathchaos/StompClientLib/tree/1.2.7) (2018-10-23) +> [Full Changelog](https://github.com/wrathchaos/StompClientLib/compare/1.2.6...1.2.7) +> +> ## [1.2.6](https://github.com/wrathchaos/StompClientLib/tree/1.2.6) (2018-10-23) +> [Full Changelog](https://github.com/wrathchaos/StompClientLib/compare/1.2.5...1.2.6) +> +> **Fixed bugs:** +> +> - Error when connected to socket [\#23](https://github.com/WrathChaos/StompClientLib/issues/23) +> +> **Closed issues:** +> +> - Auto disconnects [\#11](https://github.com/WrathChaos/StompClientLib/issues/11) > > ## [1.2.5](https://github.com/wrathchaos/StompClientLib/tree/1.2.5) (2018-10-22) > [ Full Changelog](https://github.com/wrathchaos/StompClientLib/compare/1.2.4...1.2.5) diff --git a/StompClientLib.podspec b/StompClientLib.podspec index 2f94999..84a5541 100644 --- a/StompClientLib.podspec +++ b/StompClientLib.podspec @@ -8,8 +8,8 @@ Pod::Spec.new do |s| s.name = 'StompClientLib' - s.version = '1.2.7' - s.summary = 'Simple STOMP Client library. Swift 3, 4, 4.2 compatible' + s.version = '1.3.0' + s.summary = 'Simple STOMP Client library. Swift 3, 4, 4.2, 5 compatible' # This description is used to generate tags and improve search results. # * Think: What does it do? Why did you write it? What is the focus? @@ -18,7 +18,7 @@ Pod::Spec.new do |s| # * Finally, don't worry about the indent, CocoaPods strips it! s.description = <<-DESC -Simple STOMP Client library, Swift 3, 4, 4.2 compatible. STOMP Protocol let the program subscribe or unsubscribe the topic. It connects the websocket and use the STOMP protocol to subscribe the topic and recieve the message, receipt or even a ping. +Simple STOMP Client library, Swift 3, 4, 4.2, 5 compatible. STOMP Protocol let the program subscribe or unsubscribe the topic. It connects the websocket and use the STOMP protocol to subscribe the topic and recieve the message, receipt or even a ping. DESC s.homepage = 'https://github.com/wrathchaos/StompClientLib' diff --git a/StompWebSocketExample.gz b/StompWebSocketExample.gz new file mode 100644 index 0000000..9827080 Binary files /dev/null and b/StompWebSocketExample.gz differ