Merge branch 'development'

* development: (23 commits)
  only build mac since the other targets aren't used in testing
  add package resolved file
  rename method
  update readme for carthage
  move carthage update to before_install
  Document SSLSecurity class
  update versions; use upstream starscream in podfile dep
  Go back to Starscream 2.1.1
  Fixes Mac build
  Proof of concept
  Remove StarScream
  Fix documentation
  Don't set configs after connect
  Allow changing config after init but before connect. Fixes #680
  Make a bunch of things public. Fixes #803
  More documentation
  bump starscream dev
  update version; again
  work on fixing for latest version
  update starscream
  ...

Author: nuclearace

.gitmodules

@@ -1,15 +1,16 @@
 language: objective-c
 xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder
-xcode_scheme: SocketIO-iOS
+xcode_scheme: SocketIO-Mac
 osx_image: xcode9
 branches:
   only:
     - master
     - development
-    - swift4.0
 before_install:
   - brew update
-  - brew outdated xctool || brew upgrade xctool
+  # - brew outdated xctool || brew upgrade xctool
+  - brew outdated carthage || brew upgrade carthage
+  - carthage update --platform macosx
 script:
   - xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build test -quiet
 #  - xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build-for-testing -quiet

.travis.yml

@@ -0,0 +1 @@
+github "daltoniam/Starscream" ~> 2.0

Cartfile

@@ -0,0 +1 @@
+github "daltoniam/Starscream" "2.1.1"

Cartfile.resolved

@@ -8,9 +8,9 @@ let package = Package(
         .library(name: "SocketIO", targets: ["SocketIO"])
     ],
     dependencies: [
-        .package(url: "https://github.com/nuclearace/Starscream", .upToNextMajor(from: "8.0.0")),
+        .package(url: "https://github.com/daltoniam/Starscream", .upToNextMajor(from: "2.1.1")),
     ],
     targets: [
-        .target(name: "SocketIO", dependencies: ["StarscreamSocketIO"], exclude: ["Sources/Starscream"])
+        .target(name: "SocketIO", dependencies: ["Starscream"])
     ]
 )

Package.resolved

@@ -85,22 +85,23 @@ let package = Package(
 Then import `import SocketIO`.
 
 ### Carthage
-Add these line to your `Cartfile`:
+Add this line to your `Cartfile`:
 ```
-github "nuclearace/Starscream" ~> 8.0.7
-github "socketio/socket.io-client-swift" ~> 12.0.0 # Or latest version
+github "socketio/socket.io-client-swift" ~> 12.1.0 # Or latest version
 ```
 
 Run `carthage update --platform ios,macosx`.
 
+Add the `Starscream` and `SocketIO` frameworks to your projects and follow the usual Carthage process.
+
 ### CocoaPods 1.0.0 or later
 Create `Podfile` and add `pod 'Socket.IO-Client-Swift'`:
 
 ```ruby
 use_frameworks!
 
 target 'YourApp' do
-    pod 'Socket.IO-Client-Swift', '~> 12.0.0' # Or latest version
+    pod 'Socket.IO-Client-Swift', '~> 12.1.0' # Or latest version
 end
 ```
 

Package.swift

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "Socket.IO-Client-Swift"
   s.module_name  = "SocketIO"
-  s.version      = "12.0.0"
+  s.version      = "12.1.0"
   s.summary      = "Socket.IO-client for iOS and OS X"
   s.description  = <<-DESC
                    Socket.IO-client for iOS and OS X.
@@ -17,12 +17,12 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.source = {
     :git => "https://github.com/socketio/socket.io-client-swift.git",
-    :tag => 'v12.0.0',
+    :tag => 'v12.1.0',
     :submodules => true
   }
   s.pod_target_xcconfig = {
       'SWIFT_VERSION' => '4.0'
   }
   s.source_files  = "Source/SocketIO/**/*.swift", "Source/SocketIO/*.swift"
-  s.dependency "StarscreamSocketIO", "~> 8.0.7"
+  s.dependency "Starscream", "~> 2.1.1"
 end

README.md

@@ -11,7 +11,6 @@
 @import Foundation;
 @import XCTest;
 @import SocketIO;
-@import StarscreamSocketIO;
 
 @interface SocketObjectiveCTest : XCTestCase
 
@@ -103,7 +102,7 @@ - (void)testSocketManager {
 
 - (void)testSSLSecurity {
     SSLSecurity* sec = [[SSLSecurity alloc] initWithUsePublicKeys:0];
-    sec.isReady = 0;
+    sec = nil;
 }
 
 @end