From c163cdd8dd34c92527af3a37ff98e73184b0b36c Mon Sep 17 00:00:00 2001 From: Max Howell Date: Tue, 26 Mar 2019 18:12:12 -0400 Subject: [PATCH] [travis] Update to Swift 5 GM --- .travis.yml | 73 ++++++++----------- Cartfile | 2 +- PMKCloudKit.xcodeproj/project.pbxproj | 13 +++- .../xcschemes/PMKCloudKit.xcscheme | 2 +- 4 files changed, 42 insertions(+), 48 deletions(-) diff --git a/.travis.yml b/.travis.yml index 475f4f0..954c1a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,7 @@ +os: osx +language: swift +osx_image: xcode10.2 + branches: only: - master @@ -12,11 +16,10 @@ jobs: stage: lint osx_image: xcode8.3 env: SWIFT=3.1 - name: pod lib lint --swift-version=3.1 os: osx language: objective-c before_install: - gem install cocoapods --prerelease --version 1.7.0.beta.2 + gem install cocoapods --prerelease --version 1.7.0.beta.3 install: carthage bootstrap --no-build PromiseKit script: | @@ -28,79 +31,65 @@ jobs: - <<: *pod osx_image: xcode9.2 env: SWIFT=3.2 - name: pod lib lint --swift-version=3.2 - <<: *pod osx_image: xcode9.4 env: SWIFT=3.3 - name: pod lib lint --swift-version=3.3 - <<: *pod osx_image: xcode10.1 env: SWIFT=3.4 - name: pod lib lint --swift-version=3.4 - <<: *pod osx_image: xcode9.2 env: SWIFT=4.0 - name: pod lib lint --swift-version=4.0 - <<: *pod osx_image: xcode9.4 env: SWIFT=4.1 - name: pod lib lint --swift-version=4.1 - <<: *pod 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 - - stage: carthage - osx_image: xcode10.2 - name: Carthage / watchOS - os: osx - language: objective-c - script: - carthage bootstrap --platform watchOS + - &carthage + stage: carthage + osx_image: xcode9.2 + script: | + carthage bootstrap --cache-builds + sed -i '' "s/SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;/SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;/" *.xcodeproj/project.pbxproj + carthage build --no-skip-current cache: directories: - Carthage + - <<: *carthage + osx_image: xcode9.4 + - <<: *carthage + osx_image: xcode10.1 + - <<: *carthage + osx_image: xcode10.2 - &swiftpm stage: swiftpm - osx_image: xcode10.2 - name: swift build (tools-version-5.0) - os: osx - language: objective-c + osx_image: xcode8.3 script: swift build -Xswiftc -target -Xswiftc x86_64-apple-macosx10.12 - - <<: *swiftpm - osx_image: xcode10.1 - name: swift build (tools-version-4.2) - <<: *swiftpm osx_image: xcode9.2 - name: swift build (tools-version-4.0) - <<: *swiftpm - osx_image: xcode8.3 - name: swift build (tools-version-vanilla) + osx_image: xcode9.4 + - <<: *swiftpm + osx_image: xcode10.1 + - <<: *swiftpm + osx_image: xcode10.2 - &test stage: test - osx_image: xcode10.2 - name: macOS Tests - env: DST='arch=x86_64' PLAT=macOS - os: osx - language: objective-c - cache: - directories: + xcode_scheme: PMKCloudKit + xcode_project: PMKCloudKit.xcodeproj + xcode_destination: 'platform=macOS' + cache.directories: - Carthage before_install: - carthage bootstrap --cache-builds --no-use-binaries --platform $PLAT - install: - xcodebuild -scheme PMKCloudKit -target PMKCloudKit -quiet -destination "$DST" SWIFT_TREAT_WARNINGS_AS_ERRORS=YES build - script: - xcodebuild -scheme PMKCloudKit -quiet -destination "$DST" test + carthage bootstrap --cache-builds --no-use-binaries - <<: *test - env: DST='OS=12.2,name=iPhone SE' PLAT=iOS - name: iOS Tests + xcode_destination: 'platform=iOS Simulator,OS=12.2,name=iPhone SE' - <<: *test - env: DST='OS=12.2,name=Apple TV' PLAT=tvOS - name: tvOS Tests + xcode_destination: 'platform=tvOS Simulator,OS=12.2,name=Apple TV' diff --git a/Cartfile b/Cartfile index 2bfea98..d4703e9 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "mxcl/PromiseKit" ~> 6.0 +github "mxcl/PromiseKit" ~> 6.8.4 diff --git a/PMKCloudKit.xcodeproj/project.pbxproj b/PMKCloudKit.xcodeproj/project.pbxproj index 51ba42f..ca7d565 100644 --- a/PMKCloudKit.xcodeproj/project.pbxproj +++ b/PMKCloudKit.xcodeproj/project.pbxproj @@ -169,27 +169,28 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0800; - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = "Max Howell"; TargetAttributes = { 63C7FFA61D5BEE09003BAE60 = { CreatedOnToolsVersion = 8.0; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; 63C7FFF11D5C020D003BAE60 = { CreatedOnToolsVersion = 8.0; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; }; }; buildConfigurationList = 63C7FFA11D5BEE09003BAE60 /* Build configuration list for PBXProject "PMKCloudKit" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 63C7FF9D1D5BEE09003BAE60; productRefGroup = 63C7FFA81D5BEE09003BAE60 /* Products */; @@ -257,6 +258,7 @@ baseConfigurationReference = 63CCF8171D5C11B500503216 /* Carthage.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -325,6 +327,7 @@ baseConfigurationReference = 63CCF8171D5C11B500503216 /* Carthage.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -395,6 +398,7 @@ PRODUCT_MODULE_NAME = "${TARGET_NAME}"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; }; name = Debug; }; @@ -411,6 +415,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/PMKCloudKit.xcodeproj/xcshareddata/xcschemes/PMKCloudKit.xcscheme b/PMKCloudKit.xcodeproj/xcshareddata/xcschemes/PMKCloudKit.xcscheme index 7747fdd..9eeccdc 100644 --- a/PMKCloudKit.xcodeproj/xcshareddata/xcschemes/PMKCloudKit.xcscheme +++ b/PMKCloudKit.xcodeproj/xcshareddata/xcschemes/PMKCloudKit.xcscheme @@ -1,6 +1,6 @@