diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 888c37c..f1dedd0 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,10 +1,10 @@ # Nodes with values to reuse in the pipeline. common_params: plugins: &common_plugins - - &bash_cache automattic/bash-cache#2.7.0: ~ + - &bash_cache automattic/bash-cache#2.8.0 # Common environment values to use with the `env` key. env: &common_env - IMAGE_ID: xcode-13.4.1 + IMAGE_ID: xcode-14 # This is the default pipeline – it will build and test the app steps: @@ -14,9 +14,6 @@ steps: - label: "🧪 Build and Test" key: "test" command: | - # See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16 - gem install bundler - build_and_test_pod env: *common_env plugins: *common_plugins @@ -28,9 +25,6 @@ steps: - label: "🔬 Validate Podspec" key: "validate" command: | - # See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16 - gem install bundler - validate_podspec env: *common_env plugins: *common_plugins @@ -42,9 +36,6 @@ steps: - label: "🧹 Lint" key: "lint" command: | - # See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16 - gem install bundler - lint_pod env: *common_env plugins: *common_plugins diff --git a/.buildkite/publish-pod.sh b/.buildkite/publish-pod.sh index 68441ab..8b08909 100755 --- a/.buildkite/publish-pod.sh +++ b/.buildkite/publish-pod.sh @@ -4,9 +4,6 @@ PODSPEC_PATH="WPMediaPicker.podspec" SLACK_WEBHOOK=$PODS_SLACK_WEBHOOK echo "--- :rubygems: Setting up Gems" -# See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16 -gem install bundler - install_gems echo "--- :cocoapods: Publishing Pod to CocoaPods CDN" diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 047b1dc..0f625da 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -13,4 +13,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 31590cb12765a73c9da27d6ea5b8b127c095d71d -COCOAPODS: 1.10.2 +COCOAPODS: 1.11.3 diff --git a/Gemfile b/Gemfile index 8ace56d..a767c6f 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,6 @@ source 'https://rubygems.org' -gem 'cocoapods', '~> 1.9' +gem 'cocoapods', '~> 1.11' gem 'fastlane', '~> 2.189' gem 'rubocop', '~> 1.18' diff --git a/Gemfile.lock b/Gemfile.lock index 64aba28..3828872 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,11 +2,12 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.3) - activesupport (5.2.6) + activesupport (6.1.7) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) algoliasearch (1.27.5) @@ -33,10 +34,10 @@ GEM aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.0.3) - cocoapods (1.10.2) - addressable (~> 2.6) + cocoapods (1.11.3) + addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.2) + cocoapods-core (= 1.11.3) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -47,26 +48,26 @@ GEM escape (~> 0.0.4) fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.6) + molinillo (~> 0.8.0) nap (~> 1.0) - ruby-macho (~> 1.4) - xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.2) - activesupport (> 5.0, < 6) - addressable (~> 2.6) + ruby-macho (>= 1.0, < 3.0) + xcodeproj (>= 1.21.0, < 2.0) + cocoapods-core (1.11.3) + activesupport (>= 5.0, < 7) + addressable (~> 2.8) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) netrc (~> 0.11) - public_suffix + public_suffix (~> 4.0) typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.4) - cocoapods-downloader (1.4.0) + cocoapods-deintegrate (1.0.5) + cocoapods-downloader (1.6.3) cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0) - cocoapods-trunk (1.5.0) + cocoapods-search (1.0.1) + cocoapods-trunk (1.6.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) @@ -74,7 +75,7 @@ GEM colored2 (3.1.2) commander (4.6.0) highline (~> 2.0.0) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) declarative (0.0.20) digest-crc (0.6.4) rake (>= 12.0.0, < 14.0.0) @@ -83,7 +84,7 @@ GEM dotenv (2.7.6) emoji_regex (3.2.2) escape (0.0.4) - ethon (0.14.0) + ethon (0.15.0) ffi (>= 1.15.0) excon (0.85.0) faraday (1.7.0) @@ -149,7 +150,7 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) - ffi (1.15.3) + ffi (1.15.5) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) @@ -195,7 +196,7 @@ GEM http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.8.10) + i18n (1.12.0) concurrent-ruby (~> 1.0) jmespath (1.4.0) json (2.5.1) @@ -203,8 +204,8 @@ GEM memoist (0.16.2) mini_magick (4.11.0) mini_mime (1.1.0) - minitest (5.14.4) - molinillo (0.6.6) + minitest (5.16.3) + molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.0.0) nanaimo (0.3.0) @@ -238,7 +239,7 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.9.1) parser (>= 3.0.1.1) - ruby-macho (1.4.0) + ruby-macho (2.5.1) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) rubyzip (2.3.2) @@ -254,7 +255,6 @@ GEM terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - thread_safe (0.3.6) trailblazer-option (0.1.1) tty-cursor (0.7.1) tty-screen (0.8.1) @@ -262,8 +262,8 @@ GEM tty-cursor (~> 0.7) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.9) - thread_safe (~> 0.1) + tzinfo (2.0.5) + concurrent-ruby (~> 1.0) uber (0.1.0) unf (0.1.4) unf_ext @@ -282,14 +282,15 @@ GEM rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) + zeitwerk (2.6.1) PLATFORMS ruby DEPENDENCIES - cocoapods (~> 1.9) + cocoapods (~> 1.11) fastlane (~> 2.189) rubocop (~> 1.18) BUNDLED WITH - 2.2.25 + 2.3.22