Skip to content

Commit ec2e1bd

Browse files
authored
Merge pull request #75 from ra1028/spm
Add Package.swift for Swift5
2 parents df9885b + 3466dbc commit ec2e1bd

3 files changed

Lines changed: 29 additions & 3 deletions

File tree

Package.swift

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
// swift-tools-version:4.2
1+
// swift-tools-version:5.0
22

33
import PackageDescription
44

55
let package = Package(
66
name: "DifferenceKit",
7+
platforms: [
8+
.iOS(.v9), .macOS(.v10_10), .tvOS(.v9), .watchOS(.v2)
9+
],
710
products: [
811
.library(name: "DifferenceKit", targets: ["DifferenceKit"])
912
],
@@ -17,5 +20,6 @@ let package = Package(
1720
dependencies: ["DifferenceKit"],
1821
path: "Tests"
1922
)
20-
]
23+
],
24+
swiftLanguageVersions: [.v4_2, .v5]
2125
)

Package@swift-4.2.swift

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// swift-tools-version:4.2
2+
3+
import PackageDescription
4+
5+
let package = Package(
6+
name: "DifferenceKit",
7+
products: [
8+
.library(name: "DifferenceKit", targets: ["DifferenceKit"])
9+
],
10+
targets: [
11+
.target(
12+
name: "DifferenceKit",
13+
path: "Sources"
14+
),
15+
.testTarget(
16+
name: "DifferenceKitTests",
17+
dependencies: ["DifferenceKit"],
18+
path: "Tests"
19+
)
20+
],
21+
swiftLanguageVersions: [.v4_2]
22+
)

test-linux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if [[ `uname` == "Darwin" ]]; then
1818

1919
echo "Starting to running tests on Linux by Docker..."
2020
docker-machine create --driver virtualbox $DOCKER_HOST_NAME || true
21-
docker run -v $WORKING_DIR:$WORKING_DIR -w $WORKING_DIR -it --privileged swift:latest bash -c "$0" || true
21+
docker run -v $WORKING_DIR:$WORKING_DIR -w $WORKING_DIR -it --privileged swift:latest bash -c "bash $0" || true
2222
docker-machine stop $DOCKER_HOST_NAME || true
2323
docker-machine rm -f $DOCKER_HOST_NAME || true
2424
echo "Finish"

0 commit comments

Comments
 (0)