Skip to content

Commit a2732dd

Browse files
committed
Update fastlane, carthage & testing frameworks
1 parent 81a122b commit a2732dd

File tree

331 files changed

+5176
-5131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

331 files changed

+5176
-5131
lines changed

Cartfile.private

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "Quick/Nimble" ~> 8.0
2-
github "Quick/Quick" ~> 2.0
1+
github "Quick/Nimble" ~> 9.0
2+
github "Quick/Quick" ~> 3.1

Cartfile.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "Quick/Nimble" "v8.0.7"
2-
github "Quick/Quick" "v2.2.0"
1+
github "Quick/Nimble" "v9.0.0"
2+
github "Quick/Quick" "v3.1.2"

Carthage/Checkouts/Nimble/.github/ISSUE_TEMPLATE

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ Please replace this with what happened instead.
1616

1717
List the software versions you're using:
1818

19-
- Quick: *?.?.?*
20-
- Nimble: *?.?.?*
21-
- Xcode Version: *?.? (????)* (Open Xcode; In menubar: Xcode > About Xcode)
22-
- Swift Version: *?.?* (Open Xcode Preferences; Components > Toolchains. If none, use `Xcode Default`.)
19+
- Quick: *?.?.?*
20+
- Nimble: *?.?.?*
21+
- Xcode Version: *?.? (????)* (Open Xcode; In menubar: Xcode > About Xcode)
22+
- Swift Version: *?.?* (Open Xcode Preferences; Components > Toolchains. If none, use `Xcode Default`.)
2323

2424
Please also mention which package manager you used and its version. Delete the
2525
other package managers in this list:
2626

27-
- Cocoapods: *?.?.?* (Use `pod --version` in Terminal)
28-
- Carthage: *?.?* (Use `carthage version` in Terminal)
29-
- Swift Package Manager *?.?.? (swiftpm-???)* (Use `swift build --version` in Terminal)
27+
- Cocoapods: *?.?.?* (Use `pod --version` in Terminal)
28+
- Carthage: *?.?* (Use `carthage version` in Terminal)
29+
- Swift Package Manager *?.?.? (swiftpm-???)* (Use `swift build --version` in Terminal)
3030

3131
### Project that demonstrates the issue
3232

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
The PR should summarize what was changed and why. Here are some questions to
22
help you if you're not sure:
33

4-
- What behavior was changed?
5-
- What code was refactored / updated to support this change?
6-
- What issues are related to this PR? Or why was this change introduced?
4+
- What behavior was changed?
5+
- What code was refactored / updated to support this change?
6+
- What issues are related to this PR? Or why was this change introduced?
77

88
Checklist - While not every PR needs it, new features should consider this list:
99

10-
- [ ] Does this have tests?
11-
- [ ] Does this have documentation?
12-
- [ ] Does this break the public API (Requires major version bump)?
13-
- [ ] Is this a new feature (Requires minor version bump)?
14-
10+
- [ ] Does this have tests?
11+
- [ ] Does this have documentation?
12+
- [ ] Does this break the public API (Requires major version bump)?
13+
- [ ] Is this a new feature (Requires minor version bump)?
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "bundler"
9+
directory: "/"
10+
schedule:
11+
interval: "weekly"
12+
- package-ecosystem: "github-actions"
13+
directory: "/"
14+
schedule:
15+
interval: "weekly"

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

+25-14
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,40 @@ on:
66
- master
77
pull_request:
88
branches:
9-
- '*'
9+
- "*"
1010

1111
jobs:
12+
cocoapods:
13+
name: CocoaPods Lint
14+
runs-on: macos-latest
15+
steps:
16+
- uses: actions/checkout@v2
17+
- run: bundle install
18+
- run: ./test podspec
19+
1220
xcode:
13-
name: Xcode ${{ matrix.xcode }}
14-
runs-on: macOS-latest
21+
name: Xcode ${{ matrix.xcode }} - ${{ matrix.platform }}
22+
runs-on: macos-latest
1523
strategy:
1624
matrix:
17-
xcode: [11, 11.1, 11.2]
25+
xcode: [11.7, 12]
26+
platform: [macos, ios, tvos]
27+
fail-fast: false
28+
env:
29+
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
1830
steps:
19-
- uses: actions/checkout@v1
20-
- run: sudo xcode-select -s '/Applications/Xcode_${{ matrix.xcode }}.app'
21-
- run: ./test macos
22-
- run: ./test ios
23-
- run: ./test tvos
31+
- uses: actions/checkout@v2
32+
- run: ./test ${{ matrix.platform }}
33+
- run: ./test ${{ matrix.platform }}_xcodespm
2434

2535
swiftpm_darwin:
2636
name: SwiftPM, Darwin, Xcode ${{ matrix.xcode }}
27-
runs-on: macOS-latest
37+
runs-on: macos-latest
2838
strategy:
2939
matrix:
30-
xcode: [11, 11.1, 11.2]
40+
xcode: [11.7, 12]
41+
env:
42+
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
3143
steps:
32-
- uses: actions/checkout@v1
33-
- run: sudo xcode-select -s '/Applications/Xcode_${{ matrix.xcode }}.app'
34-
- run: ./test swiftpm
44+
- uses: actions/checkout@v2
45+
- run: ./test swiftpm
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: SwiftLint
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- '.github/workflows/swiftlint.yml'
7+
- '.swiftlint.yml'
8+
- '**/*.swift'
9+
10+
jobs:
11+
lint:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v2
15+
- uses: norio-nomura/action-swiftlint@3.1.0

Carthage/Checkouts/Nimble/.hound.yml

-2
This file was deleted.

Carthage/Checkouts/Nimble/.swift-version

-1
This file was deleted.

Carthage/Checkouts/Nimble/.swiftlint.yml

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ included:
77

88
excluded:
99
- Package.swift
10-
- Package@swift-4.2.swift
1110
- Carthage/Checkouts
1211
- Tests/NimbleTests/XCTestManifests.swift
1312
- Tests/NimbleTests/Helpers/XCTestCaseProvider.swift

Carthage/Checkouts/Nimble/.travis.yml

+20-35
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,40 @@
11
branches:
22
only:
33
- master
4-
- 8.x-branch
54

65
language: generic
7-
matrix:
6+
jobs:
87
include:
9-
- &cocoapods
10-
name: CocoaPods Lint
11-
os: osx
12-
osx_image: xcode10.3
13-
install: bundle install
14-
script: ./test podspec
15-
- &xcode
16-
name: Xcode 10.1 / Swift 4.2
17-
os: osx
18-
osx_image: xcode10.1
19-
script:
20-
- ./test macos
21-
- ./test ios
22-
- ./test tvos
23-
- <<: *xcode
24-
name: Xcode 10.3 / Swift 5.0
25-
osx_image: xcode10.3
26-
- &swiftpm_darwin
27-
name: SwiftPM / Darwin / Swift 4.2
28-
os: osx
29-
osx_image: xcode10.1
30-
script: ./test swiftpm
31-
- <<: *swiftpm_darwin
32-
name: SwiftPM / Darwin / Swift 5.0
33-
osx_image: xcode10.3
8+
# - &xcode
9+
# name: Xcode 10.3 / Swift 5.0
10+
# os: osx
11+
# osx_image: xcode10.3
12+
# script:
13+
# - ./test macos
14+
# - ./test ios
15+
# - ./test tvos
16+
# - &swiftpm_darwin
17+
# name: SwiftPM / Darwin / Swift 5.0
18+
# os: osx
19+
# osx_image: xcode10.3
20+
# script: ./test swiftpm
3421
- &swiftpm_linux
35-
name: SwiftPM / Linux / Swift 4.2.4
22+
name: SwiftPM / Linux / Swift 5.2.5
3623
os: linux
37-
dist: trusty
38-
sudo: required
3924
env:
40-
- SWIFT_VERSION=4.2.4
25+
- SWIFT_VERSION=5.2.5
4126
install:
4227
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
4328
script:
4429
- ./test swiftpm
4530
- <<: *swiftpm_linux
46-
name: SwiftPM / Linux / Swift 5.0.3
31+
name: SwiftPM / Linux / Swift 5.3 Development
4732
env:
48-
- SWIFT_VERSION=5.0.3
33+
- SWIFT_VERSION=5.3-DEVELOPMENT-SNAPSHOT-2020-09-04-a
4934
- <<: *swiftpm_linux
50-
name: SwiftPM / Linux / Swift 5.1 Development
35+
name: SwiftPM / Linux / Swift Development
5136
env:
52-
- SWIFT_VERSION=5.1-DEVELOPMENT-SNAPSHOT-2019-09-05-a
37+
- SWIFT_VERSION=DEVELOPMENT-SNAPSHOT-2020-08-31-a
5338
install: true
5439
script:
5540
- ./test $TYPE
+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
github "mattgallagher/CwlPreconditionTesting" == 1.2.0
1+
github "mattgallagher/CwlCatchException" ~> 2.0
2+
github "mattgallagher/CwlPreconditionTesting" ~> 2.0
+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
github "mattgallagher/CwlPreconditionTesting" "1.2.0"
1+
github "mattgallagher/CwlCatchException" "2.0.0"
2+
github "mattgallagher/CwlPreconditionTesting" "2.0.0"
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:4.2
1+
// swift-tools-version:5.0
22
import PackageDescription
33

44
let package = Package(
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# CwlCatchException
2+
A simple Swift wrapper around an Objective-C `@try`/`@catch` statement that selectively catches Objective-C exceptions by `NSException` subtype, rethrowing if any caught exception is not the expected subtype.
3+
4+
Look at [CwlCatchExceptionTests.swift](https://github.com/mattgallagher/CwlCatchException/blob/master/Tests/CwlCatchExceptionTests/CwlCatchExceptionTests.swift) for syntax.
5+
6+
## Requirements
7+
8+
From version 2.0.0-beta.1, building CwlCatchException requires Swift 5 or newer and the Swift Package Manager.
9+
10+
For use with older versions of Swift or other package managers, [use version 1.2.0 or older](https://github.com/mattgallagher/CwlCatchException/tree/1.2.0).
11+
12+
## Adding to your project
13+
14+
Add the following to the `dependencies` array in your "Package.swift" file:
15+
16+
.package(url: "https://github.com/mattgallagher/CwlCatchException.git", from: Version("2.0.0-beta.1"))
17+
18+
Or by adding `https://github.com/mattgallagher/CwlCatchException.git`, version 2.0.0-beta.1 or later, to the list of Swift packages for any project in Xcode.
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,4 @@
2020

2121
#import <Foundation/Foundation.h>
2222

23-
//! Project version number for CwlCatchException.
24-
FOUNDATION_EXPORT double CwlCatchExceptionVersionNumber;
25-
26-
//! Project version string for CwlCatchException.
27-
FOUNDATION_EXPORT const unsigned char CwlCatchExceptionVersionString[];
28-
2923
NSException* __nullable catchExceptionOfKind(Class __nonnull type, void (^ __nonnull inBlock)(void));

Carthage/Checkouts/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/README.md

-46
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
1-
// swift-tools-version:4.0
1+
// swift-tools-version:5.0
22
import PackageDescription
33

44
let package = Package(
55
name: "CwlPreconditionTesting",
66
products: [
7-
.library(name: "CwlPreconditionTesting", targets: ["CwlPreconditionTesting", "CwlMachBadInstructionHandler"])
7+
.library(name: "CwlPreconditionTesting", targets: ["CwlPreconditionTesting", "CwlMachBadInstructionHandler"]),
8+
.library(name: "CwlPosixPreconditionTesting", targets: ["CwlPosixPreconditionTesting"])
89
],
910
dependencies: [
10-
.package(url: "https://github.com/mattgallagher/CwlCatchException.git", from: "1.2.0")
11+
.package(url: "https://github.com/mattgallagher/CwlCatchException.git", from: "2.0.0")
1112
],
1213
targets: [
1314
.target(
1415
name: "CwlPreconditionTesting",
1516
dependencies: [
1617
.target(name: "CwlMachBadInstructionHandler"),
1718
.product(name: "CwlCatchException")
18-
],
19-
exclude: [
20-
"./Mach/CwlPreconditionTesting.h",
21-
"./Posix/CwlPreconditionTesting.h",
22-
"./CwlCatchBadInstructionPosix.swift"
2319
]
2420
),
21+
.target(
22+
name: "CwlPosixPreconditionTesting"
23+
),
2524
.target(name: "CwlMachBadInstructionHandler"),
26-
.testTarget(name: "CwlPreconditionTestingTests", dependencies: ["CwlPreconditionTesting"])
25+
.testTarget(name: "CwlPreconditionTestingTests", dependencies: ["CwlPreconditionTesting", "CwlPosixPreconditionTesting"])
2726
]
2827
)

0 commit comments

Comments
 (0)