Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Xcode 13 Support #3486

Merged
merged 2 commits into from Sep 13, 2021
Merged

Xcode 13 Support #3486

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6d4bc6
Update for Xcode 13, workaround Combine issues.
jshier Sep 8, 2021
7caac8c
Disable Combine on Windows and Linux.
jshier Sep 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Alamofire.xcodeproj/project.pbxproj
View file
Open in desktop
Expand Up @@ -1224,7 +1224,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1250;
LastUpgradeCheck = 1250;
LastUpgradeCheck = 1300;
ORGANIZATIONNAME = Alamofire;
TargetAttributes = {
31293064263E17D600473CEA = {
Expand Down
2 changes: 1 addition & 1 deletion Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire iOS.xcscheme
View file
Open in desktop
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1250"
LastUpgradeVersion = "1300"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire macOS.xcscheme
View file
Open in desktop
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1250"
LastUpgradeVersion = "1300"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire tvOS.xcscheme
View file
Open in desktop
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1250"
LastUpgradeVersion = "1300"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire watchOS.xcscheme
View file
Open in desktop
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1250"
LastUpgradeVersion = "1300"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Example/iOS Example.xcodeproj/xcshareddata/xcschemes/iOS Example.xcscheme
View file
Open in desktop
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1250"
LastUpgradeVersion = "1300"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Source/Combine.swift
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
// THE SOFTWARE.
//

#if canImport(Combine)
#if !(os(iOS) && (arch(i386) || arch(arm)))
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this check must be broader to check for windows and linux that doesn't support Combine framework


import Combine
import Dispatch
Expand Down
2 changes: 1 addition & 1 deletion Tests/CombineTests.swift
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
// THE SOFTWARE.
//

#if canImport(Combine)
#if !(os(iOS) && (arch(i386) || arch(arm)))
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here


import Alamofire
import Combine
Expand Down
2 changes: 1 addition & 1 deletion ...le/watchOS Example.xcodeproj/xcshareddata/xcschemes/watchOS Example WatchKit App.xcscheme
View file
Open in desktop
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1250"
LastUpgradeVersion = "1300"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down