Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Swift 5.1 and Appid 6.0.0 #130

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update to Swift 5.1 and Appid 6.0.0 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e6cc89
ci: Update to Swift 5.1
djones6 Sep 27, 2019
65f61e8
workaround: Use master branch of appid
djones6 Oct 4, 2019
a65cdec
Disable dev snapshot due to compiler crash
djones6 Oct 7, 2019
25358e6
Update to appid 6.0.0
djones6 Oct 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .swift-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.0.2
5.1
26 changes: 11 additions & 15 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,22 @@ matrix:
sudo: required
services: docker
# Note: Ubuntu 16.04
env: DOCKER_IMAGE=swift:5.0.2-xenial
- os: linux
dist: xenial
sudo: required
services: docker
# Note: Kitura-WebSocket-NIO requires zlib
env: DOCKER_IMAGE=swift:5.0.2-xenial KITURA_NIO=1 DOCKER_PACKAGES="libz-dev"
env: DOCKER_IMAGE=swift:5.0.3-xenial SWIFT_SNAPSHOT=5.0.3
- os: linux
dist: xenial
sudo: required
services: docker
# Note: Ubuntu 18.04
env: DOCKER_IMAGE=swift:5.0.2 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
env: DOCKER_IMAGE=swift:5.1
- os: linux
dist: xenial
sudo: required
services: docker
env: DOCKER_IMAGE=swift:5.0.2 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT KITURA_NIO=1 DOCKER_PACKAGES="libz-dev"
# Note: Kitura-WebSocket-NIO requires zlib
env: DOCKER_IMAGE=swift:5.1 KITURA_NIO=1 DOCKER_PACKAGES="libz-dev"
# Disabling snapshot due to crash during compilation (2019-09-30-a)
# TODO: re-enable once dev snapshots are functioning
#SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
- os: osx
osx_image: xcode9.2
sudo: required
Expand All @@ -65,18 +63,16 @@ matrix:
osx_image: xcode10.2
sudo: required
env: SWIFT_SNAPSHOT=5.0.1 JAZZY_ELIGIBLE=true
- os: osx
osx_image: xcode10.2
sudo: required
env: SWIFT_SNAPSHOT=5.0.1 KITURA_NIO=1
- os: osx
osx_image: xcode11
sudo: required
env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
- os: osx
osx_image: xcode11
sudo: required
env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT KITURA_NIO=1
env: KITURA_NIO=1
# Disabling snapshot due to crash during compilation (2019-09-30-a)
# TODO: re-enable once dev snapshots are functioning
#SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT

before_install:
- git clone https://github.com/IBM-Swift/Package-Builder.git
Expand Down
4 changes: 3 additions & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@ var targetDependencies: [Target.Dependency] = [ "Kitura", "CloudEnvironment","Sw
// targetDependencies.append("SwiftKueryPostgreSQL")

// IBMCloudAppID requires OpenSSL that is not included on Mac by default.
// We only include the appid example on Linux to ensure Kitura-Sample works
// out-of-the-box on macOS.
#if os(Linux)
dependencies.append(.package(url: "https://github.com/ibm-cloud-security/appid-serversdk-swift", from: "5.1.0"))
dependencies.append(.package(url: "https://github.com/ibm-cloud-security/appid-serversdk-swift", from: "6.0.0"))
targetDependencies.append("IBMCloudAppID")
#endif

Expand Down
4 changes: 3 additions & 1 deletion Package@swift-4.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@ var targetDependencies: [Target.Dependency] = [ "Kitura", "CloudEnvironment","Sw
// targetDependencies.append("SwiftKueryPostgreSQL")

// IBMCloudAppID requires OpenSSL that is not included on Mac by default.
// We only include the appid example on Linux to ensure Kitura-Sample works
// out-of-the-box on macOS.
#if os(Linux) && swift(>=4.2)
dependencies.append(.package(url: "https://github.com/ibm-cloud-security/appid-serversdk-swift", from: "5.1.0"))
dependencies.append(.package(url: "https://github.com/ibm-cloud-security/appid-serversdk-swift", from: "6.0.0"))
targetDependencies.append("IBMCloudAppID")
#endif

Expand Down