From e6d4bc63c72bbfdc1ac265d996ca08aa222f6b68 Mon Sep 17 00:00:00 2001 From: Jon Shier Date: Wed, 8 Sep 2021 15:47:00 -0400 Subject: [PATCH 1/2] Update for Xcode 13, workaround Combine issues. --- Alamofire.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Alamofire iOS.xcscheme | 2 +- .../xcshareddata/xcschemes/Alamofire macOS.xcscheme | 2 +- .../xcshareddata/xcschemes/Alamofire tvOS.xcscheme | 2 +- .../xcshareddata/xcschemes/Alamofire watchOS.xcscheme | 2 +- .../xcshareddata/xcschemes/iOS Example.xcscheme | 2 +- Source/Combine.swift | 2 +- Tests/CombineTests.swift | 2 +- .../xcschemes/watchOS Example WatchKit App.xcscheme | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Alamofire.xcodeproj/project.pbxproj b/Alamofire.xcodeproj/project.pbxproj index bacbf7721..dd7182d00 100644 --- a/Alamofire.xcodeproj/project.pbxproj +++ b/Alamofire.xcodeproj/project.pbxproj @@ -1224,7 +1224,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1250; - LastUpgradeCheck = 1250; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = Alamofire; TargetAttributes = { 31293064263E17D600473CEA = { diff --git a/Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire iOS.xcscheme b/Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire iOS.xcscheme index 46f34f1df..3c08a39d7 100644 --- a/Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire iOS.xcscheme +++ b/Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire iOS.xcscheme @@ -1,6 +1,6 @@ Date: Thu, 9 Sep 2021 13:37:25 -0400 Subject: [PATCH 2/2] Disable Combine on Windows and Linux. --- Source/Combine.swift | 2 +- Tests/CombineTests.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Combine.swift b/Source/Combine.swift index 27e662602..b5e50441d 100644 --- a/Source/Combine.swift +++ b/Source/Combine.swift @@ -22,7 +22,7 @@ // THE SOFTWARE. // -#if !(os(iOS) && (arch(i386) || arch(arm))) +#if !((os(iOS) && (arch(i386) || arch(arm))) || os(Windows) || os(Linux)) import Combine import Dispatch diff --git a/Tests/CombineTests.swift b/Tests/CombineTests.swift index 4a5a9991e..85ed18ad9 100644 --- a/Tests/CombineTests.swift +++ b/Tests/CombineTests.swift @@ -22,7 +22,7 @@ // THE SOFTWARE. // -#if !(os(iOS) && (arch(i386) || arch(arm))) +#if !((os(iOS) && (arch(i386) || arch(arm))) || os(Windows) || os(Linux)) import Alamofire import Combine