From 620e84cd24405cf7f2623b10d198df44b45acb75 Mon Sep 17 00:00:00 2001 From: Matt Prowse Date: Sun, 17 Mar 2019 22:01:27 +1100 Subject: [PATCH 1/8] Update dependencies and deployment targets --- Cartfile | 4 ++-- Cartfile.private | 4 ++-- Cartfile.resolved | 8 ++++---- Carthage/Checkouts/Nimble | 2 +- Carthage/Checkouts/Quick | 2 +- Carthage/Checkouts/ReactiveSwift | 2 +- Carthage/Checkouts/Result | 2 +- ReactiveTask.xcodeproj/project.pbxproj | 8 ++++---- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cartfile b/Cartfile index 6b6effb..c0e9aa0 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "antitypical/Result" ~> 4.0 -github "ReactiveCocoa/ReactiveSwift" ~> 4.0 +github "antitypical/Result" ~> 4.1 +github "ReactiveCocoa/ReactiveSwift" ~> 5.0 diff --git a/Cartfile.private b/Cartfile.private index 917615d..a91b4bd 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ github "jspahrsummers/xcconfigs" "3d9d996" -github "Quick/Quick" ~> 1.3.1 -github "Quick/Nimble" ~> 7.1.3 +github "Quick/Quick" ~> 2.0 +github "Quick/Nimble" ~> 8.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index d42e390..9d55212 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ -github "Quick/Nimble" "v7.1.3" -github "Quick/Quick" "v1.3.1" -github "ReactiveCocoa/ReactiveSwift" "4.0.0" -github "antitypical/Result" "4.0.0" +github "Quick/Nimble" "v8.0.1" +github "Quick/Quick" "v2.0.0" +github "ReactiveCocoa/ReactiveSwift" "5.0.0" +github "antitypical/Result" "4.1.0" github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index 9c1379f..43304bf 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit 9c1379fdcd58c4f2278aea5e029394ba9a2b8f07 +Subproject commit 43304bf2b1579fd555f2fdd51742771c1e4f2b98 diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick index b060679..0b4ed6c 160000 --- a/Carthage/Checkouts/Quick +++ b/Carthage/Checkouts/Quick @@ -1 +1 @@ -Subproject commit b060679e70d13c3c7dcd124201b5b1b34ce6f340 +Subproject commit 0b4ed6c706dd0cce923b5019a605a9bcc6b1b600 diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift index 4f6a12a..e285cea 160000 --- a/Carthage/Checkouts/ReactiveSwift +++ b/Carthage/Checkouts/ReactiveSwift @@ -1 +1 @@ -Subproject commit 4f6a12ae6762e825b0e19a4f7076eafa43847e6e +Subproject commit e285cea17cca8e23928d1e85a235638184e39ac9 diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result index 8fc088d..2ca499b 160000 --- a/Carthage/Checkouts/Result +++ b/Carthage/Checkouts/Result @@ -1 +1 @@ -Subproject commit 8fc088dcf72802801efeecba76ea8fb041fb773d +Subproject commit 2ca499ba456795616fbc471561ff1d963e6ae160 diff --git a/ReactiveTask.xcodeproj/project.pbxproj b/ReactiveTask.xcodeproj/project.pbxproj index 9c97f1c..fce7d8f 100644 --- a/ReactiveTask.xcodeproj/project.pbxproj +++ b/ReactiveTask.xcodeproj/project.pbxproj @@ -367,7 +367,7 @@ CURRENT_PROJECT_VERSION = 1; ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.10; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; SWIFT_SWIFT3_OBJC_INFERENCE = Off; @@ -389,7 +389,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CURRENT_PROJECT_VERSION = 1; GCC_NO_COMMON_BLOCKS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.10; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_SWIFT3_OBJC_INFERENCE = Off; @@ -465,7 +465,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CURRENT_PROJECT_VERSION = 1; GCC_NO_COMMON_BLOCKS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.10; SDKROOT = macosx; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 4.0; @@ -513,7 +513,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CURRENT_PROJECT_VERSION = 1; GCC_NO_COMMON_BLOCKS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.10; SDKROOT = macosx; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 4.0; From 26f998a3b6e98a9d01ed813999b1fe07c22301c4 Mon Sep 17 00:00:00 2001 From: Matt Prowse Date: Sun, 17 Mar 2019 22:03:50 +1100 Subject: [PATCH 2/8] Update to Swift 4.2 --- ReactiveTask.xcodeproj/project.pbxproj | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ReactiveTask.xcodeproj/project.pbxproj b/ReactiveTask.xcodeproj/project.pbxproj index fce7d8f..76d34f7 100644 --- a/ReactiveTask.xcodeproj/project.pbxproj +++ b/ReactiveTask.xcodeproj/project.pbxproj @@ -280,11 +280,11 @@ TargetAttributes = { D0BFEA571A2D1E5E00E23194 = { CreatedOnToolsVersion = 6.1.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 1010; }; D0BFEA621A2D1E5E00E23194 = { CreatedOnToolsVersion = 6.1.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 1010; }; }; }; @@ -409,6 +409,7 @@ INFOPLIST_FILE = Sources/Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -422,6 +423,7 @@ INFOPLIST_FILE = Sources/Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -436,6 +438,7 @@ INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -450,6 +453,7 @@ INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -484,6 +488,7 @@ INFOPLIST_FILE = Sources/Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.2; }; name = Test; }; @@ -498,6 +503,7 @@ INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.2; }; name = Test; }; @@ -532,6 +538,7 @@ INFOPLIST_FILE = Sources/Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.2; }; name = Profile; }; @@ -546,6 +553,7 @@ INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.2; }; name = Profile; }; From 7ba5cd94eab862809a2232dbd1d34d7c9823197b Mon Sep 17 00:00:00 2001 From: Matt Prowse Date: Sun, 17 Mar 2019 22:59:42 +1100 Subject: [PATCH 3/8] Update SwiftPM and Travis Config --- .swift-version | 2 +- .travis.yml | 10 +++++----- Package.resolved | 16 ++++++++-------- Package.swift | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.swift-version b/.swift-version index 4d0dcda..bf77d54 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.1.2 +4.2 diff --git a/.travis.yml b/.travis.yml index 84191e7..bade221 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,13 +6,13 @@ branches: matrix: include: - os: osx - osx_image: xcode9.4 + osx_image: xcode10.1 xcode_scheme: ReactiveTask script: - set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" test | xcpretty - env: JOB=Xcode9.4 + env: JOB=Xcode10.1 - os: osx - osx_image: xcode9.4 + osx_image: xcode10.1 script: - swift --version - swift build @@ -21,7 +21,7 @@ matrix: submodules: false env: JOB=SWIFTPM_DARWIN - os: osx - osx_image: xcode9.4 + osx_image: xcode10.1 script: - pod repo update - pod lib lint @@ -44,4 +44,4 @@ deploy: on: repo: Carthage/ReactiveTask tags: true - condition: $JOB = Xcode9.4 + condition: $JOB = Xcode10.1 diff --git a/Package.resolved b/Package.resolved index bb1e479..ccb75a4 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/Quick/Nimble.git", "state": { "branch": null, - "revision": "9c1379fdcd58c4f2278aea5e029394ba9a2b8f07", - "version": "7.1.3" + "revision": "43304bf2b1579fd555f2fdd51742771c1e4f2b98", + "version": "8.0.1" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/Quick/Quick.git", "state": { "branch": null, - "revision": "b060679e70d13c3c7dcd124201b5b1b34ce6f340", - "version": "1.3.1" + "revision": "0b4ed6c706dd0cce923b5019a605a9bcc6b1b600", + "version": "2.0.0" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git", "state": { "branch": null, - "revision": "4f6a12ae6762e825b0e19a4f7076eafa43847e6e", - "version": "4.0.0" + "revision": "e285cea17cca8e23928d1e85a235638184e39ac9", + "version": "5.0.0" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/antitypical/Result.git", "state": { "branch": null, - "revision": "8fc088dcf72802801efeecba76ea8fb041fb773d", - "version": "4.0.0" + "revision": "2ca499ba456795616fbc471561ff1d963e6ae160", + "version": "4.1.0" } } ] diff --git a/Package.swift b/Package.swift index e1fc868..e011eff 100644 --- a/Package.swift +++ b/Package.swift @@ -7,10 +7,10 @@ let package = Package( .library(name: "ReactiveTask", targets: ["ReactiveTask"]), ], dependencies: [ - .package(url: "https://github.com/antitypical/Result.git", from: "4.0.0"), - .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "4.0.0"), - .package(url: "https://github.com/Quick/Quick.git", from: "1.3.1"), - .package(url: "https://github.com/Quick/Nimble.git", from: "7.1.3"), + .package(url: "https://github.com/antitypical/Result.git", from: "4.1.0"), + .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "5.0.0"), + .package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"), + .package(url: "https://github.com/Quick/Nimble.git", from: "8.0.1"), ], targets: [ .target(name: "ReactiveTask", dependencies: ["Result", "ReactiveSwift"], path: "Sources"), From f152cb6b0ce0a6060cd7060db4b0dfff9c6f0243 Mon Sep 17 00:00:00 2001 From: Matt Prowse Date: Thu, 21 Mar 2019 22:29:30 +1100 Subject: [PATCH 4/8] Fix deployment targets --- ReactiveTask.xcodeproj/project.pbxproj | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ReactiveTask.xcodeproj/project.pbxproj b/ReactiveTask.xcodeproj/project.pbxproj index 76d34f7..5594577 100644 --- a/ReactiveTask.xcodeproj/project.pbxproj +++ b/ReactiveTask.xcodeproj/project.pbxproj @@ -367,7 +367,7 @@ CURRENT_PROJECT_VERSION = 1; ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; SWIFT_SWIFT3_OBJC_INFERENCE = Off; @@ -389,7 +389,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CURRENT_PROJECT_VERSION = 1; GCC_NO_COMMON_BLOCKS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_SWIFT3_OBJC_INFERENCE = Off; @@ -436,6 +436,7 @@ "$(inherited)", ); INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 4.2; @@ -451,6 +452,7 @@ "$(inherited)", ); INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 4.2; @@ -469,7 +471,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CURRENT_PROJECT_VERSION = 1; GCC_NO_COMMON_BLOCKS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 4.0; @@ -501,6 +503,7 @@ "$(inherited)", ); INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 4.2; @@ -519,7 +522,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CURRENT_PROJECT_VERSION = 1; GCC_NO_COMMON_BLOCKS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 4.0; @@ -551,6 +554,7 @@ "$(inherited)", ); INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 4.2; From 5cce09b92170e33965d10763346478e45a75f073 Mon Sep 17 00:00:00 2001 From: Matt Prowse Date: Thu, 21 Mar 2019 22:29:37 +1100 Subject: [PATCH 5/8] Fix houndci warning --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index e011eff..3e1c84e 100644 --- a/Package.swift +++ b/Package.swift @@ -10,7 +10,7 @@ let package = Package( .package(url: "https://github.com/antitypical/Result.git", from: "4.1.0"), .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "5.0.0"), .package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"), - .package(url: "https://github.com/Quick/Nimble.git", from: "8.0.1"), + .package(url: "https://github.com/Quick/Nimble.git", from: "8.0.1") ], targets: [ .target(name: "ReactiveTask", dependencies: ["Result", "ReactiveSwift"], path: "Sources"), From 7e6849c8a70a9c2e60271a9d8246706ff81f91f4 Mon Sep 17 00:00:00 2001 From: Matt Prowse Date: Thu, 21 Mar 2019 22:31:24 +1100 Subject: [PATCH 6/8] Update Podspec --- ReactiveTask.podspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ReactiveTask.podspec b/ReactiveTask.podspec index 5162f18..916ee1b 100644 --- a/ReactiveTask.podspec +++ b/ReactiveTask.podspec @@ -16,11 +16,11 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/Carthage/ReactiveTask.git", :tag => "#{s.version}" } # Directory glob for all Swift files s.source_files = "Sources/*.{swift}" - s.dependency 'Result', '~> 4.0' - s.dependency 'ReactiveSwift', '~> 4.0' + s.dependency 'Result', '~> 4.1' + s.dependency 'ReactiveSwift', '~> 5.0' s.pod_target_xcconfig = {"OTHER_SWIFT_FLAGS[config=Release]" => "$(inherited) -suppress-warnings" } s.cocoapods_version = ">= 1.4.0" - s.swift_version = "4.1.2" -end \ No newline at end of file + s.swift_version = "4.2" +end From 291a87aaf8c126d816b1b34d5ea37ae93c3221bc Mon Sep 17 00:00:00 2001 From: Sho Ikeda Date: Wed, 3 Apr 2019 09:22:50 +0900 Subject: [PATCH 7/8] [CI] Update CocoaPods --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index bade221..67b1b5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ matrix: - os: osx osx_image: xcode10.1 script: + - gem update cocoapods - pod repo update - pod lib lint notifications: From 8c0738eb2f9b2379908b41726b65d64f6bb8ef1a Mon Sep 17 00:00:00 2001 From: Sho Ikeda Date: Wed, 3 Apr 2019 09:24:11 +0900 Subject: [PATCH 8/8] Remove target-level SWIFT_VERSION settings --- ReactiveTask.xcodeproj/project.pbxproj | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/ReactiveTask.xcodeproj/project.pbxproj b/ReactiveTask.xcodeproj/project.pbxproj index 5594577..d6e072b 100644 --- a/ReactiveTask.xcodeproj/project.pbxproj +++ b/ReactiveTask.xcodeproj/project.pbxproj @@ -371,7 +371,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -393,7 +393,7 @@ SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -409,7 +409,6 @@ INFOPLIST_FILE = Sources/Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -423,7 +422,6 @@ INFOPLIST_FILE = Sources/Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; }; name = Release; }; @@ -439,7 +437,6 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -455,7 +452,6 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; }; name = Release; }; @@ -474,7 +470,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -490,7 +486,6 @@ INFOPLIST_FILE = Sources/Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; }; name = Test; }; @@ -506,7 +501,6 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; }; name = Test; }; @@ -525,7 +519,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -541,7 +535,6 @@ INFOPLIST_FILE = Sources/Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; }; name = Profile; }; @@ -557,7 +550,6 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; }; name = Profile; };