Swift 4

Author: pvzig

.swiftlint.yml

@@ -4,4 +4,5 @@ disabled_rules:
 line_length: 140
 excluded: # paths to ignore during linting. Takes precedence over `included`.
   - Carthage
-  - Pods
+  - Pods
+  - .build

Cartfile

@@ -1,3 +1,3 @@
-github "SlackKit/SKCore" >= 4.0.0
-github "SlackKit/SKWebAPI" >= 4.0.0
-github "daltoniam/Starscream" ~> 2.0
+github "SlackKit/SKCore" >= 4.1.0
+github "SlackKit/SKWebAPI" >= 4.1.0
+github "daltoniam/Starscream" ~> 3.0

Package.swift

@@ -1,20 +1,26 @@
+// swift-tools-version:4.0
 import PackageDescription
 
 let package = Package(
     name: "SKRTMAPI",
-    targets: [
-        Target(name: "SKRTMAPI")
+    products: [
+        .library(name: "SKRTMAPI", targets: ["SKRTMAPI"])
     ],
     dependencies: [
-        .Package(url: "https://github.com/SlackKit/SKCore", majorVersion: 4),
-        .Package(url: "https://github.com/SlackKit/SKWebAPI", majorVersion: 4)
-    ]
+        .package(url: "https://github.com/SlackKit/SKCore", .upToNextMajor(from: "4.0.0")),
+        .package(url: "https://github.com/SlackKit/SKWebAPI", .upToNextMajor(from: "4.0.0"))
+    ],
+    targets: []
 )
 
 var dependency: Package.Dependency
+var target: Target
 #if os(macOS) || os(iOS) || os(tvOS)
-dependency = .Package(url: "https://github.com/daltoniam/Starscream", majorVersion: 2)
+target = .target(name: "SKRTMAPI", dependencies: ["SKCore", "SKWebAPI", "Starscream"])
+dependency = .package(url: "https://github.com/daltoniam/Starscream", .upToNextMajor(from: "3.0.0"))
 #else
-dependency = .Package(url: "https://github.com/Zewo/WebSocketClient.git", majorVersion: 0, minor: 14)
+target = .target(name: "SKRTMAPI", dependencies: ["SKCore", "SKWebAPI", "WebSockets", "HTTP", "URI"])
+dependency = .package(url: "https://github.com/vapor/engine", .upToNextMajor(from: "2.2.2"))
 #endif
 package.dependencies.append(dependency)
+package.targets.append(target)

README.md

@@ -1,5 +1,5 @@
 # SKRTMAPI: SlackKit RTM Module
-![Swift Version](https://img.shields.io/badge/Swift-3.1.1-orange.svg)
+![Swift Version](https://img.shields.io/badge/Swift-4.0.3-orange.svg)
 ![Plaforms](https://img.shields.io/badge/Platforms-macOS,iOS,tvOS,Linux-lightgrey.svg)
 ![License MIT](https://img.shields.io/badge/License-MIT-lightgrey.svg)
 [![SwiftPM compatible](https://img.shields.io/badge/SwiftPM-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager)
@@ -21,7 +21,7 @@ pod 'SKRTMAPI'
 and run
 
 ```
-# Use CocoaPods version >= 1.1.0
+# Use CocoaPods version >= 1.4.0
 pod install
 ```
 
@@ -49,7 +49,7 @@ import PackageDescription
 
 let package = Package(
 	dependencies: [
-		.Package(url: "https://github.com/SlackKit/SKRTMAPI.git", majorVersion: 4)
+		.package(url: "https://github.com/SlackKit/SKRTMAPI.git", .upToNextMinor(from: "4.1.0"))
 	]
 )
 ```

SKRTMAPI.podspec

@@ -1,19 +1,19 @@
 Pod::Spec.new do |s|
-  s.name             = "SKRTMAPI"
-  s.version          = "4.0.3"
-  s.summary          = "A Swift library for connecting to the Slack RTM API"
-  s.homepage         = "https://github.com/SlackKit/SKRTMAPI"
-  s.license          = 'MIT'
-  s.author           = { "Peter Zignego" => "[email protected]" }
-  s.source           = { :git => "https://github.com/SlackKit/SKRTMAPI.git", :tag => s.version.to_s }
-  s.social_media_url = 'https://twitter.com/pvzig'
-  s.ios.deployment_target = '9.0'
-  s.osx.deployment_target = '10.11'
-  s.tvos.deployment_target = '9.0'
-  s.requires_arc = true
-  s.source_files = 'Sources/**/*.swift'  
-  s.frameworks = 'Foundation'
-  s.dependency 'SKCore'
-  s.dependency 'SKWebAPI'
-  s.dependency 'Starscream'
+  s.name                    = "SKRTMAPI"
+  s.version                 = "4.1.0"
+  s.summary                 = "A Swift library for connecting to the Slack RTM API"
+  s.homepage                = "https://github.com/SlackKit/SKRTMAPI"
+  s.license                 = 'MIT'
+  s.author                  = { "Peter Zignego" => "[email protected]" }
+  s.source                  = { :git => "https://github.com/SlackKit/SKRTMAPI.git", :tag => s.version.to_s }
+  s.social_media_url        = 'https://twitter.com/pvzig'
+  s.ios.deployment_target   = '9.0'
+  s.osx.deployment_target   = '10.11'
+  s.tvos.deployment_target  = '9.0'
+  s.requires_arc            = true
+  s.source_files            = 'Sources/**/*.swift'  
+  s.frameworks              = 'Foundation'
+  s.dependency                'SKCore'
+  s.dependency                'SKWebAPI'
+  s.dependency                'Starscream'
 end

SKRTMAPI.xcodeproj/project.pbxproj

@@ -249,7 +249,7 @@
 		2684F1741E95AA6900536DCC /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 0920;
 				ORGANIZATIONNAME = "Peter Zignego";
 				TargetAttributes = {
 					2684F17C1E95AA6900536DCC = {
@@ -396,15 +396,21 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -449,15 +455,21 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -507,7 +519,7 @@
 				PRODUCT_NAME = SKRTMAPI;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -534,7 +546,7 @@
 				PRODUCT_NAME = SKRTMAPI;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -561,7 +573,7 @@
 				PRODUCT_NAME = SKRTMAPI;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -588,7 +600,7 @@
 				PRODUCT_NAME = SKRTMAPI;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -614,7 +626,7 @@
 				PRODUCT_NAME = SKRTMAPI;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
 			name = Debug;
@@ -641,7 +653,7 @@
 				PRODUCT_NAME = SKRTMAPI;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
 			name = Release;

SKRTMAPI.xcodeproj/xcshareddata/xcschemes/SKRTMAPI iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

SKRTMAPI.xcodeproj/xcshareddata/xcschemes/SKRTMAPI macOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

SKRTMAPI.xcodeproj/xcshareddata/xcschemes/SKRTMAPI tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Sources/SKRTMAPI/Conformers/StarscreamRTM.swift

@@ -27,6 +27,7 @@ import SKCore
 import Starscream
 
 public class StarscreamRTM: RTMWebSocket, WebSocketDelegate {
+
     public weak var delegate: RTMDelegate?
     private var webSocket: WebSocket?
 
@@ -55,19 +56,24 @@ public class StarscreamRTM: RTMWebSocket, WebSocketDelegate {
     }
 
     // MARK: - WebSocketDelegate
-    public func websocketDidConnect(socket: WebSocket) {
+    public func websocketDidConnect(socket: WebSocketClient) {
         delegate?.didConnect()
     }
 
-    public func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
+    public func websocketDidDisconnect(socket: WebSocketClient, error: Error?) {
         webSocket = nil
         delegate?.disconnected()
     }
 
-    public func websocketDidReceiveMessage(socket: WebSocket, text: String) {
+    public func websocketDidReceiveMessage(socket: WebSocketClient, text: String) {
         delegate?.receivedMessage(text)
     }
 
-    public func websocketDidReceiveData(socket: WebSocket, data: Data) {}
+    public func websocketDidConnect(socket: WebSocket) {
+        delegate?.didConnect()
+    }
+
+    public func websocketDidReceiveData(socket: WebSocketClient, data: Data) {}
 }
+
 #endif