From 0c9fb65ebdc040f87a8231b94125e27e5a6ea2dc Mon Sep 17 00:00:00 2001 From: Justin Gordon Date: Thu, 16 May 2024 17:55:34 -1000 Subject: [PATCH] Switch to bundler 2.5.9 and commit top gemfile.lock (#1619) * add top level Gemfile.lock --- .circleci/config.yml | 4 +- .github/workflows/examples.yml | 4 +- .github/workflows/lint-js-and-ruby.yml | 4 +- .github/workflows/main.yml | 10 +- .github/workflows/rspec-package-specs.yml | 4 +- .gitignore | 1 - .travis.yml | 2 +- Gemfile.development_dependencies | 1 - Gemfile.lock | 434 ++++++++++++++++++++++ spec/dummy/Gemfile.lock | 5 +- 10 files changed, 450 insertions(+), 19 deletions(-) create mode 100644 Gemfile.lock diff --git a/.circleci/config.yml b/.circleci/config.yml index a334fa7d7..a875dd9ab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -54,7 +54,7 @@ aliases: - &install-dummy-app-ruby-gems name: Install Ruby Gems for dummy app command: | - gem install bundler:2.5.3 + gem install bundler:2.5.9 echo "Bundler version: "; bundle --version cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3 @@ -62,7 +62,7 @@ aliases: - &install-package-ruby-gems name: Install Ruby Gems for package command: | - gem install bundler:2.5.3 + gem install bundler:2.5.9 echo "Bundler version: "; bundle --version bundle lock --add-platform 'x86_64-linux' bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3 diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 1e1d766dc..a84b221aa 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -27,7 +27,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: 3.3 - bundler: 2.5.3 + bundler: 2.5.9 - name: Setup Node uses: actions/setup-node@v3 with: @@ -61,7 +61,7 @@ jobs: - name: yalc publish for react-on-rails run: yalc publish - name: Install Ruby Gems for package - run: bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.3_ install --path=vendor/bundle --jobs=4 --retry=3 + run: bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3 - name: Ensure minimum required Chrome version run: | echo -e "Already installed $(google-chrome --version)\n" diff --git a/.github/workflows/lint-js-and-ruby.yml b/.github/workflows/lint-js-and-ruby.yml index 7540b2dea..edfa9077a 100644 --- a/.github/workflows/lint-js-and-ruby.yml +++ b/.github/workflows/lint-js-and-ruby.yml @@ -22,7 +22,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - bundler: 2.5.3 + bundler: 2.5.9 - name: Setup Node uses: actions/setup-node@v3 with: @@ -52,7 +52,7 @@ jobs: yarn run eslint -v sudo yarn global add yalc - name: Install Ruby Gems for package - run: bundle check --path=vendor/bundle || bundle _2.5.3_ install --path=vendor/bundle --jobs=4 --retry=3 + run: bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3 - name: Linting of Ruby run: bundle exec rubocop - name: Linting of JS diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9e0a6cef6..6b26a3e9d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,7 +21,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - bundler: 2.5.3 + bundler: 2.5.9 # libyaml-dev is needed for psych v5 # this gem depends on sdoc which depends on rdoc which depends on psych - name: Fix dependency for libyaml-dev @@ -66,7 +66,7 @@ jobs: path: spec/dummy/vendor/bundle key: v5-dummy-app-gem-cache-${{ hashFiles('spec/dummy/Gemfile.lock') }} - name: Install Ruby Gems for dummy app - run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.3_ install --path=vendor/bundle --jobs=4 --retry=3 + run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3 - name: generate file system-based packs run: cd spec/dummy && RAILS_ENV=test bundle exec rake react_on_rails:generate_packs - name: Build test bundles for dummy app @@ -94,7 +94,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - bundler: 2.5.3 + bundler: 2.5.9 - name: Setup Node uses: actions/setup-node@v3 with: @@ -145,9 +145,9 @@ jobs: - name: yalc add react-on-rails run: cd spec/dummy && yalc add react-on-rails - name: Install Ruby Gems for package - run: bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.3_ install --path=vendor/bundle --jobs=4 --retry=3 + run: bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3 - name: Install Ruby Gems for dummy app - run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.3_ install --path=vendor/bundle --jobs=4 --retry=3 + run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3 - name: Ensure minimum required Chrome version run: | echo -e "Already installed $(google-chrome --version)\n" diff --git a/.github/workflows/rspec-package-specs.yml b/.github/workflows/rspec-package-specs.yml index c28c11058..287e53114 100644 --- a/.github/workflows/rspec-package-specs.yml +++ b/.github/workflows/rspec-package-specs.yml @@ -21,7 +21,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - bundler: 2.5.3 + bundler: 2.5.9 - name: Print system information run: | echo "Linux release: "; cat /etc/issue @@ -37,7 +37,7 @@ jobs: path: vendor/bundle key: v5-package-app-gem-cache-${{ hashFiles('react_on_rails.gemspec') }} - name: Install Ruby Gems for package - run: bundle check --path=vendor/bundle || bundle _2.5.3_ install --path=vendor/bundle --jobs=4 --retry=3 + run: bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3 - name: Run rspec tests run: bundle exec rspec spec/react_on_rails - name: Store test results diff --git a/.gitignore b/.gitignore index 806ee706d..e28c4dbde 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ /.bundle/ /.yardoc -/Gemfile.lock /_yardoc/ /coverage/ /doc/ diff --git a/.travis.yml b/.travis.yml index 5e8c1c8e0..6790f821f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: required language: ruby rvm: - - 2.5.3 + - 2.5.9 - 2.6.5 - 2.7.0 diff --git a/Gemfile.development_dependencies b/Gemfile.development_dependencies index 84c83e02f..d1ed246ea 100644 --- a/Gemfile.development_dependencies +++ b/Gemfile.development_dependencies @@ -9,7 +9,6 @@ gem "sass-rails", "~> 6.0" gem "uglifier" gem "jquery-rails" gem "puma", "~> 6.0" -gem "bundler", "2.5.3" # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem "turbolinks" if ENV["DISABLE_TURBOLINKS"].nil? || ENV["DISABLE_TURBOLINKS"].strip.empty? diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..728c05d38 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,434 @@ +PATH + remote: . + specs: + react_on_rails (14.0.0) + addressable + connection_pool + execjs (~> 2.5) + rails (>= 5.2) + rainbow (~> 3.0) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (7.1.3.2) + actionpack (= 7.1.3.2) + activesupport (= 7.1.3.2) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + zeitwerk (~> 2.6) + actionmailbox (7.1.3.2) + actionpack (= 7.1.3.2) + activejob (= 7.1.3.2) + activerecord (= 7.1.3.2) + activestorage (= 7.1.3.2) + activesupport (= 7.1.3.2) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.1.3.2) + actionpack (= 7.1.3.2) + actionview (= 7.1.3.2) + activejob (= 7.1.3.2) + activesupport (= 7.1.3.2) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.2) + actionpack (7.1.3.2) + actionview (= 7.1.3.2) + activesupport (= 7.1.3.2) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.3.2) + actionpack (= 7.1.3.2) + activerecord (= 7.1.3.2) + activestorage (= 7.1.3.2) + activesupport (= 7.1.3.2) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.1.3.2) + activesupport (= 7.1.3.2) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.3.2) + activesupport (= 7.1.3.2) + globalid (>= 0.3.6) + activemodel (7.1.3.2) + activesupport (= 7.1.3.2) + activerecord (7.1.3.2) + activemodel (= 7.1.3.2) + activesupport (= 7.1.3.2) + timeout (>= 0.4.0) + activestorage (7.1.3.2) + actionpack (= 7.1.3.2) + activejob (= 7.1.3.2) + activerecord (= 7.1.3.2) + activesupport (= 7.1.3.2) + marcel (~> 1.0) + activesupport (7.1.3.2) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + amazing_print (1.6.0) + ast (2.4.2) + base64 (0.2.0) + bigdecimal (3.1.8) + bootsnap (1.18.3) + msgpack (~> 1.2) + builder (3.2.4) + byebug (11.1.3) + capybara (3.40.0) + addressable + matrix + mini_mime (>= 0.1.3) + nokogiri (~> 1.11) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (>= 1.5, < 3.0) + xpath (~> 3.2) + capybara-screenshot (1.0.26) + capybara (>= 1.0, < 4) + launchy + childprocess (5.0.0) + coderay (1.1.3) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) + coveralls (0.8.23) + json (>= 1.8, < 3) + simplecov (~> 0.16.1) + term-ansicolor (~> 1.3) + thor (>= 0.19.4, < 2.0) + tins (~> 1.6) + crass (1.0.6) + date (3.3.4) + diff-lcs (1.5.1) + docile (1.4.0) + drb (2.2.1) + equivalent-xml (0.6.0) + nokogiri (>= 1.4.3) + erubi (1.12.0) + execjs (2.9.1) + ffi (1.16.3) + gem-release (2.2.2) + generator_spec (0.10.0) + activesupport (>= 3.0.0) + railties (>= 3.0.0) + globalid (1.2.1) + activesupport (>= 6.1) + i18n (1.14.5) + concurrent-ruby (~> 1.0) + interception (0.5) + io-console (0.7.2) + irb (1.13.1) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + jbuilder (2.12.0) + actionview (>= 5.0.0) + activesupport (>= 5.0.0) + jquery-rails (4.6.0) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + json (2.7.2) + language_server-protocol (3.17.0.3) + launchy (3.0.1) + addressable (~> 2.8) + childprocess (~> 5.0) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.22.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + mail (2.8.1) + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + marcel (1.0.4) + matrix (0.4.2) + method_source (1.1.0) + mini_mime (1.1.5) + mini_portile2 (2.8.6) + minitest (5.23.0) + msgpack (1.7.2) + mutex_m (0.2.0) + net-imap (0.4.11) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.5.0) + net-protocol + nio4r (2.7.3) + nokogiri (1.16.5) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + package_json (0.1.0) + parallel (1.24.0) + parser (3.3.1.0) + ast (~> 2.4.1) + racc + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.10.1) + byebug (~> 11.0) + pry (>= 0.13, < 0.15) + pry-doc (1.5.0) + pry (~> 0.11) + yard (~> 0.9.11) + pry-rails (0.3.9) + pry (>= 0.10.4) + pry-rescue (1.6.0) + interception (>= 0.5) + pry (>= 0.12.0) + psych (5.1.2) + stringio + public_suffix (5.0.5) + puma (6.4.2) + nio4r (~> 2.0) + racc (1.7.3) + rack (3.0.11) + rack-proxy (0.7.7) + rack + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails (7.1.3.2) + actioncable (= 7.1.3.2) + actionmailbox (= 7.1.3.2) + actionmailer (= 7.1.3.2) + actionpack (= 7.1.3.2) + actiontext (= 7.1.3.2) + actionview (= 7.1.3.2) + activejob (= 7.1.3.2) + activemodel (= 7.1.3.2) + activerecord (= 7.1.3.2) + activestorage (= 7.1.3.2) + activesupport (= 7.1.3.2) + bundler (>= 1.15.0) + railties (= 7.1.3.2) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.1.3.2) + actionpack (= 7.1.3.2) + activesupport (= 7.1.3.2) + irb + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) + rainbow (3.1.1) + rake (13.2.1) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rdoc (6.6.3.1) + psych (>= 4.0.0) + regexp_parser (2.9.2) + reline (0.5.7) + io-console (~> 0.5) + rexml (3.2.7) + strscan (>= 3.0.9) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-rails (6.1.2) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) + rspec-retry (0.6.2) + rspec-core (> 3.3) + rspec-support (3.13.1) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rubocop (1.61.0) + json (~> 2.3) + language_server-protocol (>= 3.17.0) + parallel (~> 1.10) + parser (>= 3.3.0.2) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.30.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) + rubocop-capybara (2.20.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.25.1) + rubocop (~> 1.41) + rubocop-performance (1.20.2) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rspec (2.29.2) + rubocop (~> 1.40) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + rubocop-rspec_rails (~> 2.28) + rubocop-rspec_rails (2.28.3) + rubocop (~> 1.40) + ruby-progressbar (1.13.0) + rubyzip (2.3.2) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) + sassc (2.4.0) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + scss_lint (0.60.0) + sass (~> 3.5, >= 3.5.5) + sdoc (2.6.1) + rdoc (>= 5.0) + selenium-webdriver (4.9.0) + rexml (~> 3.2, >= 3.2.5) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) + semantic_range (3.0.0) + shakapacker (7.2.1) + activesupport (>= 5.2) + package_json + rack-proxy (>= 0.6.1) + railties (>= 5.2) + semantic_range (>= 2.3.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + spring (4.2.1) + sprockets (4.2.1) + concurrent-ruby (~> 1.0) + rack (>= 2.2.4, < 4) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) + sprockets (>= 3.0.0) + sqlite3 (1.7.3) + mini_portile2 (~> 2.8.0) + stringio (3.1.0) + strscan (3.1.0) + sync (0.5.0) + term-ansicolor (1.8.0) + tins (~> 1.0) + thor (1.3.1) + tilt (2.3.0) + timeout (0.4.1) + tins (1.33.0) + bigdecimal + sync + turbolinks (5.2.1) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + uglifier (4.2.0) + execjs (>= 0.3.0, < 3) + unicode-display_width (2.5.0) + webdrivers (5.3.0) + nokogiri (~> 1.6) + rubyzip (>= 1.3.0) + selenium-webdriver (~> 4.0, < 4.11) + webrick (1.8.1) + websocket (1.2.10) + websocket-driver (0.7.6) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + xpath (3.2.0) + nokogiri (~> 1.8) + yard (0.9.36) + zeitwerk (2.6.14) + +PLATFORMS + ruby + +DEPENDENCIES + amazing_print + bootsnap + capybara + capybara-screenshot + coveralls + equivalent-xml + gem-release + generator_spec + jbuilder + jquery-rails + launchy + listen + pry + pry-byebug + pry-doc + pry-rails + pry-rescue + puma (~> 6.0) + rails (~> 7.1) + react_on_rails! + rspec-rails + rspec-retry + rspec_junit_formatter + rubocop (= 1.61.0) + rubocop-performance (~> 1.20.0) + rubocop-rspec (~> 2.26) + sass-rails (~> 6.0) + scss_lint + sdoc + selenium-webdriver (= 4.9.0) + shakapacker (= 7.2.1) + spring (~> 4.0) + sprockets (~> 4.0) + sqlite3 (~> 1.6) + turbolinks + uglifier + webdrivers (= 5.3.0) + +BUNDLED WITH + 2.5.9 diff --git a/spec/dummy/Gemfile.lock b/spec/dummy/Gemfile.lock index 297455327..4584e389f 100644 --- a/spec/dummy/Gemfile.lock +++ b/spec/dummy/Gemfile.lock @@ -387,7 +387,6 @@ PLATFORMS DEPENDENCIES amazing_print bootsnap - bundler (= 2.5.3) capybara capybara-screenshot coveralls @@ -418,10 +417,10 @@ DEPENDENCIES shakapacker (= 7.2.1) spring (~> 4.0) sprockets (~> 4.0) - sqlite3 + sqlite3 (~> 1.6) turbolinks uglifier webdrivers (= 5.3.0) BUNDLED WITH - 2.5.3 + 2.5.9