Skip to content

Commit ba521b4

Browse files
committed
New StompClientLib Version: Swift 5 compatibility, Spring Boot 2.1.x support. New gitignore
1 parent 493a83b commit ba521b4

File tree

11 files changed

+32
-30
lines changed

11 files changed

+32
-30
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
StompWebSocketExample
2+
13
# OS X
24
.DS_Store
35

Example/Pods/Pods.xcodeproj/project.pbxproj

Lines changed: 8 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/StompClientLib.xcscheme

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/StompClientLib.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ public class StompClientLib: NSObject, SRWebSocketDelegate {
133133
*/
134134
private func connect() {
135135
if socket?.readyState == .OPEN {
136+
// Support for Spring Boot 2.1.x
137+
connectionHeaders = [StompCommands.commandHeaderAcceptVersion:"1.1,1.2"]
136138
// at the moment only anonymous logins
137139
self.sendFrame(command: StompCommands.commandConnect, header: connectionHeaders, body: nil)
138140
} else {

Example/StompClientLib.xcodeproj/project.pbxproj

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -223,26 +223,26 @@
223223
isa = PBXProject;
224224
attributes = {
225225
LastSwiftUpdateCheck = 0720;
226-
LastUpgradeCheck = 1000;
226+
LastUpgradeCheck = 1020;
227227
ORGANIZATIONNAME = CocoaPods;
228228
TargetAttributes = {
229229
607FACCF1AFB9204008FA782 = {
230230
CreatedOnToolsVersion = 6.3.1;
231231
DevelopmentTeam = 65LUFY6YWC;
232-
LastSwiftMigration = 0900;
232+
LastSwiftMigration = 1020;
233233
ProvisioningStyle = Automatic;
234234
};
235235
607FACE41AFB9204008FA782 = {
236236
CreatedOnToolsVersion = 6.3.1;
237237
DevelopmentTeam = DDFAG9WR5M;
238-
LastSwiftMigration = 0900;
238+
LastSwiftMigration = 1020;
239239
TestTargetID = 607FACCF1AFB9204008FA782;
240240
};
241241
};
242242
};
243243
buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "StompClientLib" */;
244244
compatibilityVersion = "Xcode 3.2";
245-
developmentRegion = English;
245+
developmentRegion = en;
246246
hasScannedForEncodings = 0;
247247
knownRegions = (
248248
en,
@@ -439,6 +439,7 @@
439439
isa = XCBuildConfiguration;
440440
buildSettings = {
441441
ALWAYS_SEARCH_USER_PATHS = NO;
442+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
442443
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
443444
CLANG_CXX_LIBRARY = "libc++";
444445
CLANG_ENABLE_MODULES = YES;
@@ -494,6 +495,7 @@
494495
isa = XCBuildConfiguration;
495496
buildSettings = {
496497
ALWAYS_SEARCH_USER_PATHS = NO;
498+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
497499
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
498500
CLANG_CXX_LIBRARY = "libc++";
499501
CLANG_ENABLE_MODULES = YES;
@@ -558,8 +560,7 @@
558560
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
559561
PRODUCT_NAME = "$(TARGET_NAME)";
560562
PROVISIONING_PROFILE_SPECIFIER = "";
561-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
562-
SWIFT_VERSION = 4.0;
563+
SWIFT_VERSION = 5.0;
563564
};
564565
name = Debug;
565566
};
@@ -583,8 +584,7 @@
583584
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
584585
PRODUCT_NAME = "$(TARGET_NAME)";
585586
PROVISIONING_PROFILE_SPECIFIER = "";
586-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
587-
SWIFT_VERSION = 4.0;
587+
SWIFT_VERSION = 5.0;
588588
};
589589
name = Release;
590590
};
@@ -605,8 +605,7 @@
605605
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
606606
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
607607
PRODUCT_NAME = "$(TARGET_NAME)";
608-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
609-
SWIFT_VERSION = 4.0;
608+
SWIFT_VERSION = 5.0;
610609
};
611610
name = Debug;
612611
};
@@ -623,8 +622,7 @@
623622
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
624623
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
625624
PRODUCT_NAME = "$(TARGET_NAME)";
626-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
627-
SWIFT_VERSION = 4.0;
625+
SWIFT_VERSION = 5.0;
628626
};
629627
name = Release;
630628
};

Example/StompClientLib.xcodeproj/xcshareddata/xcschemes/StompClientLib-Example.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1000"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Example/StompClientLib/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1414
var window: UIWindow?
1515

1616

17-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
17+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1818
// Override point for customization after application launch.
1919
return true
2020
}

Example/StompClientLib/ViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class ViewController: UIViewController, StompClientLibDelegate {
3030
// substring is depracated in iOS 11, use prefix instead :)
3131
let wsURL = baseURL.substring(from:baseURL.index(baseURL.startIndex, offsetBy: 7))
3232
let completedWSURL = "ws://\(wsURL)hello/websocket"
33-
print("Completed WS URL : \(completedWSURL)")
33+
3434
url = NSURL(string: completedWSURL)!
3535
socketClient.openSocketWithURLRequest(request: NSURLRequest(url: url as URL) , delegate: self as StompClientLibDelegate)
3636
}

README.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,15 @@ alt="platform">
1717
<img src="https://img.shields.io/badge/CocoaPods-compatible-4BC51D.svg"
1818
alt="Cocoapods">
1919
</a>
20-
<a href="https://github.com/WrathChaos/StompClientLib">
21-
<img src="https://img.shields.io/cocoapods/dt/StompClientLib.svg"
22-
alt="Downloads">
23-
</a>
2420
</p>
2521

2622

27-
2823
<p align="center">
2924
<a href="https://github.com/WrathChaos/MJPEGStreamLib">
25+
<img src="https://img.shields.io/badge/Swift-5.0-red.svg"
26+
alt="Swift 5.0">
3027
<img src="https://img.shields.io/badge/Swift-4.2-orange.svg"
31-
alt="Swift 4.0">
28+
alt="Swift 4.2">
3229
<img src="https://img.shields.io/badge/Swift-3.0-blue.svg"
3330
alt="Swift 3.0">
3431
</a>

StompClientLib.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'StompClientLib'
11-
s.version = '1.2.7'
12-
s.summary = 'Simple STOMP Client library. Swift 3, 4, 4.2 compatible'
11+
s.version = '1.3.0'
12+
s.summary = 'Simple STOMP Client library. Swift 3, 4, 4.2, 5 compatible'
1313

1414
# This description is used to generate tags and improve search results.
1515
# * Think: What does it do? Why did you write it? What is the focus?
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
1818
# * Finally, don't worry about the indent, CocoaPods strips it!
1919

2020
s.description = <<-DESC
21-
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.
21+
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.
2222
DESC
2323

2424
s.homepage = 'https://github.com/wrathchaos/StompClientLib'

0 commit comments

Comments
 (0)