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

Jump to bottom

Updated to Swift 4.2 #37

Merged
merged 4 commits into from Nov 16, 2018
Merged

Updated to Swift 4.2 #37

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
5f307e7
Updated to Swift 4.2
ShihabMehboob Oct 22, 2018
cdeac7c
Update to Swift 4.2.1
djones6 Nov 9, 2018
c2f2958
Remove explicit 4.2
djones6 Nov 13, 2018
2bee02d
Merge branch 'next' into swift42
djones6 Nov 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .swift-version
View file
Open in desktop
@@ -1 +1 @@
4.1.2
4.2.1
12 changes: 6 additions & 6 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ matrix:
dist: trusty
services: docker
env:
- DOCKER_IMAGE=ubuntu:14.04 SWIFT_SNAPSHOT=4.2 MYSQL_VER=5 CUSTOM_BUILD_SCRIPT=.build-ubuntu1404 CUSTOM_TEST_SCRIPT=.test-ubuntu1404
- DOCKER_IMAGE=ubuntu:14.04 MYSQL_VER=5 CUSTOM_BUILD_SCRIPT=.build-ubuntu1404 CUSTOM_TEST_SCRIPT=.test-ubuntu1404
sudo: required
- os: linux
dist: trusty
Expand All @@ -48,7 +48,7 @@ matrix:
dist: trusty
services: docker
env:
- DOCKER_IMAGE=ubuntu:16.04 SWIFT_SNAPSHOT=4.2 MYSQL_VER=5
- DOCKER_IMAGE=ubuntu:16.04 MYSQL_VER=5
sudo: required
# Currently mysql 8 does not install cleanly on ubuntu 16.04
#- os: linux
Expand All @@ -73,13 +73,13 @@ matrix:
dist: trusty
services: docker
env:
- DOCKER_IMAGE=ubuntu:18.04 SWIFT_SNAPSHOT=4.2 MYSQL_VER=5
- DOCKER_IMAGE=ubuntu:18.04 MYSQL_VER=5
sudo: required
- os: linux
dist: trusty
services: docker
env:
- DOCKER_IMAGE=ubuntu:18.04 SWIFT_SNAPSHOT=4.2 MYSQL_VER=8
- DOCKER_IMAGE=ubuntu:18.04 MYSQL_VER=8
sudo: required
- os: osx
osx_image: xcode9.2
Expand All @@ -95,7 +95,7 @@ matrix:
osx_image: xcode10
sudo: required
env:
- SWIFT_SNAPSHOT=4.2 MYSQL_VER=5
- MYSQL_VER=5
- os: osx
osx_image: xcode9.2
sudo: required
Expand All @@ -110,7 +110,7 @@ matrix:
osx_image: xcode10
sudo: required
env:
- SWIFT_SNAPSHOT=4.2 MYSQL_VER=8
- MYSQL_VER=8

script:
- ./build.sh