Move CommonCrypto and zlib dependencies mapping to custom module map

Package.resolved

@@ -0,0 +1,25 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "SSCommonCrypto",
+        "repositoryURL": "https://github.com/daltoniam/common-crypto-spm",
+        "state": {
+          "branch": null,
+          "revision": "2eb3aff0fb57f92f5722fac5d6d20bf64669ca66",
+          "version": "1.1.0"
+        }
+      },
+      {
+        "package": "SSCZLib",
+        "repositoryURL": "https://github.com/daltoniam/zlib-spm.git",
+        "state": {
+          "branch": null,
+          "revision": "83ac8d719a2f3aa775dbdf116a57f56fb2c49abb",
+          "version": "1.1.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}

Package.swift

@@ -1,3 +1,5 @@
+// swift-tools-version:4.0
+
 //
 //  Package.Swift
 //  Starscream
@@ -21,12 +23,15 @@
 import PackageDescription
 
 let package = Package(
-    name: "Starscream",
-    dependencies: [
-        .Package(url: "https://github.com/daltoniam/zlib-spm.git",
-    majorVersion: 1, minor: 1),
-        .Package(url: "https://github.com/daltoniam/common-crypto-spm",
-                 majorVersion: 1, minor: 1),
+        name: "Starscream",
+        products: [
+                .library(name: "Starscream", targets: ["Starscream"])
+        ],
+        dependencies: [
+                .package(url: "https://github.com/daltoniam/zlib-spm.git", from: "1.1.0"),
+                .package(url: "https://github.com/daltoniam/common-crypto-spm", from: "1.1.0")
         ],
-    exclude: ["Tests", "examples"]
+        targets: [
+                .target(name: "Starscream")
+        ]
 )

Sources/Compression.swift → Sources/Starscream/Compression.swift

@@ -27,7 +27,7 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
 import Foundation
-import SSCZLib
+import Starscream.SSCZLib
 
 class Decompressor {
     private var strm = z_stream()

Sources/WebSocket.swift → Sources/Starscream/WebSocket.swift

@@ -21,7 +21,7 @@
 
 import Foundation
 import CoreFoundation
-import SSCommonCrypto
+import Starscream.SSCommonCrypto
 
 public let WebsocketDidConnectNotification = "WebsocketDidConnectNotification"
 public let WebsocketDidDisconnectNotification = "WebsocketDidDisconnectNotification"
@@ -1318,10 +1318,7 @@ open class WebSocket : NSObject, StreamDelegate, WebSocketClient, WSStreamDelega
 
 private extension String {
     func sha1Base64() -> String {
-        let data = self.data(using: String.Encoding.utf8)!
-        var digest = [UInt8](repeating: 0, count:Int(CC_SHA1_DIGEST_LENGTH))
-        data.withUnsafeBytes { _ = CC_SHA1($0, CC_LONG(data.count), &digest) }
-        return Data(bytes: digest).base64EncodedString()
+        return (self as NSString).ss_SHA1Base64Digest()
     }
 }
 

Sources/modulemap/CommonCrypto/NSString+SHA1.h

@@ -0,0 +1,29 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  NSString+SHA1.h
+//  Starscream
+//
+//  Created by Sergey Lem on 6/25/18.
+//  Copyright (c) 2014-2016 Dalton Cherry.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+#import <Foundation/Foundation.h>
+
+@interface NSString (SHA1)
+
+- (NSString *)ss_SHA1Base64Digest;
+
+@end

Sources/modulemap/CommonCrypto/NSString+SHA1.m

@@ -0,0 +1,35 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  NSString+SHA1.m
+//  Starscream
+//
+//  Created by Sergey Lem on 6/25/18.
+//  Copyright (c) 2014-2016 Dalton Cherry.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+#import "NSString+SHA1.h"
+#import <CommonCrypto/CommonDigest.h>
+
+@implementation NSString (SHA1)
+
+- (NSString *)ss_SHA1Base64Digest {
+    NSData *stringData = [self dataUsingEncoding:NSUTF8StringEncoding];
+    NSMutableData *digest = [NSMutableData dataWithLength:CC_SHA1_DIGEST_LENGTH];
+    CC_SHA1(stringData.bytes, (CC_LONG)stringData.length, digest.mutableBytes);
+    return [[NSString alloc] initWithData:[digest base64EncodedDataWithOptions:0] encoding:NSUTF8StringEncoding];
+}
+
+@end

Sources/modulemap/Starscream.modulemap

@@ -0,0 +1,16 @@
+framework module Starscream {
+    umbrella header "Starscream.h"
+
+    export *
+
+    explicit module SSCZLib [system] {
+        header "include.h"
+        link "z"
+        export *
+    }
+    explicit module SSCommonCrypto [system] {
+        private header "NSString+SHA1.h"
+        link "CommonCrypto"
+        export *
+    }
+}

Sources/modulemap/zlib/include.h

@@ -0,0 +1 @@
+#include <zlib.h>

Starscream.podspec

@@ -11,11 +11,10 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = '10.10'
   s.tvos.deployment_target = '9.0'
   s.watchos.deployment_target = '2.0'
-  s.source_files = 'Sources/*.swift'
-  s.libraries    = 'z'
+  s.source_files = 'Sources/**/*.{h,m,swift}'
+  s.module_map = 'Sources/modulemap/Starscream.modulemap'
+  s.private_header_files = 'Sources/modulemap/**/*.h'
   s.pod_target_xcconfig = {
-  'SWIFT_VERSION' => '4.1',
-  'SWIFT_INCLUDE_PATHS' => '$(PODS_ROOT)/Starscream/zlib'
+  'SWIFT_VERSION' => '4.1'
   }
-  s.preserve_paths = 'zlib/*'
 end