Avoid TSan data race with CompressionState

Most of CompressionState is only mutated once per connection, as part of setting up the websocket. But needsCompression is mutated per-read-message. Handling reads is serialized on one queue, and handling writes is serialized on another queueu, which means that a read can be handled concurrently with handling a write. In theory this concurrent read/write should be harmless because the mutated field is not accessed by the other queue, but for best practice, we should write our code in a way that keeps TSan happy.
2019-02-06 17:39:02 -07:00
15 changed files with 104 additions and 136 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,4 +1,4 @@
-osx_image: xcode10.2
+osx_image: xcode10
 language: objective-c
 before_install:
  - gem install cocoapods --pre
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,14 +2,6 @@
 All notable changes to this project will be documented in this file.
 `Starscream` adheres to [Semantic Versioning](http://semver.org/).

-### [3.1.1](https://github.com/daltoniam/Starscream/tree/3.1.1)
-
-Small version number fix for 3.1.0: [#703](https://github.com/daltoniam/Starscream/issues/703)
-
-### [3.1.0](https://github.com/daltoniam/Starscream/tree/3.1.0)
-
-* Swift 5.0 and Xcode 10.2 support
-
 #### [3.0.6](https://github.com/daltoniam/Starscream/tree/3.0.6)

 * Swift 4.2 and Xcode 10 support
@ -157,14 +149,14 @@ Warning fixes for Swift 3.1

 Fix for the Swift Package Manager.

-Fixed:
+Fixed: 
 [#277](https://github.com/daltoniam/Starscream/issues/277)

 #### [2.0.1](https://github.com/daltoniam/Starscream/tree/2.0.1)

 Bug fixes.

-Fixed:
+Fixed: 
 [#261](https://github.com/daltoniam/Starscream/issues/261)
 [#276](https://github.com/daltoniam/Starscream/issues/276)
 [#267](https://github.com/daltoniam/Starscream/issues/267)
@ -175,7 +167,7 @@ Fixed:

 Added Swift 3 support.

-Fixed:
+Fixed: 
 [#229](https://github.com/daltoniam/Starscream/issues/229)
 [#232](https://github.com/daltoniam/Starscream/issues/232)

@ -185,7 +177,7 @@ Swift 2.3 support.

 #### [1.1.3](https://github.com/daltoniam/Starscream/tree/1.1.3)

-Changed:
+Changed: 
 [#170](https://github.com/daltoniam/Starscream/issues/170)
 [#171](https://github.com/daltoniam/Starscream/issues/171)
 [#174](https://github.com/daltoniam/Starscream/issues/174)
@ -194,14 +186,14 @@ Changed:

 #### [1.1.2](https://github.com/daltoniam/Starscream/tree/1.1.2)

-Fixed:
+Fixed: 
 [#158](https://github.com/daltoniam/Starscream/issues/158)
 [#161](https://github.com/daltoniam/Starscream/issues/161)
 [#164](https://github.com/daltoniam/Starscream/issues/164)

 #### [1.1.1](https://github.com/daltoniam/Starscream/tree/1.1.1)

-Fixed:
+Fixed: 
 [#157](https://github.com/daltoniam/Starscream/issues/157)

 #### [1.1.0](https://github.com/daltoniam/Starscream/tree/1.1.0)
@ -209,7 +201,7 @@ Fixed:
 Changed:
 Moved over to Runloop/default GCD queues to shared queue.

-Fixed:
+Fixed: 
 [#153](https://github.com/daltoniam/Starscream/issues/153)
 [#151](https://github.com/daltoniam/Starscream/issues/151)
 [#150](https://github.com/daltoniam/Starscream/issues/150)
--- a/2
+++ b/2
@ -1,4 +1,4 @@
 source "https://rubygems.org"

 gem "fastlane"
-gem "cocoapods"
+gem "cocoapods", ">= 1.6.0.beta.1"
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -2,22 +2,22 @@ GEM
  remote: https://rubygems.org/
  specs:
    CFPropertyList (3.0.0)
-    activesupport (4.2.11.1)
+    activesupport (4.2.10)
      i18n (~> 0.7)
      minitest (~> 5.1)
      thread_safe (~> 0.3, >= 0.3.4)
      tzinfo (~> 1.1)
-    addressable (2.6.0)
+    addressable (2.5.2)
      public_suffix (>= 2.0.2, < 4.0)
    atomos (0.1.3)
    babosa (1.0.2)
    claide (1.0.2)
-    cocoapods (1.6.1)
+    cocoapods (1.6.0.beta.1)
      activesupport (>= 4.0.2, < 5)
      claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.6.1)
+      cocoapods-core (= 1.6.0.beta.1)
      cocoapods-deintegrate (>= 1.0.2, < 2.0)
-      cocoapods-downloader (>= 1.2.2, < 2.0)
+      cocoapods-downloader (>= 1.2.1, < 2.0)
      cocoapods-plugins (>= 1.0.0, < 2.0)
      cocoapods-search (>= 1.0.0, < 2.0)
      cocoapods-stats (>= 1.0.0, < 2.0)
@ -25,22 +25,22 @@ GEM
      cocoapods-try (>= 1.1.0, < 2.0)
      colored2 (~> 3.1)
      escape (~> 0.0.4)
-      fourflusher (>= 2.2.0, < 3.0)
+      fourflusher (~> 2.0.1)
      gh_inspector (~> 1.0)
      molinillo (~> 0.6.6)
      nap (~> 1.0)
-      ruby-macho (~> 1.4)
-      xcodeproj (>= 1.8.1, < 2.0)
-    cocoapods-core (1.6.1)
+      ruby-macho (~> 1.2)
+      xcodeproj (>= 1.6.0, < 2.0)
+    cocoapods-core (1.6.0.beta.1)
      activesupport (>= 4.0.2, < 6)
      fuzzy_match (~> 2.0.4)
      nap (~> 1.0)
-    cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.2.2)
+    cocoapods-deintegrate (1.0.2)
+    cocoapods-downloader (1.2.1)
    cocoapods-plugins (1.0.0)
      nap
    cocoapods-search (1.0.0)
-    cocoapods-stats (1.1.0)
+    cocoapods-stats (1.0.0)
    cocoapods-trunk (1.3.1)
      nap (>= 0.8, < 2.0)
      netrc (~> 0.11)
@ -49,33 +49,32 @@ GEM
    colored2 (3.1.2)
    commander-fastlane (4.4.6)
      highline (~> 1.7.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.0.5)
    declarative (0.0.10)
    declarative-option (0.1.0)
-    digest-crc (0.4.1)
    domain_name (0.5.20180417)
      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.2)
-    emoji_regex (1.0.1)
+    dotenv (2.5.0)
+    emoji_regex (0.1.1)
    escape (0.0.4)
-    excon (0.64.0)
-    faraday (0.15.4)
+    excon (0.62.0)
+    faraday (0.15.3)
      multipart-post (>= 1.2, < 3)
    faraday-cookie_jar (0.0.6)
      faraday (>= 0.7.4)
      http-cookie (~> 1.0.0)
-    faraday_middleware (0.13.1)
+    faraday_middleware (0.12.2)
      faraday (>= 0.7.4, < 1.0)
-    fastimage (2.1.5)
-    fastlane (2.122.0)
+    fastimage (2.1.4)
+    fastlane (2.105.2)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.3, < 3.0.0)
      babosa (>= 1.0.2, < 2.0.0)
-      bundler (>= 1.12.0, < 3.0.0)
+      bundler (>= 1.12.0, < 2.0.0)
      colored
      commander-fastlane (>= 4.4.6, < 5.0.0)
      dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (>= 0.1, < 2.0)
+      emoji_regex (~> 0.1)
      excon (>= 0.45.0, < 1.0.0)
      faraday (~> 0.9)
      faraday-cookie_jar (~> 0.0.6)
@ -83,7 +82,6 @@ GEM
      fastimage (>= 2.1.0, < 3.0.0)
      gh_inspector (>= 1.1.2, < 2.0.0)
      google-api-client (>= 0.21.2, < 0.24.0)
-      google-cloud-storage (>= 1.15.0, < 2.0.0)
      highline (>= 1.7.2, < 2.0.0)
      json (< 3.0.0)
      mini_magick (~> 4.5.1)
@ -96,15 +94,15 @@ GEM
      security (= 0.1.3)
      simctl (~> 1.6.3)
      slack-notifier (>= 2.0.0, < 3.0.0)
-      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-notifier (>= 1.6.2, < 2.0.0)
      terminal-table (>= 1.4.5, < 2.0.0)
      tty-screen (>= 0.6.3, < 1.0.0)
      tty-spinner (>= 0.8.0, < 1.0.0)
      word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.8.1, < 2.0.0)
+      xcodeproj (>= 1.6.0, < 2.0.0)
      xcpretty (~> 0.3.0)
      xcpretty-travis-formatter (>= 0.0.3)
-    fourflusher (2.2.0)
+    fourflusher (2.0.1)
    fuzzy_match (2.0.4)
    gh_inspector (1.1.3)
    google-api-client (0.23.9)
@ -115,19 +113,10 @@ GEM
      representable (~> 3.0)
      retriable (>= 2.0, < 4.0)
      signet (~> 0.9)
-    google-cloud-core (1.3.0)
-      google-cloud-env (~> 1.0)
-    google-cloud-env (1.0.5)
-      faraday (~> 0.11)
-    google-cloud-storage (1.16.0)
-      digest-crc (~> 0.4)
-      google-api-client (~> 0.23)
-      google-cloud-core (~> 1.2)
-      googleauth (>= 0.6.2, < 0.10.0)
-    googleauth (0.6.7)
+    googleauth (0.6.6)
      faraday (~> 0.12)
      jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
+      memoist (~> 0.12)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
      signet (~> 0.7)
@ -137,12 +126,12 @@ GEM
    httpclient (2.8.3)
    i18n (0.9.5)
      concurrent-ruby (~> 1.0)
-    json (2.2.0)
+    json (2.1.0)
    jwt (2.1.0)
    memoist (0.16.0)
    mime-types (3.2.2)
      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2018.0812)
    mini_magick (4.5.1)
    minitest (5.11.3)
    molinillo (0.6.6)
@ -153,8 +142,8 @@ GEM
    nap (1.1.0)
    naturally (2.2.0)
    netrc (0.11.0)
-    os (1.0.1)
-    plist (3.5.0)
+    os (1.0.0)
+    plist (3.4.0)
    public_suffix (2.0.5)
    representable (3.0.4)
      declarative (< 0.1.0)
@ -162,10 +151,10 @@ GEM
      uber (< 0.2.0)
    retriable (3.1.2)
    rouge (2.0.7)
-    ruby-macho (1.4.0)
+    ruby-macho (1.3.1)
    rubyzip (1.2.2)
    security (0.1.3)
-    signet (0.11.0)
+    signet (0.10.0)
      addressable (~> 2.3)
      faraday (~> 0.9)
      jwt (>= 1.5, < 3.0)
@ -174,23 +163,23 @@ GEM
      CFPropertyList
      naturally
    slack-notifier (2.3.2)
-    terminal-notifier (2.0.0)
+    terminal-notifier (1.8.0)
    terminal-table (1.8.0)
      unicode-display_width (~> 1.1, >= 1.1.1)
    thread_safe (0.3.6)
-    tty-cursor (0.6.1)
+    tty-cursor (0.6.0)
    tty-screen (0.6.5)
-    tty-spinner (0.9.0)
-      tty-cursor (~> 0.6.0)
+    tty-spinner (0.8.0)
+      tty-cursor (>= 0.5.0)
    tzinfo (1.2.5)
      thread_safe (~> 0.1)
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.7.6)
-    unicode-display_width (1.5.0)
+    unf_ext (0.0.7.5)
+    unicode-display_width (1.4.0)
    word_wrap (1.0.0)
-    xcodeproj (1.9.0)
+    xcodeproj (1.6.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
@ -205,8 +194,8 @@ PLATFORMS
  ruby

 DEPENDENCIES
-  cocoapods
+  cocoapods (>= 1.6.0.beta.1)
  fastlane

 BUNDLED WITH
-   1.17.2
+   1.16.1
--- a/Package.resolved
+++ b/Package.resolved
@ -1,15 +1,7 @@
 {
  "object": {
    "pins": [
-      {
-        "package": "swift-nio-zlib-support",
-        "repositoryURL": "https://github.com/apple/swift-nio-zlib-support.git",
-        "state": {
-          "branch": null,
-          "revision": "37760e9a52030bb9011972c5213c3350fa9d41fd",
-          "version": "1.0.0"
-        }
-      }
+
    ]
  },
  "version": 1
--- a/Package.swift
+++ b/Package.swift
@ -27,9 +27,7 @@ let package = Package(
        products: [
            .library(name: "Starscream", targets: ["Starscream"])
        ],
-        dependencies: [
-          .package(url: "https://github.com/apple/swift-nio-zlib-support.git", from: "1.0.0")
-        ],
+        dependencies: [],
        targets: [
            .target(name: "Starscream")
        ]
--- a/README.md
+++ b/README.md
@ -311,29 +311,6 @@ To integrate Starscream into your Xcode project using Carthage, specify it in yo
 github "daltoniam/Starscream" >= 3.0.2
 ```

-### Accio
-
-Check out the [Accio](https://github.com/JamitLabs/Accio) docs on how to add a install. 
-
-Add the following to your Package.swift:
-
-```swift
-.package(url: "https://github.com/daltoniam/Starscream.git", .upToNextMajor(from: "3.1.0")),
-```
-
-Next, add `Starscream` to your App targets dependencies like so:
-
-```swift
-.target(
-    name: "App",
-    dependencies: [
-        "Starscream",
-    ]
-),
-```
-
-Then run `accio update`.
-
 ### Rogue

 First see the [installation docs](https://github.com/acmacalister/Rogue) for how to install Rogue.
@ -408,10 +385,6 @@ func  websocketHttpUpgrade(socket: WebSocketClient, response: CFHTTPMessage) {
 }
 ```

-## Swift versions
-
-* Swift 4.2 - 3.0.6
-
 ## KNOWN ISSUES
 - WatchOS does not have the the CFNetwork String constants to modify the stream's SSL behavior. It will be the default Foundation SSL behavior. This means watchOS CANNOT use `SSLCiphers`,  `disableSSLCertValidation`, or SSL pinning. All these values set on watchOS will do nothing. 
 - Linux does not have the security framework, so it CANNOT use SSL pinning or `SSLCiphers` either. 
--- a/Sources/Info.plist
+++ b/Sources/Info.plist
@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.1</string>
+	<string>3.0.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
--- a/Sources/Starscream/WebSocket.swift
+++ b/Sources/Starscream/WebSocket.swift
@ -433,7 +433,6 @@ open class WebSocket : NSObject, StreamDelegate, WebSocketClient, WSStreamDelega

    private struct CompressionState {
        var supportsCompression = false
-        var messageNeedsDecompression = false
        var serverMaxWindowBits = 15
        var clientMaxWindowBits = 15
        var clientNoContextTakeover = false
@ -447,6 +446,10 @@ open class WebSocket : NSObject, StreamDelegate, WebSocketClient, WSStreamDelega
    private var isConnecting = false
    private let mutex = NSLock()
    private var compressionState = CompressionState()
+    // `currentMessageNeedsDecompression` is not part of the `compressionState` struct
+    // because currentMessageNeedsDecompression can be mutated in the read queue concurrently
+    // with other `compressionState` fields being accesseed on the write queue.
+    private var currentMessageNeedsDecompression = false
    private var writeQueue = OperationQueue()
    private var readStack = [WSResponse]()
    private var inputQueue = [Data]()
@ -996,9 +999,9 @@ open class WebSocket : NSObject, StreamDelegate, WebSocketClient, WSStreamDelega
            let payloadLen = (PayloadLenMask & baseAddress[1])
            var offset = 2
            if compressionState.supportsCompression && receivedOpcode != .continueFrame {
-                compressionState.messageNeedsDecompression = (RSV1Mask & baseAddress[0]) > 0
+                currentMessageNeedsDecompression = (RSV1Mask & baseAddress[0]) > 0
            }
-            if (isMasked > 0 || (RSVMask & baseAddress[0]) > 0) && receivedOpcode != .pong && !compressionState.messageNeedsDecompression {
+            if (isMasked > 0 || (RSVMask & baseAddress[0]) > 0) && receivedOpcode != .pong && !currentMessageNeedsDecompression {
                let errCode = CloseCode.protocolError.rawValue
                doDisconnect(WSError(type: .protocolError, message: "masked and rsv data is not currently supported", code: Int(errCode)))
                writeError(errCode)
@ -1059,7 +1062,7 @@ open class WebSocket : NSObject, StreamDelegate, WebSocketClient, WSStreamDelega
                len -= UInt64(size)
            }
            let data: Data
-            if compressionState.messageNeedsDecompression, let decompressor = compressionState.decompressor {
+            if currentMessageNeedsDecompression, let decompressor = compressionState.decompressor {
                do {
                    data = try decompressor.decompress(bytes: baseAddress+offset, count: Int(len), finish: isFin > 0)
                    if isFin > 0 && compressionState.serverNoContextTakeover {
--- a/Starscream.podspec
+++ b/Starscream.podspec
@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name         = "Starscream"
-  s.version      = "3.1.1"
+  s.version      = "3.0.6"
  s.summary      = "A conforming WebSocket RFC 6455 client library in Swift."
  s.homepage     = "https://github.com/daltoniam/Starscream"
  s.license      = 'Apache License, Version 2.0'
@ -12,5 +12,5 @@ Pod::Spec.new do |s|
  s.tvos.deployment_target = '9.0'
  s.watchos.deployment_target = '2.0'
  s.source_files = 'Sources/**/*.swift'
-  s.swift_version = '5.0'
+  s.swift_version = '4.2'
 end
--- a/Starscream.xcodeproj/project.pbxproj
+++ b/Starscream.xcodeproj/project.pbxproj
@ -170,7 +170,7 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = Vluxe;
 				TargetAttributes = {
 					335FA1F41F5DF71D00F6D2EC = {
@ -186,7 +186,6 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 			);
 			mainGroup = 6B3E79DC19D48B7F006071F7;
@ -246,6 +245,10 @@
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = NO;
 				CLANG_ENABLE_MODULES = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+				);
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@ -255,11 +258,12 @@
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = "";
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator macosx";
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@ -268,16 +272,21 @@
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = NO;
 				CLANG_ENABLE_MODULES = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+				);
 				INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = "";
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator macosx";
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@ -298,10 +307,12 @@
 				OTHER_LDFLAGS = "-all_load";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = "";
 				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos watchos watchsimulator";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 4.0;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@ -324,10 +335,12 @@
 				OTHER_LDFLAGS = "-all_load";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = "";
 				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos watchos watchsimulator";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 4.0;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@ -338,7 +351,6 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				APPLICATION_EXTENSION_API_ONLY = YES;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@ -347,14 +359,12 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				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_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@ -384,10 +394,16 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = "";
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvos appletvsimulator watchsimulator watchos";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
+				VALID_ARCHS = "arm64 armv7s armv7 armv7k";
+				"VALID_ARCHS[sdk=appletvsimulator*]" = "x86_64 i386";
+				"VALID_ARCHS[sdk=iphonesimulator*]" = "x86_64 i386";
+				"VALID_ARCHS[sdk=macosx*]" = "x86_64 i386";
+				"VALID_ARCHS[sdk=watchsimulator*]" = "x86_64 i386";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@ -398,7 +414,6 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				APPLICATION_EXTENSION_API_ONLY = YES;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@ -407,14 +422,12 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				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_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@ -436,10 +449,16 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = "";
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvos appletvsimulator watchsimulator watchos";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				VALIDATE_PRODUCT = YES;
+				VALID_ARCHS = "arm64 armv7s armv7 armv7k";
+				"VALID_ARCHS[sdk=appletvos*]" = "x86_64 i386";
+				"VALID_ARCHS[sdk=iphonesimulator*]" = "x86_64 i386";
+				"VALID_ARCHS[sdk=macosx*]" = "x86_64 i386";
+				"VALID_ARCHS[sdk=watchsimulator*]" = "x86_64 i386";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
--- a/Starscream.xcodeproj/xcshareddata/xcschemes/Starscream.xcscheme
+++ b/Starscream.xcodeproj/xcshareddata/xcschemes/Starscream.xcscheme
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "0900"
   version = "1.7">
   <BuildAction
      parallelizeBuildables = "YES"
@ -26,8 +26,9 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
      <Testables>
         <TestableReference
            skipped = "NO">
@ -60,6 +61,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
--- a/build.sh
+++ b/build.sh
@ -3,4 +3,4 @@
 set -o pipefail && xcodebuild -project Starscream.xcodeproj -scheme Starscream CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO clean build | xcpretty
 swift build
 pod repo update
-pod lib lint --verbose --allow-warnings
+pod lib lint --verbose
--- a/examples/SimpleTest/ws-server.rb
+++ b/examples/SimpleTest/ws-server.rb
@ -19,7 +19,7 @@ EM.run {

    ws.onmessage { |msg|
      puts "message from client: #{msg}"
-      ws.send +Faker::Hacker.say_something_smart
+      ws.send Faker::Hacker.say_something_smart
    }
  end
 }
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@ -3,7 +3,7 @@ default_platform(:ios)
 update_fastlane

 platform :ios do
-  desc "Deploy new version"
+  desc "Depoy new version"
  lane :release do
    ensure_git_branch
    version = version_get_podspec(path: "Starscream.podspec")