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

✨ Support for Apple Silicon (arm64) Macs #158

Merged
merged 5 commits into from
Feb 10, 2021
Merged

✨ Support for Apple Silicon (arm64) Macs #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b6f52bd
⬆️ xcconfigs (1.1), Quick (3.0.0), Nimble (9.0.0)
chris-araman Jan 19, 2021
f2c0fd8
⬆️ Xcode (11.4), Swift (5.2)
chris-araman Jan 21, 2021
cce9022
⬆️ Bump swiftpm_linux to Xenial
chris-araman Jan 21, 2021
1a1af18
⬆️ Quick (3.0.1)
chris-araman Feb 5, 2021
d8e09cd
⬆️ Quick (3.1.0)
chris-araman Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .swift-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.0
5.2
18 changes: 9 additions & 9 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ aliases:
- &swiftpm_linux
<<: *swiftpm
sudo: required
dist: trusty
dist: xenial
language: generic
install:
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
Expand All @@ -41,20 +41,20 @@ branches:
matrix:
include:
- <<: *xcode
name: Xcode 10.2 / Swift 5.0
osx_image: xcode10.2
env: JOB=Xcode10.2
Comment on lines -44 to -46
Copy link

Choose a reason for hiding this comment

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

Does this PR drop support for Swift 5.0 and/or Xcode 10.2's sdk? If so, that's probably something we should be cautious about.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I believe it would drop support for Swift 5.0 because Quick 3.0.0 and Nimble 9.0.0 require Swift 5.2 and Xcode 11.4.

Alternatively, we could urge the maintainers of Quick and Nimble to port Apple Silicon support back to Quick 2.x and Nimble 8.x.

Incidentally, I think we'll still need to wait for a subsequent release of Quick, as Quick/Quick@1172a5d wasn't in the 3.0.0 release.

Copy link

Choose a reason for hiding this comment

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

Got it, thanks!

Copy link
Member

Choose a reason for hiding this comment

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

@ikesyo I would love to hear your quick thoughts about these Swift version changes as you've been handling that well for several of the mentioned projects.

name: Xcode 11.4 / Swift 5.2
osx_image: xcode11.4
env: JOB=Xcode11.4
- <<: *cocoapods
name: CocoaPods Lint
osx_image: xcode10.2
osx_image: xcode11.4
- <<: *swiftpm_darwin
name: SwiftPM / Swift 5.0
osx_image: xcode10.2
name: SwiftPM / Swift 5.2
osx_image: xcode11.4
- <<: *swiftpm_linux
name: Linux / Swift 5.0
name: Linux / Swift 5.2
env:
- JOB=Linux
- SWIFT_VERSION=5.0
- SWIFT_VERSION=5.2

notifications:
email: false
Expand Down
6 changes: 3 additions & 3 deletions Cartfile.private
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "jspahrsummers/xcconfigs" ~> 1.0
github "Quick/Quick" ~> 2.0
github "Quick/Nimble" ~> 8.0
github "jspahrsummers/xcconfigs" ~> 1.1
github "Quick/Quick" ~> 3.1.0
github "Quick/Nimble" ~> 9.0
6 changes: 3 additions & 3 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "Quick/Nimble" "v8.1.1"
github "Quick/Quick" "v2.2.1"
github "jspahrsummers/xcconfigs" "1.0"
github "Quick/Nimble" "v9.0.0"
github "Quick/Quick" "v3.1.0"
github "jspahrsummers/xcconfigs" "1.1"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Open in desktop
Submodule Nimble updated 131 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Open in desktop
Submodule Quick updated 22 files
+7 −7 .github/workflows/ci.yml
+0 −1 .swift-version
+21 −36 .travis.yml
+1 −1 Externals/Nimble
+1 −1 Gemfile
+1 −1 Gemfile.lock
+20 −2 Package.resolved
+2 −2 Package.swift
+7 −3 Package@swift-5.3.swift
+3 −3 Quick.podspec
+2 −4 Quick.xcodeproj/project.pbxproj
+2 −1 README.md
+1 −5 Rakefile
+3 −3 Sources/Quick/DSL/DSL.swift
+3 −3 Sources/Quick/DSL/World+DSL.swift
+18 −3 Sources/Quick/Example.swift
+26 −0 Sources/Quick/QuickSpec.swift
+12 −4 Sources/QuickObjectiveC/QuickSpec.m
+1 −0 Tests/LinuxMain.swift
+48 −0 Tests/QuickTests/QuickTests/FunctionalTests/ItTests.swift
+0 −5 script/travis-install-linux
+0 −4 script/travis-script-linux
2 changes: 1 addition & 1 deletion Carthage/Checkouts/xcconfigs
Open in desktop
Submodule xcconfigs updated from d0f899 to 4ced0a
2 changes: 1 addition & 1 deletion Commandant.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ Commandant is a Swift framework for parsing command-line arguments, inspired by
s.source_files = "Sources/**/*.swift"

s.cocoapods_version = ">= 1.4.0"
s.swift_version = "5.0"
s.swift_version = "5.2"
end
8 changes: 4 additions & 4 deletions Commandant.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@
ENABLE_TESTABILITY = YES;
MACOSX_DEPLOYMENT_TARGET = 10.9;
ONLY_ACTIVE_ARCH = YES;
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 5.2;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand All @@ -453,7 +453,7 @@
CURRENT_PROJECT_VERSION = 1;
MACOSX_DEPLOYMENT_TARGET = 10.9;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 5.2;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down Expand Up @@ -536,7 +536,7 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CURRENT_PROJECT_VERSION = 1;
MACOSX_DEPLOYMENT_TARGET = 10.9;
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 5.2;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down Expand Up @@ -587,7 +587,7 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CURRENT_PROJECT_VERSION = 1;
MACOSX_DEPLOYMENT_TARGET = 10.9;
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 5.2;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down
26 changes: 22 additions & 4 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,40 @@
{
"object": {
"pins": [
{
"package": "CwlCatchException",
"repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",
"state": {
"branch": null,
"revision": "f809deb30dc5c9d9b78c872e553261a61177721a",
"version": "2.0.0"
}
},
{
"package": "CwlPreconditionTesting",
"repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git",
"state": {
"branch": null,
"revision": "02b7a39a99c4da27abe03cab2053a9034379639f",
"version": "2.0.0"
}
},
{
"package": "Nimble",
"repositoryURL": "https://github.com/Quick/Nimble.git",
"state": {
"branch": null,
"revision": "2b1809051b4a65c1d7f5233331daa24572cd7fca",
"version": "8.1.1"
"revision": "e491a6731307bb23783bf664d003be9b2fa59ab5",
"version": "9.0.0"
}
},
{
"package": "Quick",
"repositoryURL": "https://github.com/Quick/Quick.git",
"state": {
"branch": null,
"revision": "09b3becb37cb2163919a3842a4c5fa6ec7130792",
"version": "2.2.1"
"revision": "8a10ae40b78d2360ca56638f15fe721be8529993",
"version": "3.1.0"
}
}
]
Expand Down
6 changes: 3 additions & 3 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.0
// swift-tools-version:5.2

import PackageDescription

Expand All @@ -8,8 +8,8 @@ let package = Package(
.library(name: "Commandant", targets: ["Commandant"]),
],
dependencies: [
.package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"),
.package(url: "https://github.com/Quick/Nimble.git", from: "8.0.0"),
.package(url: "https://github.com/Quick/Quick.git", from: "3.1.0"),
.package(url: "https://github.com/Quick/Nimble.git", from: "9.0.0"),
],
targets: [
.target(name: "Commandant", dependencies: []),
Expand Down