Merge pull request #310 from chris-araman/runpath

✨ Support for Apple Silicon (arm64)

CHANGELOG.md

@@ -10,6 +10,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - 🎨 Improve `mas list` command output #278
 - 🐛 Fix alignment of 2nd column of list command output #298
 - ✨ `Makefile` #277
+- 🐛 Specify desired LD_RUNPATH_SEARCH_PATHS at link-time #310
+- ⬆️ Commandant (0.18.0) #310
+- ⬆️ Nimble (9.0.0) #310
+- ⬆️ Quick (3.1.0) #310
+- 🕊 Swift 5.2 #310
+  - ⚒️ Xcode 11.4 and macOS 10.15.2 required to build
+- ✨ Support for Apple Silicon (arm64) #310
+  - ⚒️ Xcode 12.2 and macOS 10.15.4 required to build
+- 🐛 Default PREFIX to /opt/homebrew on Apple Silicon (arm64)
 
 ## [v1.7.1] 🐛 Search JSON Fix - 2020-09-06
 

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "Carthage/Commandant" "0.17.0"
-github "Quick/Nimble" "v8.1.2"
-github "Quick/Quick" "v3.0.0"
+github "Carthage/Commandant" "0.18.0"
+github "Quick/Nimble" "v9.0.0"
+github "Quick/Quick" "v3.1.0"

Carthage/Checkouts/Commandant/.gitignore

@@ -1,24 +1,22 @@
-# Xcode
-#
-.DS_Store
-build/
-*.pbxuser
-!default.pbxuser
-*.mode1v3
 !default.mode1v3
-*.mode2v3
 !default.mode2v3
-*.perspectivev3
+!default.pbxuser
 !default.perspectivev3
-xcuserdata
-*.xccheckout
-*.moved-aside
-DerivedData
 *.hmap
 *.ipa
-*.xcuserstate
+*.mode1v3
+*.mode2v3
+*.moved-aside
+*.pbxuser
+*.perspectivev3
+*.xccheckout
 *.xcscmblueprint
-
+*.xcuserstate
+.DS_Store
+.build/
+.swiftpm/
 Carthage/Build
+DerivedData
 Packages/
-.build/
+build/
+xcuserdata

Carthage/Checkouts/Commandant/.swift-version

@@ -1 +1 @@
-5.0
+5.2

Carthage/Checkouts/Commandant/.travis.yml

@@ -9,7 +9,7 @@ aliases:
     script:
       - rm .swift-version
       - gem update cocoapods
-      - pod repo update master
+      - pod setup
       - pod lib lint --verbose
     os: osx
     language: objective-c
@@ -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

Carthage/Checkouts/Commandant/Cartfile.private

@@ -1,3 +1,3 @@
-github "jspahrsummers/xcconfigs" ~> 0.9
-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

Carthage/Checkouts/Commandant/Cartfile.resolved

@@ -1,3 +1,3 @@
-github "Quick/Nimble" "v8.0.0"
-github "Quick/Quick" "v2.0.0"
-github "jspahrsummers/xcconfigs" "0.9"
+github "Quick/Nimble" "v9.0.0"
+github "Quick/Quick" "v3.1.0"
+github "jspahrsummers/xcconfigs" "1.1"

Carthage/Checkouts/Commandant/Carthage/Checkouts/Nimble/.github/ISSUE_TEMPLATE

@@ -16,17 +16,17 @@ Please replace this with what happened instead.
 
 List the software versions you're using:
 
- - Quick: *?.?.?*
- - Nimble: *?.?.?*
- - Xcode Version: *?.? (????)* (Open Xcode; In menubar: Xcode > About Xcode)
- - Swift Version: *?.?* (Open Xcode Preferences; Components > Toolchains. If none, use `Xcode Default`.)
+- Quick: *?.?.?*
+- Nimble: *?.?.?*
+- Xcode Version: *?.? (????)* (Open Xcode; In menubar: Xcode > About Xcode)
+- Swift Version: *?.?* (Open Xcode Preferences; Components > Toolchains. If none, use `Xcode Default`.)
 
 Please also mention which package manager you used and its version. Delete the
 other package managers in this list:
 
- - Cocoapods: *?.?.?* (Use `pod --version` in Terminal)
- - Carthage: *?.?* (Use `carthage version` in Terminal)
- - Swift Package Manager *?.?.? (swiftpm-???)* (Use `swift build --version` in Terminal)
+- Cocoapods: *?.?.?* (Use `pod --version` in Terminal)
+- Carthage: *?.?* (Use `carthage version` in Terminal)
+- Swift Package Manager *?.?.? (swiftpm-???)* (Use `swift build --version` in Terminal)
 
 ### Project that demonstrates the issue
 

Carthage/Checkouts/Commandant/Carthage/Checkouts/Nimble/.github/PULL_REQUEST_TEMPLATE

@@ -1,14 +1,13 @@
 The PR should summarize what was changed and why. Here are some questions to
 help you if you're not sure:
 
- - What behavior was changed?
- - What code was refactored / updated to support this change?
- - What issues are related to this PR? Or why was this change introduced?
+- What behavior was changed?
+- What code was refactored / updated to support this change?
+- What issues are related to this PR? Or why was this change introduced?
 
 Checklist - While not every PR needs it, new features should consider this list:
 
- - [ ] Does this have tests?
- - [ ] Does this have documentation?
- - [ ] Does this break the public API (Requires major version bump)?
- - [ ] Is this a new feature (Requires minor version bump)?
-
+- [ ] Does this have tests?
+- [ ] Does this have documentation?
+- [ ] Does this break the public API (Requires major version bump)?
+- [ ] Is this a new feature (Requires minor version bump)?

Carthage/Checkouts/Commandant/Carthage/Checkouts/Nimble/.github/dependabot.yml

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

Carthage/Checkouts/Commandant/Carthage/Checkouts/Nimble/.github/workflows/ci.yml

@@ -0,0 +1,45 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - "*"
+
+jobs:
+  cocoapods:
+    name: CocoaPods Lint
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: bundle install
+      - run: ./test podspec
+
+  xcode:
+    name: Xcode ${{ matrix.xcode }} - ${{ matrix.platform }}
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        xcode: [11.7, 12]
+        platform: [macos, ios, tvos]
+      fail-fast: false
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
+    steps:
+      - uses: actions/checkout@v2
+      - run: ./test ${{ matrix.platform }}
+      - run: ./test ${{ matrix.platform }}_xcodespm
+
+  swiftpm_darwin:
+    name: SwiftPM, Darwin, Xcode ${{ matrix.xcode }}
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        xcode: [11.7, 12]
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
+    steps:
+      - uses: actions/checkout@v2
+      - run: ./test swiftpm

Carthage/Checkouts/Commandant/Carthage/Checkouts/Nimble/.github/workflows/swiftlint.yml

@@ -0,0 +1,15 @@
+name: SwiftLint
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/swiftlint.yml'
+      - '.swiftlint.yml'
+      - '**/*.swift'
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest    
+    steps:
+      - uses: actions/checkout@v2
+      - uses: norio-nomura/action-swiftlint@3.1.0

Carthage/Checkouts/Commandant/Carthage/Checkouts/Nimble/.swiftlint.yml

@@ -6,6 +6,7 @@ included:
   - Tests
 
 excluded:
+  - Package.swift
   - Carthage/Checkouts
   - Tests/NimbleTests/XCTestManifests.swift
   - Tests/NimbleTests/Helpers/XCTestCaseProvider.swift

Carthage/Checkouts/Commandant/Carthage/Checkouts/Nimble/.travis.yml

@@ -1,49 +1,40 @@
-osx_image: xcode10.1
+branches:
+  only:
+    - master
+
 language: generic
-matrix:
+jobs:
   include:
-    - os: osx
-      sudo: required
-      env: TYPE=podspec
-      install: bundle install
-      name: CocoaPods Lint
-    - os: osx
-      env: TYPE=ios
-      name: iOS / Swift 4.2.1
-    - os: osx
-      env: TYPE=tvos
-      name: tvOS / Swift 4.2.1
-    - os: osx
-      env: TYPE=macos
-      name: macOS / Swift 4.2.1
-    - os: osx
-      env: TYPE=macos
-      osx_image: xcode10.2
-      name: macOS / Swift 5.0
-    - os: osx
-      env:
-        - TYPE=swiftpm
-    - os: osx
-      env:
-        - TYPE=swiftpm
-      osx_image: xcode10.2
-    - &linux
-      name: Linux / Swift 4.2.1
+    # - &xcode
+    #   name: Xcode 10.3 / Swift 5.0
+    #   os: osx
+    #   osx_image: xcode10.3
+    #   script:
+    #     - ./test macos
+    #     - ./test ios
+    #     - ./test tvos
+    # - &swiftpm_darwin
+    #   name: SwiftPM / Darwin / Swift 5.0
+    #   os: osx
+    #   osx_image: xcode10.3
+    #   script: ./test swiftpm
+    - &swiftpm_linux
+      name: SwiftPM / Linux / Swift 5.2.5
       os: linux
-      dist: trusty
-      sudo: required
       env:
-        - TYPE=swiftpm
-        - SWIFT_VERSION=4.2.1
+        - SWIFT_VERSION=5.2.5
       install:
-        - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
-    - <<: *linux
-      name: Linux / Swift 5.0 Development
+        - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
+      script:
+        - ./test swiftpm
+    - <<: *swiftpm_linux
+      name: SwiftPM / Linux / Swift 5.3 Development
       env:
-        - TYPE=swiftpm
-        - SWIFT_VERSION=5.0-DEVELOPMENT-SNAPSHOT-2019-02-28-a
-      install:
-        - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
+        - SWIFT_VERSION=5.3-DEVELOPMENT-SNAPSHOT-2020-09-04-a
+    - <<: *swiftpm_linux
+      name: SwiftPM / Linux / Swift Development
+      env:
+        - SWIFT_VERSION=DEVELOPMENT-SNAPSHOT-2020-08-31-a
 install: true
 script:
   - ./test $TYPE

Carthage/Checkouts/Commandant/Carthage/Checkouts/Nimble/Cartfile.private

@@ -1 +1,2 @@
-github "mattgallagher/CwlPreconditionTesting" "1e62a726d54c743f4585233f08fcaac7307319b5"
+github "mattgallagher/CwlCatchException" ~> 2.0
+github "mattgallagher/CwlPreconditionTesting" ~> 2.0

Carthage/Checkouts/Commandant/Carthage/Checkouts/Nimble/Cartfile.resolved

@@ -1,2 +1,2 @@
-github "mattgallagher/CwlCatchException" "b14c111e9b33cd142bd4bc75c482cfd5c3490923"
-github "mattgallagher/CwlPreconditionTesting" "1e62a726d54c743f4585233f08fcaac7307319b5"
+github "mattgallagher/CwlCatchException" "2.0.0"
+github "mattgallagher/CwlPreconditionTesting" "2.0.0"

Carthage/Checkouts/Commandant/Carthage/Checkouts/Nimble/Carthage/Checkouts/CwlCatchException/LICENSE.txt

@@ -1,3 +1,5 @@
+ISC License
+
 Copyright © 2017 Matt Gallagher ( http://cocoawithlove.com ). All rights reserved.
 
 Permission to use, copy, modify, and/or distribute this software for any

Carthage/Checkouts/Commandant/Carthage/Checkouts/Nimble/Carthage/Checkouts/CwlCatchException/Package.swift

@@ -1,9 +1,14 @@
+// swift-tools-version:5.0
 import PackageDescription
 
 let package = Package(
 	name: "CwlCatchException",
+	products: [
+		.library(name: "CwlCatchException", targets: ["CwlCatchException"]),
+	],
 	targets: [
-		Target(name: "CwlCatchException", dependencies: ["CwlCatchExceptionSupport"]),
-		Target(name: "CwlCatchExceptionSupport")
+		.target(name: "CwlCatchException", dependencies: [.target(name: "CwlCatchExceptionSupport")]),
+		.target(name: "CwlCatchExceptionSupport"),
+		.testTarget(name: "CwlCatchExceptionTests", dependencies: [.target(name: "CwlCatchException")])
 	]
 )