diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b427d0d06..3c888d30a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,12 +9,20 @@ on: - "*" 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 strategy: matrix: - xcode: [11, 11.1, 11.2] + xcode: [10.3, 11, 11.1, 11.2] fail-fast: false env: DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app diff --git a/.travis.yml b/.travis.yml index 456e261df..3a3bd63f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,6 @@ branches: language: generic 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 @@ -20,9 +14,6 @@ jobs: - ./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 diff --git a/Gemfile.lock b/Gemfile.lock index 6c6f53490..0c4c5bf5e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,65 +1,79 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.0) - activesupport (4.2.11.1) + CFPropertyList (3.0.2) + activesupport (4.2.11.3) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) + algoliasearch (1.27.3) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) atomos (0.1.3) - claide (1.0.2) - cocoapods (1.7.1) + claide (1.0.3) + cocoapods (1.9.3) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.1) + cocoapods-core (= 1.9.3) 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) - fourflusher (>= 2.2.0, < 3.0) + fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.8.2, < 2.0) - cocoapods-core (1.7.1) + xcodeproj (>= 1.14.0, < 2.0) + cocoapods-core (1.9.3) 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.3.1) + cocoapods-trunk (1.5.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) - cocoapods-try (1.1.0) + cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) escape (0.0.4) - fourflusher (2.3.0) + ethon (0.12.0) + ffi (>= 1.3.0) + ffi (1.13.0) + 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.1) 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.4.0) + ethon (>= 0.9.0) + tzinfo (1.2.7) thread_safe (~> 0.1) - xcodeproj (1.9.0) + xcodeproj (1.16.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -73,4 +87,4 @@ DEPENDENCIES cocoapods (~> 1.7) BUNDLED WITH - 1.17.3 + 2.1.4