Merge pull request #158 from chris-araman/arm64

✨ Support for Apple Silicon (arm64) Macs
Carthage · Feb 10, 2021 · 775d687 · 775d687
2 parents 176a421 + d8e09cd
commit 775d687
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 31 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-5.0
+5.2
diff --git a/.travis.yml b/.travis.yml
@@ -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)"
@@ -41,20 +41,20 @@ branches:
 matrix:
   include:
     - <<: *xcode
-      name: Xcode 10.2 / Swift 5.0
-      osx_image: xcode10.2
-      env: JOB=Xcode10.2
+      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

diff --git a/Cartfile.private b/Cartfile.private
@@ -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
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -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"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs
diff --git a/Commandant.podspec b/Commandant.podspec
@@ -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
diff --git a/Commandant.xcodeproj/project.pbxproj b/Commandant.xcodeproj/project.pbxproj
@@ -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 = "";
 			};
@@ -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 = "";
 			};
@@ -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 = "";
 			};
@@ -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 = "";
 			};

diff --git a/Package.resolved b/Package.resolved
@@ -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"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.2
 
 import PackageDescription
 
@@ -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: []),
+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