diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000..3f19393 --- /dev/null +++ b/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 +} diff --git a/Package.swift b/Package.swift index cf99ca6..d0d3198 100644 --- a/Package.swift +++ b/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"]) ], - exclude: ["Tests", "examples"] + 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") + ], + targets: [ + .target(name: "Starscream") + ] ) diff --git a/Sources/Compression.swift b/Sources/Starscream/Compression.swift similarity index 100% rename from Sources/Compression.swift rename to Sources/Starscream/Compression.swift diff --git a/Sources/SSLClientCertificate.swift b/Sources/Starscream/SSLClientCertificate.swift similarity index 100% rename from Sources/SSLClientCertificate.swift rename to Sources/Starscream/SSLClientCertificate.swift diff --git a/Sources/SSLSecurity.swift b/Sources/Starscream/SSLSecurity.swift similarity index 100% rename from Sources/SSLSecurity.swift rename to Sources/Starscream/SSLSecurity.swift diff --git a/Sources/WebSocket.swift b/Sources/Starscream/WebSocket.swift similarity index 100% rename from Sources/WebSocket.swift rename to Sources/Starscream/WebSocket.swift diff --git a/Starscream.xcodeproj/project.pbxproj b/Starscream.xcodeproj/project.pbxproj index d3954f2..1f85557 100644 --- a/Starscream.xcodeproj/project.pbxproj +++ b/Starscream.xcodeproj/project.pbxproj @@ -7,39 +7,37 @@ objects = { /* Begin PBXBuildFile section */ - 335FA1F61F5DF71D00F6D2EC /* Compression.swift in Sources */ = {isa = PBXBuildFile; fileRef = D88EAF7E1ED4DFB5004FE2C3 /* Compression.swift */; }; - 335FA1F71F5DF71D00F6D2EC /* SSLSecurity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C135FFF1C473BEF00AA3A01 /* SSLSecurity.swift */; }; - 335FA1F81F5DF71D00F6D2EC /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C1360011C473BEF00AA3A01 /* WebSocket.swift */; }; 335FA1F91F5DF71D00F6D2EC /* CompressionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D88EAF831ED4E7D8004FE2C3 /* CompressionTests.swift */; }; 335FA1FA1F5DF71D00F6D2EC /* StarscreamTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742419BB1DC6BDBA003ACE43 /* StarscreamTests.swift */; }; 335FA1FC1F5DF71D00F6D2EC /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D88EAF811ED4DFD3004FE2C3 /* libz.tbd */; }; - 33CCF0861F5DDC030099B092 /* Compression.swift in Sources */ = {isa = PBXBuildFile; fileRef = D88EAF7E1ED4DFB5004FE2C3 /* Compression.swift */; }; - 33CCF0871F5DDC030099B092 /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C1360011C473BEF00AA3A01 /* WebSocket.swift */; }; - 33CCF0881F5DDC030099B092 /* SSLSecurity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C135FFF1C473BEF00AA3A01 /* SSLSecurity.swift */; }; 33CCF08A1F5DDC030099B092 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D88EAF811ED4DFD3004FE2C3 /* libz.tbd */; }; 33CCF08C1F5DDC030099B092 /* Starscream.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1360001C473BEF00AA3A01 /* Starscream.h */; settings = {ATTRIBUTES = (Public, ); }; }; 33CCF08D1F5DDC030099B092 /* include.h in Headers */ = {isa = PBXBuildFile; fileRef = D85927D71ED76F25003460CB /* include.h */; }; - EACFF1BF2052FE8F00B95FFF /* SSLClientCertificate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EACFF1BE2052FE8F00B95FFF /* SSLClientCertificate.swift */; }; + 742D12982157CF56006026D7 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33CCF0921F5DDC030099B092 /* Starscream.framework */; }; + DD52B623663980FECD3F6690 /* Compression.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD52B83305DE12CC7F8887D6 /* Compression.swift */; }; + DD52B7C033385CD7CF246CC5 /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD52B820CB852287AC065D9C /* WebSocket.swift */; }; + DD52BC079AD583D2DA35D7E7 /* SSLClientCertificate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD52B329FF434097A6C8F66E /* SSLClientCertificate.swift */; }; + DD52BED25D3DBBB3BC28471B /* SSLSecurity.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD52B3F585852EF29B21F0DB /* SSLSecurity.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 335FA2021F5DF71D00F6D2EC /* Starscream Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Starscream Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 33CCF0921F5DDC030099B092 /* Starscream.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Starscream.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 5C135FFF1C473BEF00AA3A01 /* SSLSecurity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SSLSecurity.swift; path = Sources/SSLSecurity.swift; sourceTree = SOURCE_ROOT; }; 5C1360001C473BEF00AA3A01 /* Starscream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Starscream.h; path = Sources/Starscream.h; sourceTree = SOURCE_ROOT; }; - 5C1360011C473BEF00AA3A01 /* WebSocket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WebSocket.swift; path = Sources/WebSocket.swift; sourceTree = SOURCE_ROOT; }; 5C13600C1C473BFE00AA3A01 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Sources/Info.plist; sourceTree = SOURCE_ROOT; }; 5CAAB5D01F7987D800F3C556 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS4.0.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; }; 6B3E7A0019D48C2F006071F7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 742419BB1DC6BDBA003ACE43 /* StarscreamTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StarscreamTests.swift; path = StarscreamTests/StarscreamTests.swift; sourceTree = ""; }; D85927D61ED761A0003460CB /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = ""; }; D85927D71ED76F25003460CB /* include.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = include.h; sourceTree = ""; }; - D88EAF7E1ED4DFB5004FE2C3 /* Compression.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Compression.swift; path = Sources/Compression.swift; sourceTree = SOURCE_ROOT; }; D88EAF811ED4DFD3004FE2C3 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; D88EAF831ED4E7D8004FE2C3 /* CompressionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CompressionTests.swift; sourceTree = ""; }; D88EAF8D1ED4E92E004FE2C3 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; }; D88EAF901ED4E949004FE2C3 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS10.2.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; }; - EACFF1BE2052FE8F00B95FFF /* SSLClientCertificate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SSLClientCertificate.swift; sourceTree = ""; }; + DD52B329FF434097A6C8F66E /* SSLClientCertificate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SSLClientCertificate.swift; path = Starscream/SSLClientCertificate.swift; sourceTree = ""; }; + DD52B3F585852EF29B21F0DB /* SSLSecurity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SSLSecurity.swift; path = Starscream/SSLSecurity.swift; sourceTree = ""; }; + DD52B820CB852287AC065D9C /* WebSocket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WebSocket.swift; path = Starscream/WebSocket.swift; sourceTree = ""; }; + DD52B83305DE12CC7F8887D6 /* Compression.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Compression.swift; path = Starscream/Compression.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -47,6 +45,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 742D12982157CF56006026D7 /* Starscream.framework in Frameworks */, 335FA1FC1F5DF71D00F6D2EC /* libz.tbd in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -86,11 +85,11 @@ isa = PBXGroup; children = ( 5C1360001C473BEF00AA3A01 /* Starscream.h */, - 5C135FFF1C473BEF00AA3A01 /* SSLSecurity.swift */, - 5C1360011C473BEF00AA3A01 /* WebSocket.swift */, - D88EAF7E1ED4DFB5004FE2C3 /* Compression.swift */, - EACFF1BE2052FE8F00B95FFF /* SSLClientCertificate.swift */, 6B3E79E919D48B7F006071F7 /* Supporting Files */, + DD52B820CB852287AC065D9C /* WebSocket.swift */, + DD52B329FF434097A6C8F66E /* SSLClientCertificate.swift */, + DD52B3F585852EF29B21F0DB /* SSLSecurity.swift */, + DD52B83305DE12CC7F8887D6 /* Compression.swift */, ); path = Sources; sourceTree = ""; @@ -239,9 +238,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 335FA1F61F5DF71D00F6D2EC /* Compression.swift in Sources */, - 335FA1F71F5DF71D00F6D2EC /* SSLSecurity.swift in Sources */, - 335FA1F81F5DF71D00F6D2EC /* WebSocket.swift in Sources */, 335FA1F91F5DF71D00F6D2EC /* CompressionTests.swift in Sources */, 335FA1FA1F5DF71D00F6D2EC /* StarscreamTests.swift in Sources */, ); @@ -251,10 +247,10 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 33CCF0861F5DDC030099B092 /* Compression.swift in Sources */, - EACFF1BF2052FE8F00B95FFF /* SSLClientCertificate.swift in Sources */, - 33CCF0871F5DDC030099B092 /* WebSocket.swift in Sources */, - 33CCF0881F5DDC030099B092 /* SSLSecurity.swift in Sources */, + DD52B7C033385CD7CF246CC5 /* WebSocket.swift in Sources */, + DD52BC079AD583D2DA35D7E7 /* SSLClientCertificate.swift in Sources */, + DD52BED25D3DBBB3BC28471B /* SSLSecurity.swift in Sources */, + DD52B623663980FECD3F6690 /* Compression.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Tests/CompressionTests.swift b/Tests/CompressionTests.swift index abb8996..d62560b 100644 --- a/Tests/CompressionTests.swift +++ b/Tests/CompressionTests.swift @@ -20,6 +20,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////// import XCTest +@testable import Starscream class CompressionTests: XCTestCase {