From 3c27f5e66665d2d04d19098f5f06ff76b6582d46 Mon Sep 17 00:00:00 2001 From: Robert Widmann Date: Wed, 11 Apr 2018 23:45:26 -0400 Subject: [PATCH] Update to Swift 4.1 --- .swift-version | 2 +- .travis.yml | 29 +++++++------------ Carthage/Checkouts/SwiftCheck | 2 +- Swiftx.xcodeproj/project.pbxproj | 6 +++- .../xcshareddata/IDEWorkspaceChecks.plist | 8 +++++ .../xcschemes/Swiftx-iOS.xcscheme | 4 +-- .../xcschemes/Swiftx-tvOS.xcscheme | 4 +-- .../xcschemes/Swiftx-watchOS.xcscheme | 4 +-- .../xcshareddata/xcschemes/Swiftx.xcscheme | 4 +-- .../xcschemes/SwiftxTests.xcscheme | 4 +-- 10 files changed, 30 insertions(+), 37 deletions(-) create mode 100644 Swiftx.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/.swift-version b/.swift-version index 5186d07..7d5c902 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0 +4.1 diff --git a/.travis.yml b/.travis.yml index 3ee2c9a..ded1e0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ matrix: include: - os: osx language: objective-c - osx_image: xcode9 + osx_image: xcode9.3 before_install: - git submodule update --init --recursive script: @@ -14,35 +14,26 @@ matrix: - carthage build --no-skip-current - os: osx language: objective-c - osx_image: xcode9 + osx_image: xcode9.3 before_install: - git submodule update --init --recursive script: - set -o pipefail - xcodebuild test -scheme Swiftx | xcpretty -c - # -- Start iOS -- - # !!!: Make sure desired device name & OS version are suitable for the Xcode version installed on osx_image - - iOS_DEVICE_NAME="iPad Pro (12.9-inch)" - - iOS_RUNTIME_VERSION="10.0" - # Get simulator identifier for desired device/runtime pair - - SIMULATOR_ID=$(xcrun instruments -s | grep -o "${iOS_DEVICE_NAME} (${iOS_RUNTIME_VERSION}) \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/") - - echo $SIMULATOR_ID - - echo $iOS_DEVICE_NAME - - echo $iOS_RUNTIME_VERSION - # !!!: Start simulator w/ desired device—helps avoid issues w/ Xcode timing out when waiting for simulator to become ready - - open -b com.apple.iphonesimulator --args -CurrentDeviceUDID $SIMULATOR_ID - - xcodebuild test -scheme Swiftx-iOS -destination "platform=iOS Simulator,name=${iOS_DEVICE_NAME},OS=${iOS_RUNTIME_VERSION}" | xcpretty -c - # -- End iOS -- - - xcodebuild test -scheme Swiftx-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 1080p' | xcpretty -c + - xcodebuild build-for-testing -scheme Swiftx-iOS -destination "platform=iOS Simulator,name=iPad Pro (12.9-inch) (2nd generation)" | xcpretty -c + - xcodebuild test -scheme Swiftx-iOS -destination "platform=iOS Simulator,name=iPad Pro (12.9-inch) (2nd generation)" | xcpretty -c + - xcodebuild build-for-testing -scheme Swiftx-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K (at 1080p)' | xcpretty -c + - xcodebuild test -scheme Swiftx-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K (at 1080p)' | xcpretty -c - os: linux language: generic sudo: required dist: trusty before_install: + - git submodule update --init --recursive - wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import - - - wget https://swift.org/builds/swift-4.0-release/ubuntu1404/swift-4.0-RELEASE/swift-4.0-RELEASE-ubuntu14.04.tar.gz - - tar xzf swift-4.0-RELEASE-ubuntu14.04.tar.gz - - export PATH=${PWD}/swift-4.0-RELEASE-ubuntu14.04/usr/bin:"${PATH}" + - wget https://swift.org/builds/swift-4.1-release/ubuntu1404/swift-4.1-RELEASE/swift-4.1-RELEASE-ubuntu14.04.tar.gz + - tar xzf swift-4.1-RELEASE-ubuntu14.04.tar.gz + - export PATH=${PWD}/swift-4.1-RELEASE-ubuntu14.04/usr/bin:"${PATH}" script: - swift build notifications: diff --git a/Carthage/Checkouts/SwiftCheck b/Carthage/Checkouts/SwiftCheck index df82fb8..43ffe7a 160000 --- a/Carthage/Checkouts/SwiftCheck +++ b/Carthage/Checkouts/SwiftCheck @@ -1 +1 @@ -Subproject commit df82fb889864945c64458f38846702af729b3ee4 +Subproject commit 43ffe7ab48366c36a697c54bcdd257876edd6fc6 diff --git a/Swiftx.xcodeproj/project.pbxproj b/Swiftx.xcodeproj/project.pbxproj index f4f7ec2..7dfbcd9 100644 --- a/Swiftx.xcodeproj/project.pbxproj +++ b/Swiftx.xcodeproj/project.pbxproj @@ -514,7 +514,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = TypeLift; TargetAttributes = { 8240CD801C3A39D500EF4D29 = { @@ -938,12 +938,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -993,12 +995,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; diff --git a/Swiftx.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Swiftx.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Swiftx.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-iOS.xcscheme b/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-iOS.xcscheme index 1ca648e..b46b81a 100644 --- a/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-iOS.xcscheme +++ b/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx-iOS.xcscheme @@ -1,6 +1,6 @@ @@ -37,7 +36,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx.xcscheme b/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx.xcscheme index 6e240b3..b95ae21 100644 --- a/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx.xcscheme +++ b/Swiftx.xcodeproj/xcshareddata/xcschemes/Swiftx.xcscheme @@ -1,6 +1,6 @@