Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,24 @@ on:
- '*'

jobs:
cocoapods:
name: CocoaPods Lint
runs-on: macOS-latest
steps:
- uses: actions/checkout@v2
- run: sudo xcode-select -s '/Applications/Xcode_11.4.app'
- run: gem install bundler:1.17.3 && bundle install
- run: ./test podspec

xcode:
name: Xcode ${{ matrix.xcode }} - ${{ matrix.platform }}
runs-on: macOS-latest
strategy:
matrix:
xcode: [11, 11.1, 11.2]
xcode: [11.4]
platform: [macos, ios, tvos, macos_xcodespm, ios_xcodespm]
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- run: sudo xcode-select -s '/Applications/Xcode_${{ matrix.xcode }}.app'
- run: ./test ${{ matrix.platform }}

Expand All @@ -26,8 +35,8 @@ jobs:
runs-on: macOS-latest
strategy:
matrix:
xcode: [11, 11.1, 11.2]
xcode: [11.4]
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- run: sudo xcode-select -s '/Applications/Xcode_${{ matrix.xcode }}.app'
- run: ./test swiftpm
56 changes: 24 additions & 32 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,46 +3,38 @@ branches:
- master

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.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
# - &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.0.3
name: SwiftPM / Linux / Swift 5.2
os: linux
dist: trusty
sudo: required
env:
- SWIFT_VERSION=5.0.3
- SWIFT_VERSION=5.2
install:
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
script:
- ./test swiftpm
- <<: *swiftpm_linux
name: SwiftPM / Linux / Swift 5.1
env:
- SWIFT_VERSION=5.1
- <<: *swiftpm_linux
name: SwiftPM / Linux / Swift Development
env:
- SWIFT_VERSION=DEVELOPMENT-SNAPSHOT-2019-09-26-a
# - <<: *swiftpm_linux
# name: SwiftPM / Linux / Swift 5.3
# env:
# - SWIFT_VERSION=5.3
# - <<: *swiftpm_linux
# name: SwiftPM / Linux / Swift Development
# env:
# - SWIFT_VERSION=DEVELOPMENT-SNAPSHOT-2020-02-21-a
install: true
script:
- ./test $TYPE
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# A sample Gemfile
source "https://rubygems.org"

gem 'cocoapods', '~> 1.7'
gem 'cocoapods', '~> 1.9'
40 changes: 27 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.1)
CFPropertyList (3.0.2)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
algoliasearch (1.27.1)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.7.5)
cocoapods (1.9.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.7.5)
cocoapods-core (= 1.9.1)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.3.1, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
Expand All @@ -27,39 +30,50 @@ GEM
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.10.0, < 2.0)
cocoapods-core (1.7.5)
xcodeproj (>= 1.14.0, < 2.0)
cocoapods-core (1.9.1)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.2.2)
cocoapods-downloader (1.3.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.4.0)
cocoapods-trunk (1.4.1)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
colored2 (3.1.2)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.6)
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.12.2)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
minitest (5.11.3)
json (2.3.0)
minitest (5.14.0)
molinillo (0.6.6)
nanaimo (0.2.6)
nap (1.1.0)
netrc (0.11.0)
ruby-macho (1.4.0)
thread_safe (0.3.6)
tzinfo (1.2.5)
typhoeus (1.3.1)
ethon (>= 0.9.0)
tzinfo (1.2.6)
thread_safe (~> 0.1)
xcodeproj (1.12.0)
xcodeproj (1.15.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand All @@ -70,7 +84,7 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 1.7)
cocoapods (~> 1.9)

BUNDLED WITH
1.17.3
7 changes: 5 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.0
// swift-tools-version:5.2
import PackageDescription

let package = Package(
Expand All @@ -17,7 +17,10 @@ let package = Package(
name: "Nimble",
dependencies: {
#if os(macOS)
return ["CwlPreconditionTesting", "CwlPosixPreconditionTesting"]
return [
"CwlPreconditionTesting",
.product(name: "CwlPosixPreconditionTesting", package: "CwlPreconditionTesting")
]
#else
return []
#endif
Expand Down
Loading