Skip to content

Commit c687182

Browse files
authored
Tolerate Swift 5 (#42)
1 parent 693d2d2 commit c687182

3 files changed

Lines changed: 59 additions & 12 deletions

File tree

.travis.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
branches:
22
only:
33
- master
4-
- develop
54
- /^issue.*$/
65

7-
notifications:
8-
slack:
9-
secure: "a8YICVgxrxDWGRytxE1btfADbQEsSlIoxigk8bwuK0RWfuRQVlWkfB1eRpAmSVbyxeMbVH4D5rY7b7R4mH6erfCB1wEsh5nMrataBzPa5AR3zaqu6cYYUOpZJQfMjGCUBtH0xqcC4YWGmqdxSfpNGV+xyTG9WKTuOirz0elZT9NqlgmXrGjn+BamiuTC8I0KYb3Pmv/WWP012rKzJUb+D0I4OLE0iQgGC5gVfB9RxtB+2ZuhtLcSdDpI9ugkRTNV/q6bfZ+iZLZY5vLh9DtJiOT7I9j3KkrrD3+kJs9z8AsIHUyIEsgwsD6ZkMboEpPPnrXXMsENaj7f+IxugqURslgANqnPgl1cR8YHA865pMY1PUD9oWk5yPtQZ3CLrp4Tr/DNF3NI58QWwQxnGkRQERMxPiECxU6if5PQmX/utgmd36TGZPGb1iLYo3RAIok6EyhYsz8OdYSkbNMvMWcnpw17Zbi84izNJ9KslK7uwheTZ0cPwKeKFm9Tj801CM+9Qa22JxSjdSx45NIrcpdiAihb/cpmiPSsLyDqSyLl6Z8ABFELl70EJTJQ1+V1u9AsY0cMcvM3xe9Ra1oR1ydydzyjnQpxTowcCcKoyiDSukRuRwpQYq8galvLKdvhQmZkpWA/klUFT4X24AVFCtYpFCzVdHUmA7qHOAK2ezWT+OA="
10-
116
matrix:
127
include:
138
- os: linux
@@ -17,21 +12,30 @@ matrix:
1712
dist: trusty
1813
sudo: required
1914
env: SWIFT_SNAPSHOT=4.0.3
20-
- os: linux
21-
dist: trusty
22-
sudo: required
23-
env: SWIFT_SNAPSHOT=4.1-DEVELOPMENT-SNAPSHOT-2018-02-26-a
15+
# Tests fail on Swift 4.2 on Linux.
16+
# - os: linux
17+
# dist: trusty
18+
# sudo: required
19+
# env: DOCKER_IMAGE=ubuntu:16.04 SWIFT_SNAPSHOT=4.2.1
20+
# - os: linux
21+
# dist: trusty
22+
# sudo: required
23+
# env: DOCKER_IMAGE=ubuntu:16.04 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
2424
- os: osx
2525
osx_image: xcode8.3
2626
sudo: required
2727
- os: osx
28-
osx_image: xcode9
28+
osx_image: xcode9.2
2929
sudo: required
3030
env: SWIFT_SNAPSHOT=4.0.3
3131
- os: osx
32-
osx_image: xcode9.3beta
32+
osx_image: xcode9.4
33+
sudo: required
34+
env: SWIFT_SNAPSHOT=4.1.2
35+
- os: osx
36+
osx_image: xcode10.1
3337
sudo: required
34-
env: SWIFT_SNAPSHOT=4.1-DEVELOPMENT-SNAPSHOT-2018-02-26-a
38+
env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
3539

3640
before_install:
3741
- git clone https://github.com/IBM-Swift/Package-Builder.git

Package@swift-5.swift

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// swift-tools-version:4.0
2+
// The swift-tools-version declares the minimum version of Swift required to build this package.
3+
/**
4+
* Copyright IBM Corporation 2016, 2017
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
**/
18+
19+
import PackageDescription
20+
21+
let package = Package(
22+
name: "SwiftyJSON",
23+
products: [
24+
// Products define the executables and libraries produced by a package, and make them visible to other packages.
25+
.library(
26+
name: "SwiftyJSON",
27+
targets: ["SwiftyJSON"]
28+
)
29+
],
30+
dependencies: [],
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: "SwiftyJSON",
36+
dependencies: []
37+
),
38+
.testTarget(
39+
name: "SwiftyJSONTests",
40+
dependencies: ["SwiftyJSON"]
41+
)
42+
]
43+
)

0 commit comments

Comments
 (0)