Remove 'WITH_ENCRYPTION' compiler flag from SDK source files

Daniel Browne · Daniel Browne · commit 02ddd4cf1b7e · 2020-11-25T15:54:51.000Z
diff --git a/Package.swift b/Package.swift
@@ -24,8 +24,7 @@ let package = Package(
         .testTarget(
             name: "PusherSwiftTests",
             dependencies: ["PusherSwift"],
-            path: "Tests",
-            swiftSettings: [.define("WITH_ENCRYPTION")]
+            path: "Tests"
         )
     ],
     swiftLanguageVersions: [.v5]
diff --git a/Tests/Helpers/Helpers.swift b/Tests/Helpers/Helpers.swift
@@ -1,10 +1,6 @@
 import Foundation
 
-#if WITH_ENCRYPTION
-    @testable import PusherSwiftWithEncryption
-#else
-    @testable import PusherSwift
-#endif
+@testable import PusherSwift
 
 func convertStringToDictionary(_ text: String) -> [String: AnyObject]? {
     if let data = text.data(using: .utf8) {
diff --git a/Tests/Helpers/Mocks.swift b/Tests/Helpers/Mocks.swift
@@ -2,11 +2,7 @@ import Foundation
 import NWWebSocket
 import Network
 
-#if WITH_ENCRYPTION
-    @testable import PusherSwiftWithEncryption
-#else
-    @testable import PusherSwift
-#endif
+@testable import PusherSwift
 
 open class MockWebSocket: NWWebSocket {
     let stubber = StubberForMocks()
diff --git a/Tests/Integration/AuthenticationTests.swift b/Tests/Integration/AuthenticationTests.swift
@@ -2,11 +2,7 @@ import XCTest
 
 // swiftlint:disable nesting
 
-#if WITH_ENCRYPTION
-    @testable import PusherSwiftWithEncryption
-#else
-    @testable import PusherSwift
-#endif
+@testable import PusherSwift
 
 class AuthenticationTests: XCTestCase {
     class DummyDelegate: PusherDelegate {
diff --git a/Tests/Integration/PusherClientInitializationTests.swift b/Tests/Integration/PusherClientInitializationTests.swift
@@ -1,10 +1,6 @@
 import XCTest
 
-#if WITH_ENCRYPTION
-    @testable import PusherSwiftWithEncryption
-#else
-    @testable import PusherSwift
-#endif
+@testable import PusherSwift
 
 let VERSION = "9.0.0"
 
diff --git a/Tests/Integration/PusherIncomingEventHandlingTests.swift b/Tests/Integration/PusherIncomingEventHandlingTests.swift
@@ -1,10 +1,6 @@
 import XCTest
 
-#if WITH_ENCRYPTION
-    @testable import PusherSwiftWithEncryption
-#else
-    @testable import PusherSwift
-#endif
+@testable import PusherSwift
 
 // swiftlint:disable unused_closure_parameter
 
diff --git a/Tests/Integration/PusherTopLevelAPITests.swift b/Tests/Integration/PusherTopLevelAPITests.swift
@@ -1,10 +1,6 @@
 import XCTest
 
-#if WITH_ENCRYPTION
-    @testable import PusherSwiftWithEncryption
-#else
-    @testable import PusherSwift
-#endif
+@testable import PusherSwift
 
 // swiftlint:disable unused_closure_parameter
 
diff --git a/Tests/Unit/Helpers/PusherCryptoTest.swift b/Tests/Unit/Helpers/PusherCryptoTest.swift
@@ -1,10 +1,6 @@
 import XCTest
 
-#if WITH_ENCRYPTION
-    @testable import PusherSwiftWithEncryption
-#else
-    @testable import PusherSwift
-#endif
+@testable import PusherSwift
 
 class PusherCryptoTest: XCTestCase {
     func testHMACGeneratorGeneratesCorrectMAC() {
diff --git a/Tests/Unit/Helpers/PusherEventFactoryTests.swift b/Tests/Unit/Helpers/PusherEventFactoryTests.swift
@@ -1,10 +1,6 @@
 import XCTest
 
-#if WITH_ENCRYPTION
-    @testable import PusherSwiftWithEncryption
-#else
-    @testable import PusherSwift
-#endif
+@testable import PusherSwift
 
 class PusherEventFactoryTests: XCTestCase {
 
diff --git a/Tests/Unit/Models/ClientEventTests.swift b/Tests/Unit/Models/ClientEventTests.swift
@@ -1,10 +1,6 @@
 import XCTest
 
-#if WITH_ENCRYPTION
-    @testable import PusherSwiftWithEncryption
-#else
-    @testable import PusherSwift
-#endif
+@testable import PusherSwift
 
 class ClientEventTests: XCTestCase {
     var connection: MockPusherConnection!
diff --git a/Tests/Unit/Models/PresenceChannelTests.swift b/Tests/Unit/Models/PresenceChannelTests.swift
@@ -1,10 +1,6 @@
 import XCTest
 
-#if WITH_ENCRYPTION
-    @testable import PusherSwiftWithEncryption
-#else
-    @testable import PusherSwift
-#endif
+@testable import PusherSwift
 
 class PusherPresenceChannelTests: XCTestCase {
     var pusher: Pusher!
diff --git a/Tests/Unit/Models/PusherChannelTests.swift b/Tests/Unit/Models/PusherChannelTests.swift
@@ -1,10 +1,6 @@
 import XCTest
 
-#if WITH_ENCRYPTION
-    @testable import PusherSwiftWithEncryption
-#else
-    @testable import PusherSwift
-#endif
+@testable import PusherSwift
 
 class PusherChannelTests: XCTestCase {
     var chan: PusherChannel!
diff --git a/Tests/Unit/Protocols/PusherConnectionDelegateTests.swift b/Tests/Unit/Protocols/PusherConnectionDelegateTests.swift
@@ -1,10 +1,6 @@
 import XCTest
 
-#if WITH_ENCRYPTION
-    @testable import PusherSwiftWithEncryption
-#else
-    @testable import PusherSwift
-#endif
+@testable import PusherSwift
 
 class PusherConnectionDelegateTests: XCTestCase {
     open class DummyDelegate: PusherDelegate {
diff --git a/Tests/Unit/Services/PusherConnectionTests.swift b/Tests/Unit/Services/PusherConnectionTests.swift
@@ -2,11 +2,7 @@ import XCTest
 
 // swiftlint:disable nesting
 
-#if WITH_ENCRYPTION
-    @testable import PusherSwiftWithEncryption
-#else
-    @testable import PusherSwift
-#endif
+@testable import PusherSwift
 
 class PusherConnectionTests: XCTestCase {
     var key: String!
diff --git a/Tests/Unit/Services/PusherEventQueueTests.swift b/Tests/Unit/Services/PusherEventQueueTests.swift
@@ -1,10 +1,6 @@
 import XCTest
 
-#if WITH_ENCRYPTION
-    @testable import PusherSwiftWithEncryption
-#else
-    @testable import PusherSwift
-#endif
+@testable import PusherSwift
 
 // swiftlint:disable unused_closure_parameter
 
