Skip to content

Commit 974d71b

Browse files
JonathanDowningTomKemp
authored andcommitted
Update Package.swift (#224)
* Update Package.swift * Add Swift 4.2 Compatibility * Add Test Target * Update Dependency Versions * Remove low value ObjC tests so we're not mixing languages in a target * Update SPM package file to match Podspec * Use Starscream version with compatible Package.swift
1 parent 5f2724a commit 974d71b

File tree

6 files changed

+63
-71
lines changed

6 files changed

+63
-71
lines changed

Package.resolved

Lines changed: 34 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,32 @@
1+
// swift-tools-version:4.2
2+
13
import PackageDescription
24

35
let package = Package(
46
name: "PusherSwift",
5-
exclude: ["Tests"]
7+
products: [
8+
.library(name: "PusherSwift", targets: ["PusherSwift"])
9+
],
10+
dependencies: [
11+
.package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", .upToNextMajor(from: "0.9.0")),
12+
.package(url: "https://github.com/ashleymills/Reachability.swift.git", .exact("4.3.0")),
13+
.package(url: "https://github.com/daltoniam/Starscream.git", .exact("3.0.6")),
14+
],
15+
targets: [
16+
.target(
17+
name: "PusherSwift",
18+
dependencies: [
19+
"CryptoSwift",
20+
"Reachability",
21+
"Starscream",
22+
],
23+
path: "Sources"
24+
),
25+
.testTarget(
26+
name: "PusherSwiftTests",
27+
dependencies: ["PusherSwift"],
28+
path: "Tests"
29+
)
30+
],
31+
swiftLanguageVersions: [.v4_2]
632
)

PusherSwift.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
E2498293231E612700CFBBD6 /* PusherError.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2498292231E612700CFBBD6 /* PusherError.swift */; };
3636
E24D0AA522D798C8009DE31B /* PusherEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = E24D0AA422D798C8009DE31B /* PusherEvent.swift */; };
3737
E29A4CBC2301BA31000BC499 /* PusherEventTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E29A4CBB2301BA31000BC499 /* PusherEventTests.swift */; };
38-
E2CAFF0322FB09EF007915A7 /* PusherObjectiveCAPITests.m in Sources */ = {isa = PBXBuildFile; fileRef = E2CAFEFD22FB084B007915A7 /* PusherObjectiveCAPITests.m */; };
3938
E2CFE43122D79CA7004187C3 /* PusherParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2CFE43022D79CA7004187C3 /* PusherParser.swift */; };
4039
/* End PBXBuildFile section */
4140

@@ -82,7 +81,6 @@
8281
E2498292231E612700CFBBD6 /* PusherError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PusherError.swift; sourceTree = "<group>"; };
8382
E24D0AA422D798C8009DE31B /* PusherEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PusherEvent.swift; sourceTree = "<group>"; };
8483
E29A4CBB2301BA31000BC499 /* PusherEventTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PusherEventTests.swift; sourceTree = "<group>"; };
85-
E2CAFEFD22FB084B007915A7 /* PusherObjectiveCAPITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PusherObjectiveCAPITests.m; sourceTree = "<group>"; };
8684
E2CFE43022D79CA7004187C3 /* PusherParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PusherParser.swift; sourceTree = "<group>"; };
8785
/* End PBXFileReference section */
8886

@@ -170,7 +168,6 @@
170168
33A962751D8943CA00DA421E /* PusherConnectionDelegateTests.swift */,
171169
33BB99651D21226C00B25C2A /* PusherIncomingEventHandlingTests.swift */,
172170
33BB99661D21226C00B25C2A /* PusherTopLevelAPITests.swift */,
173-
E2CAFEFD22FB084B007915A7 /* PusherObjectiveCAPITests.m */,
174171
33BB99671D21226C00B25C2A /* Info.plist */,
175172
E29A4CBB2301BA31000BC499 /* PusherEventTests.swift */,
176173
);
@@ -358,7 +355,6 @@
358355
E29A4CBC2301BA31000BC499 /* PusherEventTests.swift in Sources */,
359356
33BB99761D21230100B25C2A /* Mocks.swift in Sources */,
360357
33A962771D89483600DA421E /* PusherConnectionDelegateTests.swift in Sources */,
361-
E2CAFF0322FB09EF007915A7 /* PusherObjectiveCAPITests.m in Sources */,
362358
);
363359
runOnlyForDeploymentPostprocessing = 0;
364360
};

Tests/Helpers.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import Foundation
12
import PusherSwift
23

34
func convertStringToDictionary(_ text: String) -> [String: AnyObject]? {

Tests/Mocks.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import Foundation
12
import PusherSwift
23
import Starscream
34

Tests/PusherObjectiveCAPITests.m

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)