Skip to content

Commit 064c08e

Browse files
authored
Merge pull request #101 from noppoMan/swift4.1
Support Swift 4.1 and no longer support Swift 3
2 parents 55818c6 + 263cf10 commit 064c08e

5 files changed

Lines changed: 61 additions & 80 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ os:
44
language: generic
55
sudo: required
66
dist: trusty
7-
osx_image: xcode9
7+
osx_image: xcode9.4
88

99
install:
1010
- source Scripts/install-swift.sh

Package.resolved

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

Package.swift

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,32 @@
1-
// swift-tools-version:3.1
2-
1+
// swift-tools-version:4.0
32
import PackageDescription
43

54
let package = Package(
65
name: "Hexaville",
7-
targets: [
8-
Target(name: "HexavilleCore"),
9-
Target(name: "Hexaville", dependencies: ["HexavilleCore"])
6+
products: [
7+
.library(name: "HexavilleCore", targets: ["HexavilleCore"]),
8+
.executable(name: "hexaville", targets: ["Hexaville"])
109
],
1110
dependencies: [
12-
.Package(url: "https://github.com/swift-aws/s3.git", majorVersion: 0, minor: 3),
13-
.Package(url: "https://github.com/swift-aws/lambda.git", majorVersion: 0, minor: 3),
14-
.Package(url: "https://github.com/swift-aws/iam.git", majorVersion: 0, minor: 3),
15-
.Package(url: "https://github.com/swift-aws/apigateway.git", majorVersion: 0, minor: 3),
16-
.Package(url: "https://github.com/IBM-Swift/SwiftyJSON.git", majorVersion: 16),
17-
.Package(url: "https://github.com/jakeheis/SwiftCLI.git", majorVersion: 3, minor: 1),
18-
.Package(url: "https://github.com/behrang/YamlSwift.git", majorVersion: 3)
11+
.package(url: "https://github.com/swift-aws/s3.git", .upToNextMajor(from: "1.1.6")),
12+
.package(url: "https://github.com/swift-aws/lambda.git", .upToNextMajor(from: "1.1.6")),
13+
.package(url: "https://github.com/swift-aws/iam.git", .upToNextMajor(from: "1.1.6")),
14+
.package(url: "https://github.com/swift-aws/apigateway.git", .upToNextMajor(from: "1.1.6")),
15+
.package(url: "https://github.com/IBM-Swift/SwiftyJSON.git", .upToNextMajor(from: "17.0.1")),
16+
.package(url: "https://github.com/jakeheis/SwiftCLI.git", .upToNextMajor(from: "5.0.0")),
17+
.package(url: "https://github.com/behrang/YamlSwift.git", .upToNextMajor(from: "3.4.3"))
18+
],
19+
targets: [
20+
.target(name: "HexavilleCore", dependencies: [
21+
"SwiftAWSS3",
22+
"SwiftAWSLambda",
23+
"SwiftAWSIam",
24+
"SwiftAWSApigateway",
25+
"SwiftyJSON",
26+
"SwiftCLI",
27+
"Yaml",
28+
]),
29+
.target(name: "Hexaville", dependencies: ["HexavilleCore"]),
30+
.testTarget(name: "HexavilleTests", dependencies: ["HexavilleCore"])
1931
]
2032
)

Package@swift-4.swift

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

Scripts/install-swift.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ fi
2424

2525
if [[ $OS != "macos" ]];
2626
then
27+
sudo apt-get update
2728
sudo apt-get install -y clang libicu-dev uuid-dev
2829

2930
if [[ $OS == "ubuntu1510" ]];

0 commit comments

Comments
 (0)