From b835652a5c4143a91b125b635c187d023e16d514 Mon Sep 17 00:00:00 2001 From: QuentinJin Date: Sat, 22 Sep 2018 16:55:43 +0800 Subject: [PATCH] Update to Swift 4.2, Xcode10 --- .swift-version | 2 +- .swiftlint.yml | 5 ++--- .travis.yml | 34 +++++++++++++++++----------------- Package.swift | 2 +- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.swift-version b/.swift-version index 7d5c902..bf77d54 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.1 +4.2 diff --git a/.swiftlint.yml b/.swiftlint.yml index 44d0c1f..002b4b7 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -1,11 +1,10 @@ included: - Sources - - Tests disabled_rules: - - identifier_name - - type_name - cyclomatic_complexity - file_length + - function_body_length + - identifier_name line_length: 200 diff --git a/.travis.yml b/.travis.yml index 026d151..ca62cad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,42 +2,42 @@ branches: only: - master -osx_image: xcode9.3 +osx_image: xcode10 language: generic matrix: include: - os: osx - env: - - SDK="iphonesimulator11.4" - - DESTINATION="OS=11.4,name=iPhone X" + env: + - SDK="iphonesimulator12.0" + - DESTINATION="OS=12.0,name=iPhone X" - os: osx - env: - - SDK="macosx10.13" + env: + - SDK="macosx10.13" - DESTINATION="arch=x86_64" - os: osx - env: - - SDK="watchsimulator4.3" - - DESTINATION="OS=4.3,name=Apple Watch - 42mm" + env: + - SDK="watchsimulator5.0" + - DESTINATION="OS=5.0,name=Apple Watch Series 4 - 44mm" - os: osx - env: - - SDK="appletvsimulator11.4" - - DESTINATION="OS=11.4,name=Apple TV 4K" + env: + - SDK="appletvsimulator12.0" + - DESTINATION="OS=12.0,name=Apple TV 4K" - os: linux sudo: required dist: trusty before_install: - - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then - gem install xcpretty --no-rdoc --no-ri --no-document --quiet; + - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then + gem install xcpretty --no-rdoc --no-ri --no-document --quiet; fi - - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then + - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"; fi script: - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then - - xcodebuild clean build test -project "travis-test.xcodeproj" -scheme "travis-test-Package" -sdk "$SDK" -destination "$DESTINATION" -enableCodeCoverage YES | xcpretty; + - xcodebuild clean build test -project Schedule.xcodeproj -scheme Schedule-Package -sdk "$SDK" -destination "$DESTINATION" -enableCodeCoverage YES | xcpretty; fi - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then swift build; @@ -47,4 +47,4 @@ script: after_success: if [[ $TRAVIS_OS_NAME == 'osx' ]]; then bash <(curl -s https://codecov.io/bash) -J 'Schedule'; - fi \ No newline at end of file + fi \ No newline at end of file diff --git a/Package.swift b/Package.swift index 44ffec9..8bd3b54 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:4.0 +// swift-tools-version:4.2 import PackageDescription