From 06037b2fd61cac354e1fb4a52e51f393bffcba9d Mon Sep 17 00:00:00 2001 From: freak4pc Date: Fri, 1 Mar 2019 19:37:49 +0200 Subject: [PATCH] Update CI to drop Swift 4 support --- .circleci/config.yml | 15 +++------------ RxKingfisher.xcodeproj/project.pbxproj | 8 -------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 411c824..ec62265 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: XCODE_TEST_REPORTS: /tmp/xcode-test-results LANG: en_US.UTF-8 macos: - xcode: '10.0.0' + xcode: '10.1.0' steps: - checkout - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS $XCODE_TEST_REPORTS @@ -24,21 +24,12 @@ jobs: key: v1-dep-{{ .Branch }}-{{ epoch }} paths: - Carthage - - run: - name: macOS, Swift 4 - command: set -o pipefail && xcodebuild build SWIFT_VERSION=4.0 -scheme RxKingfisher-macOS -project RxKingfisher.xcodeproj -sdk macosx -destination "arch=x86_64" | xcpretty - run: name: macOS, Swift 4.2 command: set -o pipefail && xcodebuild build SWIFT_VERSION=4.2 -scheme RxKingfisher-macOS -project RxKingfisher.xcodeproj -sdk macosx -destination "arch=x86_64" | xcpretty - - run: - name: iOS, Swift 4 - command: set -o pipefail && xcodebuild build SWIFT_VERSION=4.0 -scheme RxKingfisher-iOS -project RxKingfisher.xcodeproj -sdk iphonesimulator -destination "name=iPhone X" | xcpretty - run: name: iOS, Swift 4.2 command: set -o pipefail && xcodebuild build SWIFT_VERSION=4.2 -scheme RxKingfisher-iOS -project RxKingfisher.xcodeproj -sdk iphonesimulator -destination "name=iPhone X" | xcpretty - - run: - name: tvOS, Swift 4 - command: set -o pipefail && xcodebuild build SWIFT_VERSION=4.0 -scheme RxKingfisher-tvOS -project RxKingfisher.xcodeproj -sdk appletvsimulator -destination "name=Apple TV 4K (at 1080p)" | xcpretty - run: name: Build tvOS, Swift 4.2 command: set -o pipefail && xcodebuild build SWIFT_VERSION=4.2 -scheme RxKingfisher-tvOS -project RxKingfisher.xcodeproj -sdk appletvsimulator -destination "name=Apple TV 4K (at 1080p)" | xcpretty @@ -51,7 +42,7 @@ jobs: environment: LANG: en_US.UTF-8 macos: - xcode: '10.0.0' + xcode: '10.1.0' steps: - checkout - run: @@ -62,7 +53,7 @@ jobs: command: rm ~/.cocoapods/config.yaml # This hack is needed since CircleCI forces --verbose - run: name: Push Podspec to Trunk - command: pod trunk push --swift-version=4.0 --skip-tests --allow-warnings + command: pod trunk push --swift-version=4.2 --skip-tests --allow-warnings workflows: version: 2 build: diff --git a/RxKingfisher.xcodeproj/project.pbxproj b/RxKingfisher.xcodeproj/project.pbxproj index 861c935..19914f0 100644 --- a/RxKingfisher.xcodeproj/project.pbxproj +++ b/RxKingfisher.xcodeproj/project.pbxproj @@ -11,9 +11,6 @@ 788F591420A3494500EF5FFE /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 788F591320A3494500EF5FFE /* logo.png */; }; 788F591520A3494500EF5FFE /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 788F591320A3494500EF5FFE /* logo.png */; }; 788F591620A3494500EF5FFE /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 788F591320A3494500EF5FFE /* logo.png */; }; - 78A52EDC209EF999002E26D2 /* RxKingfisherError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78A52ED9209EF999002E26D2 /* RxKingfisherError.swift */; }; - 78A52EDD209EF999002E26D2 /* RxKingfisherError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78A52ED9209EF999002E26D2 /* RxKingfisherError.swift */; }; - 78A52EDF209EF999002E26D2 /* RxKingfisherError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78A52ED9209EF999002E26D2 /* RxKingfisherError.swift */; }; 78A52EE0209EF999002E26D2 /* KingfisherManager+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78A52EDA209EF999002E26D2 /* KingfisherManager+Rx.swift */; }; 78A52EE1209EF999002E26D2 /* KingfisherManager+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78A52EDA209EF999002E26D2 /* KingfisherManager+Rx.swift */; }; 78A52EE3209EF999002E26D2 /* KingfisherManager+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78A52EDA209EF999002E26D2 /* KingfisherManager+Rx.swift */; }; @@ -66,7 +63,6 @@ 788F590F20A348E600EF5FFE /* OHHTTPStubs.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OHHTTPStubs.framework; path = Carthage/Build/Mac/OHHTTPStubs.framework; sourceTree = ""; }; 788F591120A348F000EF5FFE /* OHHTTPStubs.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OHHTTPStubs.framework; path = Carthage/Build/tvOS/OHHTTPStubs.framework; sourceTree = ""; }; 788F591320A3494500EF5FFE /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = logo.png; path = Images/logo.png; sourceTree = SOURCE_ROOT; }; - 78A52ED9209EF999002E26D2 /* RxKingfisherError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxKingfisherError.swift; sourceTree = ""; }; 78A52EDA209EF999002E26D2 /* KingfisherManager+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "KingfisherManager+Rx.swift"; sourceTree = ""; }; 78A52EDB209EF999002E26D2 /* Kingfisher+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Kingfisher+Rx.swift"; sourceTree = ""; }; 78A52EE9209EF9B3002E26D2 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/iOS/RxCocoa.framework; sourceTree = ""; }; @@ -203,7 +199,6 @@ children = ( 78A52EDB209EF999002E26D2 /* Kingfisher+Rx.swift */, 78A52EDA209EF999002E26D2 /* KingfisherManager+Rx.swift */, - 78A52ED9209EF999002E26D2 /* RxKingfisherError.swift */, ); path = Sources; sourceTree = ""; @@ -480,7 +475,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 78A52EDC209EF999002E26D2 /* RxKingfisherError.swift in Sources */, 78A52EE4209EF999002E26D2 /* Kingfisher+Rx.swift in Sources */, 78A52EE0209EF999002E26D2 /* KingfisherManager+Rx.swift in Sources */, ); @@ -498,7 +492,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 78A52EDF209EF999002E26D2 /* RxKingfisherError.swift in Sources */, 78A52EE7209EF999002E26D2 /* Kingfisher+Rx.swift in Sources */, 78A52EE3209EF999002E26D2 /* KingfisherManager+Rx.swift in Sources */, ); @@ -508,7 +501,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 78A52EDD209EF999002E26D2 /* RxKingfisherError.swift in Sources */, 78A52EE5209EF999002E26D2 /* Kingfisher+Rx.swift in Sources */, 78A52EE1209EF999002E26D2 /* KingfisherManager+Rx.swift in Sources */, );