From 7cc03732f7b2ca473e7fdbce9d9dc57a8047b731 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Wed, 27 Mar 2019 01:20:23 +0000 Subject: [PATCH] [travis] Swift 5 --- .travis.yml | 39 ++++++++++--------- Cartfile.resolved | 2 +- PMKUIKit.xcodeproj/project.pbxproj | 20 ++++++---- .../xcshareddata/xcschemes/PMKUIKit.xcscheme | 2 +- 4 files changed, 34 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index e2cf84e..6de17ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,17 +5,17 @@ stages: - lint - carthage - test +os: osx +language: swift jobs: include: - &pod - stage: lint - osx_image: xcode8.3 env: SWIFT=3.1 name: pod lib lint --swift-version=3.1 - os: osx - language: objective-c + stage: lint + osx_image: xcode8.3 before_install: - gem install cocoapods --prerelease --version 1.6.0.beta.1 + gem install cocoapods --prerelease --version 1.7.0.beta.2 install: carthage bootstrap --no-build PromiseKit script: | @@ -33,7 +33,7 @@ jobs: env: SWIFT=3.3 name: pod lib lint --swift-version=3.3 - <<: *pod - osx_image: xcode10 + osx_image: xcode10.1 env: SWIFT=3.4 name: pod lib lint --swift-version=3.4 - <<: *pod @@ -45,26 +45,27 @@ jobs: env: SWIFT=4.1 name: pod lib lint --swift-version=4.1 - <<: *pod - osx_image: xcode10 + osx_image: xcode10.1 env: SWIFT=4.2 name: pod lib lint --swift-version=4.2 + - <<: *pod + osx_image: xcode10.2 + env: SWIFT=5.0 + name: pod lib lint --swift-version=5.0 - &test - stage: test - osx_image: xcode10 name: iOS Tests - env: DST='OS=12.0,name=iPhone SE' PLAT=iOS - os: osx - language: objective-c + stage: test + osx_image: xcode10.2 + xcode_scheme: PMKUIKit + xcode_project: PMKUIKit.xcodeproj + before_install: carthage bootstrap --cache-builds --no-use-binaries + xcode_destination: 'platform=iOS Simulator,OS=12.2,name=iPhone SE' cache: directories: - Carthage - before_install: - carthage bootstrap --cache-builds --no-use-binaries --platform $PLAT - install: - xcodebuild -scheme PMKUIKit -target PMKUIKit -quiet -destination "$DST" SWIFT_TREAT_WARNINGS_AS_ERRORS=YES build - script: - xcodebuild -scheme PMKUIKit -quiet -destination "$DST" test + before_script: + sed -i '' 's/SWIFT_TREAT_WARNINGS_AS_ERRORS = NO/SWIFT_TREAT_WARNINGS_AS_ERRORS = YES/g' PMKUIKit.xcodeproj/project.pbxproj - <<: *test - env: DST='OS=12.0,name=Apple TV' PLAT=tvOS name: tvOS Tests + xcode_destination: 'platform=tvOS Simulator,OS=12.2,name=Apple TV' diff --git a/Cartfile.resolved b/Cartfile.resolved index d903612..f54bbdb 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "mxcl/PromiseKit" "6.5.0" +github "mxcl/PromiseKit" "6.8.4" diff --git a/PMKUIKit.xcodeproj/project.pbxproj b/PMKUIKit.xcodeproj/project.pbxproj index fff1565..2674833 100644 --- a/PMKUIKit.xcodeproj/project.pbxproj +++ b/PMKUIKit.xcodeproj/project.pbxproj @@ -287,34 +287,34 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0800; - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = "Max Howell"; TargetAttributes = { 630B2DFF1D5D0AF500DC10E9 = { - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; TestTargetID = 63C9C4441D5D334700101ECE; }; 63C7FFA61D5BEE09003BAE60 = { CreatedOnToolsVersion = 8.0; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; 63C7FFF11D5C020D003BAE60 = { CreatedOnToolsVersion = 8.0; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; TestTargetID = 63C9C4441D5D334700101ECE; }; 63C9C4441D5D334700101ECE = { CreatedOnToolsVersion = 8.0; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; }; }; buildConfigurationList = 63C7FFA11D5BEE09003BAE60 /* Build configuration list for PBXProject "PMKUIKit" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -482,6 +482,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; BUNDLE_PACKAGE_TYPE = FMWK; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -536,7 +537,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2,3,4"; TVOS_DEPLOYMENT_TARGET = 9.0; WATCHOS_DEPLOYMENT_TARGET = 2.0; @@ -549,6 +550,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; BUNDLE_PACKAGE_TYPE = FMWK; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -595,7 +597,7 @@ PRODUCT_BUNDLE_IDENTIFIER = org.promisekit.UIKit; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2,3,4"; TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; @@ -617,6 +619,7 @@ PRODUCT_MODULE_NAME = "${TARGET_NAME}"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; }; name = Debug; }; @@ -633,6 +636,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_MODULE_NAME = "${TARGET_NAME}"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; }; name = Release; }; diff --git a/PMKUIKit.xcodeproj/xcshareddata/xcschemes/PMKUIKit.xcscheme b/PMKUIKit.xcodeproj/xcshareddata/xcschemes/PMKUIKit.xcscheme index 91ddde7..6ac6213 100644 --- a/PMKUIKit.xcodeproj/xcshareddata/xcschemes/PMKUIKit.xcscheme +++ b/PMKUIKit.xcodeproj/xcshareddata/xcschemes/PMKUIKit.xcscheme @@ -1,6 +1,6 @@