Skip to content

Commit 775d687

Browse files
authored
Merge pull request #158 from chris-araman/arm64
✨ Support for Apple Silicon (arm64) Macs
2 parents 176a421 + d8e09cd commit 775d687

File tree

11 files changed

+49
-31
lines changed

11 files changed

+49
-31
lines changed

.swift-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.0
1+
5.2

.travis.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ aliases:
2929
- &swiftpm_linux
3030
<<: *swiftpm
3131
sudo: required
32-
dist: trusty
32+
dist: xenial
3333
language: generic
3434
install:
3535
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
@@ -41,20 +41,20 @@ branches:
4141
matrix:
4242
include:
4343
- <<: *xcode
44-
name: Xcode 10.2 / Swift 5.0
45-
osx_image: xcode10.2
46-
env: JOB=Xcode10.2
44+
name: Xcode 11.4 / Swift 5.2
45+
osx_image: xcode11.4
46+
env: JOB=Xcode11.4
4747
- <<: *cocoapods
4848
name: CocoaPods Lint
49-
osx_image: xcode10.2
49+
osx_image: xcode11.4
5050
- <<: *swiftpm_darwin
51-
name: SwiftPM / Swift 5.0
52-
osx_image: xcode10.2
51+
name: SwiftPM / Swift 5.2
52+
osx_image: xcode11.4
5353
- <<: *swiftpm_linux
54-
name: Linux / Swift 5.0
54+
name: Linux / Swift 5.2
5555
env:
5656
- JOB=Linux
57-
- SWIFT_VERSION=5.0
57+
- SWIFT_VERSION=5.2
5858

5959
notifications:
6060
email: false

Cartfile.private

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "jspahrsummers/xcconfigs" ~> 1.0
2-
github "Quick/Quick" ~> 2.0
3-
github "Quick/Nimble" ~> 8.0
1+
github "jspahrsummers/xcconfigs" ~> 1.1
2+
github "Quick/Quick" ~> 3.1.0
3+
github "Quick/Nimble" ~> 9.0

Cartfile.resolved

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "Quick/Nimble" "v8.1.1"
2-
github "Quick/Quick" "v2.2.1"
3-
github "jspahrsummers/xcconfigs" "1.0"
1+
github "Quick/Nimble" "v9.0.0"
2+
github "Quick/Quick" "v3.1.0"
3+
github "jspahrsummers/xcconfigs" "1.1"

Carthage/Checkouts/Nimble

Submodule Nimble updated 131 files

Carthage/Checkouts/xcconfigs

Commandant.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ Commandant is a Swift framework for parsing command-line arguments, inspired by
2626
s.source_files = "Sources/**/*.swift"
2727

2828
s.cocoapods_version = ">= 1.4.0"
29-
s.swift_version = "5.0"
29+
s.swift_version = "5.2"
3030
end

Commandant.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@
432432
ENABLE_TESTABILITY = YES;
433433
MACOSX_DEPLOYMENT_TARGET = 10.9;
434434
ONLY_ACTIVE_ARCH = YES;
435-
SWIFT_VERSION = 5.0;
435+
SWIFT_VERSION = 5.2;
436436
VERSIONING_SYSTEM = "apple-generic";
437437
VERSION_INFO_PREFIX = "";
438438
};
@@ -453,7 +453,7 @@
453453
CURRENT_PROJECT_VERSION = 1;
454454
MACOSX_DEPLOYMENT_TARGET = 10.9;
455455
SWIFT_COMPILATION_MODE = wholemodule;
456-
SWIFT_VERSION = 5.0;
456+
SWIFT_VERSION = 5.2;
457457
VERSIONING_SYSTEM = "apple-generic";
458458
VERSION_INFO_PREFIX = "";
459459
};
@@ -536,7 +536,7 @@
536536
CLANG_WARN_SUSPICIOUS_MOVE = YES;
537537
CURRENT_PROJECT_VERSION = 1;
538538
MACOSX_DEPLOYMENT_TARGET = 10.9;
539-
SWIFT_VERSION = 5.0;
539+
SWIFT_VERSION = 5.2;
540540
VERSIONING_SYSTEM = "apple-generic";
541541
VERSION_INFO_PREFIX = "";
542542
};
@@ -587,7 +587,7 @@
587587
CLANG_WARN_SUSPICIOUS_MOVE = YES;
588588
CURRENT_PROJECT_VERSION = 1;
589589
MACOSX_DEPLOYMENT_TARGET = 10.9;
590-
SWIFT_VERSION = 5.0;
590+
SWIFT_VERSION = 5.2;
591591
VERSIONING_SYSTEM = "apple-generic";
592592
VERSION_INFO_PREFIX = "";
593593
};

Package.resolved

+22-4
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,40 @@
11
{
22
"object": {
33
"pins": [
4+
{
5+
"package": "CwlCatchException",
6+
"repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",
7+
"state": {
8+
"branch": null,
9+
"revision": "f809deb30dc5c9d9b78c872e553261a61177721a",
10+
"version": "2.0.0"
11+
}
12+
},
13+
{
14+
"package": "CwlPreconditionTesting",
15+
"repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git",
16+
"state": {
17+
"branch": null,
18+
"revision": "02b7a39a99c4da27abe03cab2053a9034379639f",
19+
"version": "2.0.0"
20+
}
21+
},
422
{
523
"package": "Nimble",
624
"repositoryURL": "https://github.com/Quick/Nimble.git",
725
"state": {
826
"branch": null,
9-
"revision": "2b1809051b4a65c1d7f5233331daa24572cd7fca",
10-
"version": "8.1.1"
27+
"revision": "e491a6731307bb23783bf664d003be9b2fa59ab5",
28+
"version": "9.0.0"
1129
}
1230
},
1331
{
1432
"package": "Quick",
1533
"repositoryURL": "https://github.com/Quick/Quick.git",
1634
"state": {
1735
"branch": null,
18-
"revision": "09b3becb37cb2163919a3842a4c5fa6ec7130792",
19-
"version": "2.2.1"
36+
"revision": "8a10ae40b78d2360ca56638f15fe721be8529993",
37+
"version": "3.1.0"
2038
}
2139
}
2240
]

Package.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.0
1+
// swift-tools-version:5.2
22

33
import PackageDescription
44

@@ -8,8 +8,8 @@ let package = Package(
88
.library(name: "Commandant", targets: ["Commandant"]),
99
],
1010
dependencies: [
11-
.package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"),
12-
.package(url: "https://github.com/Quick/Nimble.git", from: "8.0.0"),
11+
.package(url: "https://github.com/Quick/Quick.git", from: "3.1.0"),
12+
.package(url: "https://github.com/Quick/Nimble.git", from: "9.0.0"),
1313
],
1414
targets: [
1515
.target(name: "Commandant", dependencies: []),

0 commit comments

Comments
 (0)