Skip to content

Commit d0ccb41

Browse files
authored
Support Swift 5 (#41)
* Support Swift 5, drop Swift 3
1 parent 49e4a7b commit d0ccb41

File tree

4 files changed

+24
-54
lines changed

4 files changed

+24
-54
lines changed

.travis.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ branches:
1111
# by .swift-version, unless SWIFT_SNAPSHOT is specified.
1212
matrix:
1313
include:
14-
- os: linux
15-
dist: trusty
16-
sudo: required
17-
env: SWIFT_SNAPSHOT=3.1.1
1814
- os: linux
1915
dist: trusty
2016
sudo: required
@@ -35,11 +31,12 @@ matrix:
3531
dist: trusty
3632
sudo: required
3733
services: docker
38-
env: DOCKER_IMAGE=ubuntu:18.04
39-
- os: osx
40-
osx_image: xcode8.3
34+
env: DOCKER_IMAGE=ubuntu:16.04 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
35+
- os: linux
36+
dist: trusty
4137
sudo: required
42-
env: SWIFT_SNAPSHOT=3.1.1
38+
services: docker
39+
env: DOCKER_IMAGE=ubuntu:18.04
4340
- os: osx
4441
osx_image: xcode9.2
4542
sudo: required
@@ -51,6 +48,10 @@ matrix:
5148
- os: osx
5249
osx_image: xcode10
5350
sudo: required
51+
- os: osx
52+
osx_image: xcode10.1
53+
sudo: required
54+
env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
5455

5556
before_install:
5657
- git clone https://github.com/IBM-Swift/Package-Builder.git

Package.pins

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

Package.swift

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// swift-tools-version:4.0
2+
// The swift-tools-version declares the minimum version of Swift required to build this package.
3+
14
/**
25
* Copyright IBM Corporation 2016, 2017
36
*
@@ -18,9 +21,18 @@ import PackageDescription
1821

1922
let package = Package(
2023
name: "LoggerAPI",
21-
targets: [
22-
Target(
24+
products: [
25+
// Products define the executables and libraries produced by a package, and make them visible to other packages.
26+
.library(
2327
name: "LoggerAPI",
24-
dependencies: []),
28+
targets: ["LoggerAPI"]
29+
)
30+
],
31+
targets: [
32+
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
33+
// Targets can depend on other targets in this package, and on products in packages which this package depends on.
34+
.target(
35+
name: "LoggerAPI"
36+
)
2537
]
2638
)

[email protected]

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

0 commit comments

Comments
 (0)