diff --git a/.circleci/config.yml b/.circleci/config.yml index abde0b938..a8b7f4a7c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ defaults: &defaults macos: - xcode: "10.2.0" + xcode: "11.0.0" shell: /bin/bash --login -eo pipefail aliases: - &prepare diff --git a/.ruby-version b/.ruby-version index 0465952a8..4560fb912 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.4 +ruby-2.6.3 diff --git a/.travis.yml b/.travis.yml index 5bf5b3a44..676a96d97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: objective-c os: osx -osx_image: xcode10.2 +osx_image: xcode11 branches: only: - master diff --git a/Gemfile b/Gemfile index bf4c55126..9e5f3fc0b 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,6 @@ source 'https://rubygems.org' gem 'rake' gem 'plist' gem 'naturally', '~> 1.3.2' +gem 'cocoapods', '~> 1.7.5' +gem 'jazzy', '~> 0.11.1' gem 'xcpretty' -gem 'xcodeproj' -gem 'cocoapods', '~> 1.5.0' -gem 'jazzy', '~> 0.9.0' diff --git a/Gemfile.lock b/Gemfile.lock index 27a68831f..801fbfc57 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,113 +1,106 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.0) - activesupport (4.2.10) + CFPropertyList (3.0.1) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - atomos (0.1.2) - claide (1.0.2) - cocoapods (1.5.0) + atomos (0.1.3) + claide (1.0.3) + cocoapods (1.7.5) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.5.0) - cocoapods-deintegrate (>= 1.0.2, < 2.0) - cocoapods-downloader (>= 1.2.0, < 2.0) + cocoapods-core (= 1.7.5) + 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.0, < 2.0) + cocoapods-trunk (>= 1.3.1, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) - fourflusher (~> 2.0.1) + fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.5) + molinillo (~> 0.6.6) nap (~> 1.0) - ruby-macho (~> 1.1) - xcodeproj (>= 1.5.7, < 2.0) - cocoapods-core (1.5.0) + ruby-macho (~> 1.4) + xcodeproj (>= 1.10.0, < 2.0) + cocoapods-core (1.7.5) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.2) - cocoapods-downloader (1.2.0) + cocoapods-deintegrate (1.0.4) + cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) - cocoapods-stats (1.0.0) - cocoapods-trunk (1.3.0) + cocoapods-stats (1.1.0) + cocoapods-trunk (1.4.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.5) escape (0.0.4) - ffi (1.9.18) - fourflusher (2.0.1) + ffi (1.11.1) + fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - jazzy (0.9.0) - cocoapods (~> 1.0) - mustache (~> 0.99) + jazzy (0.11.1) + cocoapods (~> 1.5) + mustache (~> 1.1) open4 - redcarpet (~> 3.2) - rouge (~> 1.5) - sass (~> 3.4) + redcarpet (~> 3.4) + rouge (>= 2.0.6, < 4.0) + sassc (~> 2.1) sqlite3 (~> 1.3) xcinvoke (~> 0.3.0) liferaft (0.0.6) minitest (5.11.3) - molinillo (0.6.5) - mustache (0.99.8) - nanaimo (0.2.5) + molinillo (0.6.6) + mustache (1.1.0) + nanaimo (0.2.6) nap (1.1.0) naturally (1.3.2) netrc (0.11.0) open4 (1.3.4) - plist (3.2.0) - rake (11.2.2) - rb-fsevent (0.10.2) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - redcarpet (3.4.0) - rouge (1.11.1) - ruby-macho (1.1.0) - sass (3.5.3) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sqlite3 (1.3.13) + plist (3.5.0) + rake (12.3.3) + redcarpet (3.5.0) + rouge (2.0.7) + ruby-macho (1.4.0) + sassc (2.2.0) + ffi (~> 1.9) + sqlite3 (1.4.1) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.5.7) + xcodeproj (1.12.0) CFPropertyList (>= 2.3.3, < 4.0) - atomos (~> 0.1.2) + atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.2.4) - xcpretty (0.2.2) - rouge (~> 1.8) + nanaimo (~> 0.2.6) + xcpretty (0.3.0) + rouge (~> 2.0.7) PLATFORMS ruby DEPENDENCIES - cocoapods (~> 1.5.0) - jazzy (~> 0.9.0) + cocoapods (~> 1.7.5) + jazzy (~> 0.11.1) naturally (~> 1.3.2) plist rake - xcodeproj xcpretty BUNDLED WITH - 1.16.1 + 1.17.3