Skip to content

Commit

Permalink
Merge pull request ra1028#75 from ra1028/spm
Browse files Browse the repository at this point in the history
Add Package.swift for Swift5
  • Loading branch information
ra1028 committed Jun 17, 2019
2 parents df9885b + 3466dbc commit ec2e1bd
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 3 deletions.
8 changes: 6 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
// swift-tools-version:4.2
// swift-tools-version:5.0

import PackageDescription

let package = Package(
name: "DifferenceKit",
platforms: [
.iOS(.v9), .macOS(.v10_10), .tvOS(.v9), .watchOS(.v2)
],
products: [
.library(name: "DifferenceKit", targets: ["DifferenceKit"])
],
Expand All @@ -17,5 +20,6 @@ let package = Package(
dependencies: ["DifferenceKit"],
path: "Tests"
)
]
],
swiftLanguageVersions: [.v4_2, .v5]
)
22 changes: 22 additions & 0 deletions [email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// swift-tools-version:4.2

import PackageDescription

let package = Package(
name: "DifferenceKit",
products: [
.library(name: "DifferenceKit", targets: ["DifferenceKit"])
],
targets: [
.target(
name: "DifferenceKit",
path: "Sources"
),
.testTarget(
name: "DifferenceKitTests",
dependencies: ["DifferenceKit"],
path: "Tests"
)
],
swiftLanguageVersions: [.v4_2]
)
2 changes: 1 addition & 1 deletion test-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if [[ `uname` == "Darwin" ]]; then

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

0 comments on commit ec2e1bd

Please sign in to comment.