From 44bd45e77063e7e87d41df482aa672bb5a9dd944 Mon Sep 17 00:00:00 2001 From: Matt Diephouse Date: Fri, 29 Mar 2019 12:51:46 -0400 Subject: [PATCH] Move to Swift 4.2 --- .swift-version | 2 +- .travis.yml | 12 +++++++++++- Tentacle.xcodeproj/project.pbxproj | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.swift-version b/.swift-version index 5186d07..bf77d54 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0 +4.2 diff --git a/.travis.yml b/.travis.yml index d0b236a..a0d4242 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode9.4 +osx_image: xcode10.1 branches: only: - master @@ -8,9 +8,19 @@ xcode_workspace: Tentacle.xcworkspace matrix: include: - xcode_scheme: Tentacle-OSX + name: Xcode 10.1 / macOS env: XCODE_ACTION="build-for-testing test-without-building" - xcode_scheme: Tentacle-iOS + name: Xcode 10.1 / macOS env: XCODE_ACTION="build-for-testing test-without-building" + - xcode_scheme: Tentacle-OSX + name: Xcode 10.2 / macOS + env: XCODE_ACTION="build-for-testing test-without-building" + osx_image: xcode10.2 + - xcode_scheme: Tentacle-iOS + name: Xcode 10.2 / macOS + env: XCODE_ACTION="build-for-testing test-without-building" + osx_image: xcode10.2 - xcode_scheme: update-test-fixtures env: XCODE_ACTION=build - git: diff --git a/Tentacle.xcodeproj/project.pbxproj b/Tentacle.xcodeproj/project.pbxproj index 5822658..3fb3621 100644 --- a/Tentacle.xcodeproj/project.pbxproj +++ b/Tentacle.xcodeproj/project.pbxproj @@ -1138,7 +1138,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1189,7 +1189,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; };