Skip to content

Commit

Permalink
Update fastlane, carthage & testing frameworks
Browse files Browse the repository at this point in the history
  • Loading branch information
gaetanzanella committed Mar 18, 2021
1 parent 81a122b commit a2732dd
Show file tree
Hide file tree
Showing 331 changed files with 5,176 additions and 5,131 deletions.
4 changes: 2 additions & 2 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Quick/Nimble" ~> 8.0
github "Quick/Quick" ~> 2.0
github "Quick/Nimble" ~> 9.0
github "Quick/Quick" ~> 3.1
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Quick/Nimble" "v8.0.7"
github "Quick/Quick" "v2.2.0"
github "Quick/Nimble" "v9.0.0"
github "Quick/Quick" "v3.1.2"
14 changes: 7 additions & 7 deletions Carthage/Checkouts/Nimble/.github/ISSUE_TEMPLATE
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
15 changes: 7 additions & 8 deletions Carthage/Checkouts/Nimble/.github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
@@ -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)?
15 changes: 15 additions & 0 deletions Carthage/Checkouts/Nimble/.github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -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"
39 changes: 25 additions & 14 deletions Carthage/Checkouts/Nimble/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,40 @@ on:
- 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 }}
runs-on: macOS-latest
name: Xcode ${{ matrix.xcode }} - ${{ matrix.platform }}
runs-on: macos-latest
strategy:
matrix:
xcode: [11, 11.1, 11.2]
xcode: [11.7, 12]
platform: [macos, ios, tvos]
fail-fast: false
env:
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
steps:
- uses: actions/checkout@v1
- run: sudo xcode-select -s '/Applications/Xcode_${{ matrix.xcode }}.app'
- run: ./test macos
- run: ./test ios
- run: ./test tvos
- 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
runs-on: macos-latest
strategy:
matrix:
xcode: [11, 11.1, 11.2]
xcode: [11.7, 12]
env:
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
steps:
- uses: actions/checkout@v1
- run: sudo xcode-select -s '/Applications/Xcode_${{ matrix.xcode }}.app'
- run: ./test swiftpm
- uses: actions/checkout@v2
- run: ./test swiftpm
15 changes: 15 additions & 0 deletions Carthage/Checkouts/Nimble/.github/workflows/swiftlint.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions Carthage/Checkouts/Nimble/.hound.yml

This file was deleted.

1 change: 0 additions & 1 deletion Carthage/Checkouts/Nimble/.swift-version

This file was deleted.

1 change: 0 additions & 1 deletion Carthage/Checkouts/Nimble/.swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ included:

excluded:
- Package.swift
- Package@swift-4.2.swift
- Carthage/Checkouts
- Tests/NimbleTests/XCTestManifests.swift
- Tests/NimbleTests/Helpers/XCTestCaseProvider.swift
Expand Down
55 changes: 20 additions & 35 deletions Carthage/Checkouts/Nimble/.travis.yml
Original file line number Diff line number Diff line change
@@ -1,55 +1,40 @@
branches:
only:
- master
- 8.x-branch

language: generic
matrix:
jobs:
include:
- &cocoapods
name: CocoaPods Lint
os: osx
osx_image: xcode10.3
install: bundle install
script: ./test podspec
- &xcode
name: Xcode 10.1 / Swift 4.2
os: osx
osx_image: xcode10.1
script:
- ./test macos
- ./test ios
- ./test tvos
- <<: *xcode
name: Xcode 10.3 / Swift 5.0
osx_image: xcode10.3
- &swiftpm_darwin
name: SwiftPM / Darwin / Swift 4.2
os: osx
osx_image: xcode10.1
script: ./test swiftpm
- <<: *swiftpm_darwin
name: SwiftPM / Darwin / Swift 5.0
osx_image: xcode10.3
# - &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 4.2.4
name: SwiftPM / Linux / Swift 5.2.5
os: linux
dist: trusty
sudo: required
env:
- SWIFT_VERSION=4.2.4
- SWIFT_VERSION=5.2.5
install:
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
script:
- ./test swiftpm
- <<: *swiftpm_linux
name: SwiftPM / Linux / Swift 5.0.3
name: SwiftPM / Linux / Swift 5.3 Development
env:
- SWIFT_VERSION=5.0.3
- SWIFT_VERSION=5.3-DEVELOPMENT-SNAPSHOT-2020-09-04-a
- <<: *swiftpm_linux
name: SwiftPM / Linux / Swift 5.1 Development
name: SwiftPM / Linux / Swift Development
env:
- SWIFT_VERSION=5.1-DEVELOPMENT-SNAPSHOT-2019-09-05-a
- SWIFT_VERSION=DEVELOPMENT-SNAPSHOT-2020-08-31-a
install: true
script:
- ./test $TYPE
Expand Down
3 changes: 2 additions & 1 deletion Carthage/Checkouts/Nimble/Cartfile.private
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
github "mattgallagher/CwlPreconditionTesting" == 1.2.0
github "mattgallagher/CwlCatchException" ~> 2.0
github "mattgallagher/CwlPreconditionTesting" ~> 2.0
3 changes: 2 additions & 1 deletion Carthage/Checkouts/Nimble/Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
github "mattgallagher/CwlPreconditionTesting" "1.2.0"
github "mattgallagher/CwlCatchException" "2.0.0"
github "mattgallagher/CwlPreconditionTesting" "2.0.0"
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:4.2
// swift-tools-version:5.0
import PackageDescription

let package = Package(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# CwlCatchException
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.

Look at [CwlCatchExceptionTests.swift](https://github.com/mattgallagher/CwlCatchException/blob/master/Tests/CwlCatchExceptionTests/CwlCatchExceptionTests.swift) for syntax.

## Requirements

From version 2.0.0-beta.1, building CwlCatchException requires Swift 5 or newer and the Swift Package Manager.

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).

## Adding to your project

Add the following to the `dependencies` array in your "Package.swift" file:

.package(url: "https://github.com/mattgallagher/CwlCatchException.git", from: Version("2.0.0-beta.1"))

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 number Diff line number Diff line change
Expand Up @@ -20,10 +20,4 @@

#import <Foundation/Foundation.h>

//! Project version number for CwlCatchException.
FOUNDATION_EXPORT double CwlCatchExceptionVersionNumber;

//! Project version string for CwlCatchException.
FOUNDATION_EXPORT const unsigned char CwlCatchExceptionVersionString[];

NSException* __nullable catchExceptionOfKind(Class __nonnull type, void (^ __nonnull inBlock)(void));

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
// swift-tools-version:4.0
// swift-tools-version:5.0
import PackageDescription

let package = Package(
name: "CwlPreconditionTesting",
products: [
.library(name: "CwlPreconditionTesting", targets: ["CwlPreconditionTesting", "CwlMachBadInstructionHandler"])
.library(name: "CwlPreconditionTesting", targets: ["CwlPreconditionTesting", "CwlMachBadInstructionHandler"]),
.library(name: "CwlPosixPreconditionTesting", targets: ["CwlPosixPreconditionTesting"])
],
dependencies: [
.package(url: "https://github.com/mattgallagher/CwlCatchException.git", from: "1.2.0")
.package(url: "https://github.com/mattgallagher/CwlCatchException.git", from: "2.0.0")
],
targets: [
.target(
name: "CwlPreconditionTesting",
dependencies: [
.target(name: "CwlMachBadInstructionHandler"),
.product(name: "CwlCatchException")
],
exclude: [
"./Mach/CwlPreconditionTesting.h",
"./Posix/CwlPreconditionTesting.h",
"./CwlCatchBadInstructionPosix.swift"
]
),
.target(
name: "CwlPosixPreconditionTesting"
),
.target(name: "CwlMachBadInstructionHandler"),
.testTarget(name: "CwlPreconditionTestingTests", dependencies: ["CwlPreconditionTesting"])
.testTarget(name: "CwlPreconditionTestingTests", dependencies: ["CwlPreconditionTesting", "CwlPosixPreconditionTesting"])
]
)
Loading

0 comments on commit a2732dd

Please sign in to comment.