diff --git a/fixtures/default/custom_gemfile/Gemfile-APP b/fixtures/default/custom_gemfile/Gemfile-APP index d10c48e84..6f6532782 100644 --- a/fixtures/default/custom_gemfile/Gemfile-APP +++ b/fixtures/default/custom_gemfile/Gemfile-APP @@ -1,5 +1,6 @@ source 'https://rubygems.org' -ruby "~>3.1.0" +ruby "~>3.2.0" gem "cf-app-utils" +gem 'rackup' gem "webrick" gem "sinatra" diff --git a/fixtures/default/custom_gemfile/Gemfile-APP.lock b/fixtures/default/custom_gemfile/Gemfile-APP.lock index 8fc19b2db..1b255b3c1 100644 --- a/fixtures/default/custom_gemfile/Gemfile-APP.lock +++ b/fixtures/default/custom_gemfile/Gemfile-APP.lock @@ -1,28 +1,43 @@ GEM remote: https://rubygems.org/ specs: + base64 (0.3.0) cf-app-utils (0.6) - mustermann (3.0.0) + logger (1.7.0) + mustermann (3.0.4) ruby2_keywords (~> 0.0.1) - rack (2.2.4) - rack-protection (3.0.4) - rack + rack (3.2.4) + rack-protection (4.2.1) + base64 (>= 0.1.0) + logger (>= 1.6.0) + rack (>= 3.0.0, < 4) + rack-session (2.1.1) + base64 (>= 0.1.0) + rack (>= 3.0.0) + rackup (2.3.1) + rack (>= 3) ruby2_keywords (0.0.5) - sinatra (3.0.4) + sinatra (4.2.1) + logger (>= 1.6.0) mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.4) + rack (>= 3.0.0, < 4) + rack-protection (= 4.2.1) + rack-session (>= 2.0.0, < 3) tilt (~> 2.0) - tilt (2.0.11) - webrick (1.7.0) + tilt (2.7.0) + webrick (1.9.2) PLATFORMS - ruby + x86_64-linux DEPENDENCIES cf-app-utils + rackup sinatra webrick RUBY VERSION - ruby 3.1.3p185 + ruby 3.2.9p265 + +BUNDLED WITH + 2.4.19 diff --git a/fixtures/default/rails6_sprockets/Gemfile.lock b/fixtures/default/rails6_sprockets/Gemfile.lock deleted file mode 100644 index e3012cdfc..000000000 --- a/fixtures/default/rails6_sprockets/Gemfile.lock +++ /dev/null @@ -1,163 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actioncable (6.1.7) - actionpack (= 6.1.7) - activesupport (= 6.1.7) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailbox (6.1.7) - actionpack (= 6.1.7) - activejob (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) - mail (>= 2.7.1) - actionmailer (6.1.7) - actionpack (= 6.1.7) - actionview (= 6.1.7) - activejob (= 6.1.7) - activesupport (= 6.1.7) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (6.1.7) - actionview (= 6.1.7) - activesupport (= 6.1.7) - rack (~> 2.0, >= 2.0.9) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7) - actionpack (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) - nokogiri (>= 1.8.5) - actionview (6.1.7) - activesupport (= 6.1.7) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7) - activesupport (= 6.1.7) - globalid (>= 0.3.6) - activemodel (6.1.7) - activesupport (= 6.1.7) - activerecord (6.1.7) - activemodel (= 6.1.7) - activesupport (= 6.1.7) - activestorage (6.1.7) - actionpack (= 6.1.7) - activejob (= 6.1.7) - activerecord (= 6.1.7) - activesupport (= 6.1.7) - marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (6.1.7) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) - builder (3.2.4) - concurrent-ruby (1.1.10) - crass (1.0.6) - erubi (1.11.0) - ffi (1.15.5) - globalid (1.0.0) - activesupport (>= 5.0) - i18n (1.12.0) - concurrent-ruby (~> 1.0) - loofah (2.19.0) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - marcel (1.0.2) - method_source (1.0.0) - mini_mime (1.1.2) - mini_portile2 (2.8.0) - minitest (5.16.3) - nio4r (2.5.8) - nokogiri (1.13.9) - mini_portile2 (~> 2.8.0) - racc (~> 1.4) - puma (6.0.0) - nio4r (~> 2.0) - racc (1.6.0) - rack (2.2.6.4) - rack-proxy (0.7.4) - rack - rack-test (2.0.2) - rack (>= 1.3) - rails (6.1.7) - actioncable (= 6.1.7) - actionmailbox (= 6.1.7) - actionmailer (= 6.1.7) - actionpack (= 6.1.7) - actiontext (= 6.1.7) - actionview (= 6.1.7) - activejob (= 6.1.7) - activemodel (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) - bundler (>= 1.15.0) - railties (= 6.1.7) - sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) - railties (6.1.7) - actionpack (= 6.1.7) - activesupport (= 6.1.7) - method_source - rake (>= 12.2) - thor (~> 1.0) - rake (13.0.6) - 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 - semantic_range (3.0.0) - sprockets (4.1.1) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - sprockets (>= 3.0.0) - thor (1.2.1) - tilt (2.0.11) - tzinfo (2.0.5) - concurrent-ruby (~> 1.0) - webpacker (6.0.0.rc.6) - activesupport (>= 5.2) - rack-proxy (>= 0.6.1) - railties (>= 5.2) - semantic_range (>= 2.3.0) - websocket-driver (0.7.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - zeitwerk (2.6.6) - -PLATFORMS - ruby - -DEPENDENCIES - puma (~> 6.0) - rails (~> 6.1.0) - sass-rails (>= 6) - webpacker (~> 6.0.0.rc.6) - -RUBY VERSION - ruby 3.1.2p20 diff --git a/fixtures/default/rails7/Gemfile b/fixtures/default/rails7/Gemfile index 3365b60a5..b15f9b2f5 100644 --- a/fixtures/default/rails7/Gemfile +++ b/fixtures/default/rails7/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '~> 3.1.0' +ruby '~> 3.2.0' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 7.1' diff --git a/fixtures/default/rails7/Gemfile.lock b/fixtures/default/rails7/Gemfile.lock index 70b7e4fff..5f3c16ca1 100644 --- a/fixtures/default/rails7/Gemfile.lock +++ b/fixtures/default/rails7/Gemfile.lock @@ -1,172 +1,184 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.1.3.2) - actionpack (= 7.1.3.2) - activesupport (= 7.1.3.2) + actioncable (7.2.3) + actionpack (= 7.2.3) + activesupport (= 7.2.3) 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 + actionmailbox (7.2.3) + actionpack (= 7.2.3) + activejob (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) + mail (>= 2.8.0) + actionmailer (7.2.3) + actionpack (= 7.2.3) + actionview (= 7.2.3) + activejob (= 7.2.3) + activesupport (= 7.2.3) + mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.1.3.2) - actionview (= 7.1.3.2) - activesupport (= 7.1.3.2) + actionpack (7.2.3) + actionview (= 7.2.3) + activesupport (= 7.2.3) + cgi nokogiri (>= 1.8.5) racc - rack (>= 2.2.4) + rack (>= 2.2.4, < 3.3) 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) + useragent (~> 0.16) + actiontext (7.2.3) + actionpack (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3.2) - activesupport (= 7.1.3.2) + actionview (7.2.3) + activesupport (= 7.2.3) builder (~> 3.1) + cgi erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.3.2) - activesupport (= 7.1.3.2) + activejob (7.2.3) + activesupport (= 7.2.3) 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) + activemodel (7.2.3) + activesupport (= 7.2.3) + activerecord (7.2.3) + activemodel (= 7.2.3) + activesupport (= 7.2.3) 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) + activestorage (7.2.3) + actionpack (= 7.2.3) + activejob (= 7.2.3) + activerecord (= 7.2.3) + activesupport (= 7.2.3) marcel (~> 1.0) - activesupport (7.1.3.2) + activesupport (7.2.3) base64 + benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) - base64 (0.2.0) - bigdecimal (3.1.7) - builder (3.2.4) - concurrent-ruby (1.1.10) - connection_pool (2.4.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + base64 (0.3.0) + benchmark (0.5.0) + bigdecimal (4.0.1) + builder (3.3.0) + cgi (0.5.1) + concurrent-ruby (1.3.6) + connection_pool (3.0.2) crass (1.0.6) - date (3.3.4) - drb (2.2.1) - erubi (1.11.0) - ffi (1.15.5) - globalid (1.2.1) + date (3.5.1) + drb (2.2.3) + erb (6.0.1) + erubi (1.13.1) + ffi (1.17.3-x86_64-linux-gnu) + globalid (1.3.0) activesupport (>= 6.1) - i18n (1.12.0) + i18n (1.14.8) concurrent-ruby (~> 1.0) - io-console (0.7.2) - irb (1.12.0) - rdoc + io-console (0.8.2) + irb (1.16.0) + pp (>= 0.6.0) + rdoc (>= 4.0.0) reline (>= 0.4.2) - loofah (2.22.0) + logger (1.7.0) + loofah (2.25.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - mail (2.8.1) + mail (2.9.0) + logger mini_mime (>= 0.1.1) net-imap net-pop net-smtp - marcel (1.0.4) + marcel (1.1.0) mini_mime (1.1.5) - mini_portile2 (2.8.0) - minitest (5.16.3) - mutex_m (0.2.0) - net-imap (0.4.10) + minitest (6.0.1) + prism (~> 1.5) + net-imap (0.6.2) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-smtp (0.5.0) + net-smtp (0.5.1) net-protocol - nio4r (2.5.8) - nokogiri (1.14.5) - mini_portile2 (~> 2.8.0) + nio4r (2.7.5) + nokogiri (1.19.0-x86_64-linux-gnu) racc (~> 1.4) - psych (5.1.2) + pp (0.6.3) + prettyprint + prettyprint (0.2.0) + prism (1.8.0) + psych (5.3.1) + date stringio - puma (6.0.0) + puma (6.6.1) nio4r (~> 2.0) - racc (1.6.0) - rack (2.2.6.4) - rack-proxy (0.7.4) + racc (1.8.1) + rack (3.2.4) + rack-proxy (0.7.7) rack - rack-session (1.0.2) - rack (< 3) - rack-test (2.0.2) + rack-session (2.1.1) + base64 (>= 0.1.0) + rack (>= 3.0.0) + rack-test (2.2.0) rack (>= 1.3) - rackup (1.0.0) - rack (< 3) - webrick - 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) + rackup (2.3.1) + rack (>= 3) + rails (7.2.3) + actioncable (= 7.2.3) + actionmailbox (= 7.2.3) + actionmailer (= 7.2.3) + actionpack (= 7.2.3) + actiontext (= 7.2.3) + actionview (= 7.2.3) + activejob (= 7.2.3) + activemodel (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) bundler (>= 1.15.0) - railties (= 7.1.3.2) - rails-dom-testing (2.2.0) + railties (= 7.2.3) + rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) + rails-html-sanitizer (1.6.2) loofah (~> 2.21) - nokogiri (~> 1.14) - railties (7.1.3.2) - actionpack (= 7.1.3.2) - activesupport (= 7.1.3.2) - irb + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + railties (7.2.3) + actionpack (= 7.2.3) + activesupport (= 7.2.3) + cgi + irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) + tsort (>= 0.2) zeitwerk (~> 2.6) - rake (13.0.6) - rdoc (6.6.3.1) + rake (13.3.1) + rdoc (7.1.0) + erb psych (>= 4.0.0) - reline (0.5.1) + tsort + reline (0.6.3) io-console (~> 0.5) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) @@ -178,33 +190,37 @@ GEM sprockets (> 3.0) sprockets-rails tilt - semantic_range (3.0.0) - sprockets (4.1.1) + securerandom (0.4.1) + semantic_range (3.1.0) + sprockets (4.2.2) concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + logger + rack (>= 2.2.4, < 4) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) - stringio (3.1.0) - thor (1.3.1) - tilt (2.0.11) - timeout (0.4.1) - tzinfo (2.0.5) + stringio (3.2.0) + thor (1.5.0) + tilt (2.7.0) + timeout (0.6.0) + tsort (0.2.0) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) + useragent (0.16.11) webpacker (6.0.0.rc.6) activesupport (>= 5.2) rack-proxy (>= 0.6.1) railties (>= 5.2) semantic_range (>= 2.3.0) - webrick (1.8.1) - websocket-driver (0.7.6) + websocket-driver (0.8.0) + base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.6) + zeitwerk (2.7.4) PLATFORMS - ruby + x86_64-linux DEPENDENCIES puma (~> 6.0) @@ -213,7 +229,7 @@ DEPENDENCIES webpacker (~> 6.0.0.rc.6) RUBY VERSION - ruby 3.1.2p20 + ruby 3.2.9p265 BUNDLED WITH - 2.5.6 + 2.4.19 diff --git a/fixtures/default/rails6_sprockets/.gitignore b/fixtures/default/rails72_sprockets/.gitignore similarity index 100% rename from fixtures/default/rails6_sprockets/.gitignore rename to fixtures/default/rails72_sprockets/.gitignore diff --git a/fixtures/default/rails6_sprockets/Gemfile b/fixtures/default/rails72_sprockets/Gemfile similarity index 90% rename from fixtures/default/rails6_sprockets/Gemfile rename to fixtures/default/rails72_sprockets/Gemfile index a5f513b2b..ba292ea9b 100644 --- a/fixtures/default/rails6_sprockets/Gemfile +++ b/fixtures/default/rails72_sprockets/Gemfile @@ -1,10 +1,10 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '~> 3.1.0' +ruby '~> 3.2.0' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 6.1.0' +gem 'rails', '~> 7.2.0' # Use Puma as the app server gem 'puma', '~> 6.0' diff --git a/fixtures/default/rails72_sprockets/Gemfile.lock b/fixtures/default/rails72_sprockets/Gemfile.lock new file mode 100644 index 000000000..4d0574678 --- /dev/null +++ b/fixtures/default/rails72_sprockets/Gemfile.lock @@ -0,0 +1,263 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (7.2.3) + actionpack (= 7.2.3) + activesupport (= 7.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + zeitwerk (~> 2.6) + actionmailbox (7.2.3) + actionpack (= 7.2.3) + activejob (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) + mail (>= 2.8.0) + actionmailer (7.2.3) + actionpack (= 7.2.3) + actionview (= 7.2.3) + activejob (= 7.2.3) + activesupport (= 7.2.3) + mail (>= 2.8.0) + rails-dom-testing (~> 2.2) + actionpack (7.2.3) + actionview (= 7.2.3) + activesupport (= 7.2.3) + cgi + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4, < 3.3) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) + actiontext (7.2.3) + actionpack (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.2.3) + activesupport (= 7.2.3) + builder (~> 3.1) + cgi + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.2.3) + activesupport (= 7.2.3) + globalid (>= 0.3.6) + activemodel (7.2.3) + activesupport (= 7.2.3) + activerecord (7.2.3) + activemodel (= 7.2.3) + activesupport (= 7.2.3) + timeout (>= 0.4.0) + activestorage (7.2.3) + actionpack (= 7.2.3) + activejob (= 7.2.3) + activerecord (= 7.2.3) + activesupport (= 7.2.3) + marcel (~> 1.0) + activesupport (7.2.3) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + base64 (0.3.0) + benchmark (0.5.0) + bigdecimal (4.0.1) + builder (3.3.0) + cgi (0.5.1) + concurrent-ruby (1.3.6) + connection_pool (3.0.2) + crass (1.0.6) + date (3.5.1) + drb (2.2.3) + erb (6.0.1) + erubi (1.13.1) + ffi (1.17.3-aarch64-linux-gnu) + ffi (1.17.3-aarch64-linux-musl) + ffi (1.17.3-arm-linux-gnu) + ffi (1.17.3-arm-linux-musl) + ffi (1.17.3-arm64-darwin) + ffi (1.17.3-x86_64-darwin) + ffi (1.17.3-x86_64-linux-gnu) + ffi (1.17.3-x86_64-linux-musl) + globalid (1.3.0) + activesupport (>= 6.1) + i18n (1.14.8) + concurrent-ruby (~> 1.0) + io-console (0.8.2) + irb (1.16.0) + pp (>= 0.6.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + logger (1.7.0) + loofah (2.25.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + mail (2.9.0) + logger + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + marcel (1.1.0) + mini_mime (1.1.5) + minitest (6.0.1) + prism (~> 1.5) + net-imap (0.6.2) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.5.1) + net-protocol + nio4r (2.7.5) + nokogiri (1.19.0-aarch64-linux-gnu) + racc (~> 1.4) + nokogiri (1.19.0-aarch64-linux-musl) + racc (~> 1.4) + nokogiri (1.19.0-arm-linux-gnu) + racc (~> 1.4) + nokogiri (1.19.0-arm-linux-musl) + racc (~> 1.4) + nokogiri (1.19.0-arm64-darwin) + racc (~> 1.4) + nokogiri (1.19.0-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.19.0-x86_64-linux-gnu) + racc (~> 1.4) + nokogiri (1.19.0-x86_64-linux-musl) + racc (~> 1.4) + pp (0.6.3) + prettyprint + prettyprint (0.2.0) + prism (1.8.0) + psych (5.3.1) + date + stringio + puma (6.6.1) + nio4r (~> 2.0) + racc (1.8.1) + rack (3.2.4) + rack-proxy (0.7.7) + rack + rack-session (2.1.1) + base64 (>= 0.1.0) + rack (>= 3.0.0) + rack-test (2.2.0) + rack (>= 1.3) + rackup (2.3.1) + rack (>= 3) + rails (7.2.3) + actioncable (= 7.2.3) + actionmailbox (= 7.2.3) + actionmailer (= 7.2.3) + actionpack (= 7.2.3) + actiontext (= 7.2.3) + actionview (= 7.2.3) + activejob (= 7.2.3) + activemodel (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) + bundler (>= 1.15.0) + railties (= 7.2.3) + rails-dom-testing (2.3.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.2) + loofah (~> 2.21) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + railties (7.2.3) + actionpack (= 7.2.3) + activesupport (= 7.2.3) + cgi + irb (~> 1.13) + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + tsort (>= 0.2) + zeitwerk (~> 2.6) + rake (13.3.1) + rdoc (7.1.0) + erb + psych (>= 4.0.0) + tsort + reline (0.6.3) + io-console (~> 0.5) + 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 + securerandom (0.4.1) + semantic_range (3.1.0) + sprockets (4.2.2) + concurrent-ruby (~> 1.0) + logger + rack (>= 2.2.4, < 4) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) + sprockets (>= 3.0.0) + stringio (3.2.0) + thor (1.5.0) + tilt (2.7.0) + timeout (0.6.0) + tsort (0.2.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + useragent (0.16.11) + webpacker (6.0.0.rc.6) + activesupport (>= 5.2) + rack-proxy (>= 0.6.1) + railties (>= 5.2) + semantic_range (>= 2.3.0) + websocket-driver (0.8.0) + base64 + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.7.4) + +PLATFORMS + aarch64-linux-gnu + aarch64-linux-musl + arm-linux-gnu + arm-linux-musl + arm64-darwin + x86_64-darwin + x86_64-linux-gnu + x86_64-linux-musl + +DEPENDENCIES + puma (~> 6.0) + rails (~> 7.2.0) + sass-rails (>= 6) + webpacker (~> 6.0.0.rc.6) + +RUBY VERSION + ruby 3.2.9p265 + +BUNDLED WITH + 2.7.2 diff --git a/fixtures/default/rails6_sprockets/README.md b/fixtures/default/rails72_sprockets/README.md similarity index 100% rename from fixtures/default/rails6_sprockets/README.md rename to fixtures/default/rails72_sprockets/README.md diff --git a/fixtures/default/rails6_sprockets/Rakefile b/fixtures/default/rails72_sprockets/Rakefile similarity index 100% rename from fixtures/default/rails6_sprockets/Rakefile rename to fixtures/default/rails72_sprockets/Rakefile diff --git a/fixtures/default/rails6_sprockets/app/assets/config/manifest.js b/fixtures/default/rails72_sprockets/app/assets/config/manifest.js similarity index 100% rename from fixtures/default/rails6_sprockets/app/assets/config/manifest.js rename to fixtures/default/rails72_sprockets/app/assets/config/manifest.js diff --git a/fixtures/default/rails6_sprockets/app/assets/images/.keep b/fixtures/default/rails72_sprockets/app/assets/images/.keep similarity index 100% rename from fixtures/default/rails6_sprockets/app/assets/images/.keep rename to fixtures/default/rails72_sprockets/app/assets/images/.keep diff --git a/fixtures/default/rails6_sprockets/app/assets/stylesheets/application.css b/fixtures/default/rails72_sprockets/app/assets/stylesheets/application.css similarity index 100% rename from fixtures/default/rails6_sprockets/app/assets/stylesheets/application.css rename to fixtures/default/rails72_sprockets/app/assets/stylesheets/application.css diff --git a/fixtures/default/rails6_sprockets/app/controllers/application_controller.rb b/fixtures/default/rails72_sprockets/app/controllers/application_controller.rb similarity index 100% rename from fixtures/default/rails6_sprockets/app/controllers/application_controller.rb rename to fixtures/default/rails72_sprockets/app/controllers/application_controller.rb diff --git a/fixtures/default/rails6_sprockets/app/helpers/application_helper.rb b/fixtures/default/rails72_sprockets/app/helpers/application_helper.rb similarity index 100% rename from fixtures/default/rails6_sprockets/app/helpers/application_helper.rb rename to fixtures/default/rails72_sprockets/app/helpers/application_helper.rb diff --git a/fixtures/default/rails6_sprockets/app/javascript/packs/application.js b/fixtures/default/rails72_sprockets/app/javascript/packs/application.js similarity index 100% rename from fixtures/default/rails6_sprockets/app/javascript/packs/application.js rename to fixtures/default/rails72_sprockets/app/javascript/packs/application.js diff --git a/fixtures/default/rails6_sprockets/app/jobs/application_job.rb b/fixtures/default/rails72_sprockets/app/jobs/application_job.rb similarity index 100% rename from fixtures/default/rails6_sprockets/app/jobs/application_job.rb rename to fixtures/default/rails72_sprockets/app/jobs/application_job.rb diff --git a/fixtures/default/rails6_sprockets/app/views/layouts/application.html.erb b/fixtures/default/rails72_sprockets/app/views/layouts/application.html.erb similarity index 100% rename from fixtures/default/rails6_sprockets/app/views/layouts/application.html.erb rename to fixtures/default/rails72_sprockets/app/views/layouts/application.html.erb diff --git a/fixtures/default/rails6_sprockets/babel.config.js b/fixtures/default/rails72_sprockets/babel.config.js similarity index 100% rename from fixtures/default/rails6_sprockets/babel.config.js rename to fixtures/default/rails72_sprockets/babel.config.js diff --git a/fixtures/default/rails6_sprockets/bin/bundle b/fixtures/default/rails72_sprockets/bin/bundle similarity index 100% rename from fixtures/default/rails6_sprockets/bin/bundle rename to fixtures/default/rails72_sprockets/bin/bundle diff --git a/fixtures/default/rails6_sprockets/bin/rails b/fixtures/default/rails72_sprockets/bin/rails similarity index 100% rename from fixtures/default/rails6_sprockets/bin/rails rename to fixtures/default/rails72_sprockets/bin/rails diff --git a/fixtures/default/rails6_sprockets/bin/rake b/fixtures/default/rails72_sprockets/bin/rake similarity index 100% rename from fixtures/default/rails6_sprockets/bin/rake rename to fixtures/default/rails72_sprockets/bin/rake diff --git a/fixtures/default/rails6_sprockets/bin/setup b/fixtures/default/rails72_sprockets/bin/setup similarity index 100% rename from fixtures/default/rails6_sprockets/bin/setup rename to fixtures/default/rails72_sprockets/bin/setup diff --git a/fixtures/default/rails6_sprockets/bin/webpack b/fixtures/default/rails72_sprockets/bin/webpack similarity index 96% rename from fixtures/default/rails6_sprockets/bin/webpack rename to fixtures/default/rails72_sprockets/bin/webpack index 2e30da830..7a58cb839 100755 --- a/fixtures/default/rails6_sprockets/bin/webpack +++ b/fixtures/default/rails72_sprockets/bin/webpack @@ -1,6 +1,7 @@ #!/usr/bin/env ruby require "pathname" +require "logger" require "bundler/setup" require "webpacker" require "webpacker/webpack_runner" diff --git a/fixtures/default/rails6_sprockets/bin/webpack-dev-server b/fixtures/default/rails72_sprockets/bin/webpack-dev-server similarity index 100% rename from fixtures/default/rails6_sprockets/bin/webpack-dev-server rename to fixtures/default/rails72_sprockets/bin/webpack-dev-server diff --git a/fixtures/default/rails6_sprockets/bin/yarn b/fixtures/default/rails72_sprockets/bin/yarn similarity index 100% rename from fixtures/default/rails6_sprockets/bin/yarn rename to fixtures/default/rails72_sprockets/bin/yarn diff --git a/fixtures/default/rails6_sprockets/config.ru b/fixtures/default/rails72_sprockets/config.ru similarity index 100% rename from fixtures/default/rails6_sprockets/config.ru rename to fixtures/default/rails72_sprockets/config.ru diff --git a/fixtures/default/rails6_sprockets/config/application.rb b/fixtures/default/rails72_sprockets/config/application.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/application.rb rename to fixtures/default/rails72_sprockets/config/application.rb diff --git a/fixtures/default/rails6_sprockets/config/boot.rb b/fixtures/default/rails72_sprockets/config/boot.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/boot.rb rename to fixtures/default/rails72_sprockets/config/boot.rb diff --git a/fixtures/default/rails6_sprockets/config/environment.rb b/fixtures/default/rails72_sprockets/config/environment.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/environment.rb rename to fixtures/default/rails72_sprockets/config/environment.rb diff --git a/fixtures/default/rails6_sprockets/config/environments/development.rb b/fixtures/default/rails72_sprockets/config/environments/development.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/environments/development.rb rename to fixtures/default/rails72_sprockets/config/environments/development.rb diff --git a/fixtures/default/rails6_sprockets/config/environments/production.rb b/fixtures/default/rails72_sprockets/config/environments/production.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/environments/production.rb rename to fixtures/default/rails72_sprockets/config/environments/production.rb diff --git a/fixtures/default/rails6_sprockets/config/environments/test.rb b/fixtures/default/rails72_sprockets/config/environments/test.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/environments/test.rb rename to fixtures/default/rails72_sprockets/config/environments/test.rb diff --git a/fixtures/default/rails6_sprockets/config/initializers/application_controller_renderer.rb b/fixtures/default/rails72_sprockets/config/initializers/application_controller_renderer.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/initializers/application_controller_renderer.rb rename to fixtures/default/rails72_sprockets/config/initializers/application_controller_renderer.rb diff --git a/fixtures/default/rails6_sprockets/config/initializers/assets.rb b/fixtures/default/rails72_sprockets/config/initializers/assets.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/initializers/assets.rb rename to fixtures/default/rails72_sprockets/config/initializers/assets.rb diff --git a/fixtures/default/rails6_sprockets/config/initializers/backtrace_silencers.rb b/fixtures/default/rails72_sprockets/config/initializers/backtrace_silencers.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/initializers/backtrace_silencers.rb rename to fixtures/default/rails72_sprockets/config/initializers/backtrace_silencers.rb diff --git a/fixtures/default/rails6_sprockets/config/initializers/content_security_policy.rb b/fixtures/default/rails72_sprockets/config/initializers/content_security_policy.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/initializers/content_security_policy.rb rename to fixtures/default/rails72_sprockets/config/initializers/content_security_policy.rb diff --git a/fixtures/default/rails6_sprockets/config/initializers/cookies_serializer.rb b/fixtures/default/rails72_sprockets/config/initializers/cookies_serializer.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/initializers/cookies_serializer.rb rename to fixtures/default/rails72_sprockets/config/initializers/cookies_serializer.rb diff --git a/fixtures/default/rails6_sprockets/config/initializers/filter_parameter_logging.rb b/fixtures/default/rails72_sprockets/config/initializers/filter_parameter_logging.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/initializers/filter_parameter_logging.rb rename to fixtures/default/rails72_sprockets/config/initializers/filter_parameter_logging.rb diff --git a/fixtures/default/rails6_sprockets/config/initializers/inflections.rb b/fixtures/default/rails72_sprockets/config/initializers/inflections.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/initializers/inflections.rb rename to fixtures/default/rails72_sprockets/config/initializers/inflections.rb diff --git a/fixtures/default/rails6_sprockets/config/initializers/mime_types.rb b/fixtures/default/rails72_sprockets/config/initializers/mime_types.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/initializers/mime_types.rb rename to fixtures/default/rails72_sprockets/config/initializers/mime_types.rb diff --git a/fixtures/default/rails6_sprockets/config/initializers/new_framework_defaults_6_1.rb b/fixtures/default/rails72_sprockets/config/initializers/new_framework_defaults_6_1.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/initializers/new_framework_defaults_6_1.rb rename to fixtures/default/rails72_sprockets/config/initializers/new_framework_defaults_6_1.rb diff --git a/fixtures/default/rails6_sprockets/config/initializers/permissions_policy.rb b/fixtures/default/rails72_sprockets/config/initializers/permissions_policy.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/initializers/permissions_policy.rb rename to fixtures/default/rails72_sprockets/config/initializers/permissions_policy.rb diff --git a/fixtures/default/rails6_sprockets/config/initializers/wrap_parameters.rb b/fixtures/default/rails72_sprockets/config/initializers/wrap_parameters.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/initializers/wrap_parameters.rb rename to fixtures/default/rails72_sprockets/config/initializers/wrap_parameters.rb diff --git a/fixtures/default/rails6_sprockets/config/locales/en.yml b/fixtures/default/rails72_sprockets/config/locales/en.yml similarity index 100% rename from fixtures/default/rails6_sprockets/config/locales/en.yml rename to fixtures/default/rails72_sprockets/config/locales/en.yml diff --git a/fixtures/default/rails6_sprockets/config/puma.rb b/fixtures/default/rails72_sprockets/config/puma.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/puma.rb rename to fixtures/default/rails72_sprockets/config/puma.rb diff --git a/fixtures/default/rails6_sprockets/config/routes.rb b/fixtures/default/rails72_sprockets/config/routes.rb similarity index 100% rename from fixtures/default/rails6_sprockets/config/routes.rb rename to fixtures/default/rails72_sprockets/config/routes.rb diff --git a/fixtures/default/rails6_sprockets/config/webpack/base.js b/fixtures/default/rails72_sprockets/config/webpack/base.js similarity index 100% rename from fixtures/default/rails6_sprockets/config/webpack/base.js rename to fixtures/default/rails72_sprockets/config/webpack/base.js diff --git a/fixtures/default/rails6_sprockets/config/webpack/development.js b/fixtures/default/rails72_sprockets/config/webpack/development.js similarity index 100% rename from fixtures/default/rails6_sprockets/config/webpack/development.js rename to fixtures/default/rails72_sprockets/config/webpack/development.js diff --git a/fixtures/default/rails6_sprockets/config/webpack/environment.js b/fixtures/default/rails72_sprockets/config/webpack/environment.js similarity index 100% rename from fixtures/default/rails6_sprockets/config/webpack/environment.js rename to fixtures/default/rails72_sprockets/config/webpack/environment.js diff --git a/fixtures/default/rails6_sprockets/config/webpack/production.js b/fixtures/default/rails72_sprockets/config/webpack/production.js similarity index 100% rename from fixtures/default/rails6_sprockets/config/webpack/production.js rename to fixtures/default/rails72_sprockets/config/webpack/production.js diff --git a/fixtures/default/rails6_sprockets/config/webpack/test.js b/fixtures/default/rails72_sprockets/config/webpack/test.js similarity index 100% rename from fixtures/default/rails6_sprockets/config/webpack/test.js rename to fixtures/default/rails72_sprockets/config/webpack/test.js diff --git a/fixtures/default/rails6_sprockets/config/webpacker.yml b/fixtures/default/rails72_sprockets/config/webpacker.yml similarity index 100% rename from fixtures/default/rails6_sprockets/config/webpacker.yml rename to fixtures/default/rails72_sprockets/config/webpacker.yml diff --git a/fixtures/default/rails6_sprockets/package.json b/fixtures/default/rails72_sprockets/package.json similarity index 100% rename from fixtures/default/rails6_sprockets/package.json rename to fixtures/default/rails72_sprockets/package.json diff --git a/fixtures/default/rails6_sprockets/postcss.config.js b/fixtures/default/rails72_sprockets/postcss.config.js similarity index 100% rename from fixtures/default/rails6_sprockets/postcss.config.js rename to fixtures/default/rails72_sprockets/postcss.config.js diff --git a/fixtures/default/rails6_sprockets/public/404.html b/fixtures/default/rails72_sprockets/public/404.html similarity index 100% rename from fixtures/default/rails6_sprockets/public/404.html rename to fixtures/default/rails72_sprockets/public/404.html diff --git a/fixtures/default/rails6_sprockets/public/422.html b/fixtures/default/rails72_sprockets/public/422.html similarity index 100% rename from fixtures/default/rails6_sprockets/public/422.html rename to fixtures/default/rails72_sprockets/public/422.html diff --git a/fixtures/default/rails6_sprockets/public/500.html b/fixtures/default/rails72_sprockets/public/500.html similarity index 100% rename from fixtures/default/rails6_sprockets/public/500.html rename to fixtures/default/rails72_sprockets/public/500.html diff --git a/fixtures/default/rails6_sprockets/public/apple-touch-icon-precomposed.png b/fixtures/default/rails72_sprockets/public/apple-touch-icon-precomposed.png similarity index 100% rename from fixtures/default/rails6_sprockets/public/apple-touch-icon-precomposed.png rename to fixtures/default/rails72_sprockets/public/apple-touch-icon-precomposed.png diff --git a/fixtures/default/rails6_sprockets/public/apple-touch-icon.png b/fixtures/default/rails72_sprockets/public/apple-touch-icon.png similarity index 100% rename from fixtures/default/rails6_sprockets/public/apple-touch-icon.png rename to fixtures/default/rails72_sprockets/public/apple-touch-icon.png diff --git a/fixtures/default/rails6_sprockets/public/favicon.ico b/fixtures/default/rails72_sprockets/public/favicon.ico similarity index 100% rename from fixtures/default/rails6_sprockets/public/favicon.ico rename to fixtures/default/rails72_sprockets/public/favicon.ico diff --git a/fixtures/default/rails6_sprockets/public/robots.txt b/fixtures/default/rails72_sprockets/public/robots.txt similarity index 100% rename from fixtures/default/rails6_sprockets/public/robots.txt rename to fixtures/default/rails72_sprockets/public/robots.txt diff --git a/fixtures/default/rails6_sprockets/yarn.lock b/fixtures/default/rails72_sprockets/yarn.lock similarity index 100% rename from fixtures/default/rails6_sprockets/yarn.lock rename to fixtures/default/rails72_sprockets/yarn.lock diff --git a/fixtures/default/relative_gemspec_path/Gemfile b/fixtures/default/relative_gemspec_path/Gemfile index 8a43fc482..62434b61e 100644 --- a/fixtures/default/relative_gemspec_path/Gemfile +++ b/fixtures/default/relative_gemspec_path/Gemfile @@ -1,4 +1,5 @@ source 'https://rubygems.org' +gem 'rackup' gem "webrick" gem "sinatra" gemspec path: "gems/hola" diff --git a/fixtures/default/relative_gemspec_path/Gemfile.lock b/fixtures/default/relative_gemspec_path/Gemfile.lock index a21484c85..dccb597ef 100644 --- a/fixtures/default/relative_gemspec_path/Gemfile.lock +++ b/fixtures/default/relative_gemspec_path/Gemfile.lock @@ -11,6 +11,9 @@ GEM rack (2.2.8) rack-protection (3.0.6) rack + rackup (1.0.1) + rack (< 3) + webrick ruby2_keywords (0.0.5) sinatra (3.0.6) mustermann (~> 3.0) @@ -25,6 +28,7 @@ PLATFORMS DEPENDENCIES hola! + rackup sinatra webrick diff --git a/fixtures/default/sinatra/Gemfile b/fixtures/default/sinatra/Gemfile index 14cb9babd..a52c94039 100644 --- a/fixtures/default/sinatra/Gemfile +++ b/fixtures/default/sinatra/Gemfile @@ -1,4 +1,5 @@ source 'https://rubygems.org' +gem 'rackup' gem 'webrick' gem 'sinatra' diff --git a/fixtures/default/sinatra/Gemfile.lock b/fixtures/default/sinatra/Gemfile.lock index 6f6a059e5..27021f77c 100644 --- a/fixtures/default/sinatra/Gemfile.lock +++ b/fixtures/default/sinatra/Gemfile.lock @@ -6,6 +6,9 @@ GEM rack (2.2.8) rack-protection (3.1.0) rack (~> 2.2, >= 2.2.4) + rackup (1.0.1) + rack (< 3) + webrick ruby2_keywords (0.0.5) sinatra (3.1.0) mustermann (~> 3.0) @@ -19,5 +22,9 @@ PLATFORMS ruby DEPENDENCIES + rackup sinatra webrick + +BUNDLED WITH + 2.7.2 diff --git a/fixtures/default/sinatra/vendor/cache/rackup-1.0.1.gem b/fixtures/default/sinatra/vendor/cache/rackup-1.0.1.gem new file mode 100644 index 000000000..20c8a0ae8 Binary files /dev/null and b/fixtures/default/sinatra/vendor/cache/rackup-1.0.1.gem differ diff --git a/fixtures/default/sinatra_jruby/Gemfile b/fixtures/default/sinatra_jruby/Gemfile index 69327f03e..f6bbdd683 100644 --- a/fixtures/default/sinatra_jruby/Gemfile +++ b/fixtures/default/sinatra_jruby/Gemfile @@ -2,5 +2,6 @@ source 'https://rubygems.org' ruby '3.1.4', :engine => 'jruby', :engine_version => '9.4.8.0' +gem 'rackup' gem 'sinatra' gem 'webrick' diff --git a/fixtures/default/sinatra_jruby/Gemfile.lock b/fixtures/default/sinatra_jruby/Gemfile.lock index b58c4f97a..587efad6f 100644 --- a/fixtures/default/sinatra_jruby/Gemfile.lock +++ b/fixtures/default/sinatra_jruby/Gemfile.lock @@ -1,24 +1,37 @@ GEM remote: https://rubygems.org/ specs: - mustermann (3.0.0) + base64 (0.3.0) + logger (1.7.0) + mustermann (3.0.4) ruby2_keywords (~> 0.0.1) - rack (2.2.7) - rack-protection (3.0.6) - rack + rack (3.2.4) + rack-protection (4.2.1) + base64 (>= 0.1.0) + logger (>= 1.6.0) + rack (>= 3.0.0, < 4) + rack-session (2.1.1) + base64 (>= 0.1.0) + rack (>= 3.0.0) + rackup (2.3.1) + rack (>= 3) ruby2_keywords (0.0.5) - sinatra (3.0.6) + sinatra (4.2.1) + logger (>= 1.6.0) mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.6) + rack (>= 3.0.0, < 4) + rack-protection (= 4.2.1) + rack-session (>= 2.0.0, < 3) tilt (~> 2.0) - tilt (2.2.0) - webrick (1.8.1) + tilt (2.7.0) + webrick (1.9.2) PLATFORMS universal-java-1.8 + universal-java-25 DEPENDENCIES + rackup sinatra webrick @@ -26,4 +39,4 @@ RUBY VERSION ruby 3.1.4p0 (jruby 9.4.8.0) BUNDLED WITH - 2.6.5 + 2.3.26 diff --git a/fixtures/default/sinatra_jruby/vendor/cache/base64-0.3.0.gem b/fixtures/default/sinatra_jruby/vendor/cache/base64-0.3.0.gem new file mode 100644 index 000000000..12f53f142 Binary files /dev/null and b/fixtures/default/sinatra_jruby/vendor/cache/base64-0.3.0.gem differ diff --git a/fixtures/default/sinatra_jruby/vendor/cache/logger-1.7.0.gem b/fixtures/default/sinatra_jruby/vendor/cache/logger-1.7.0.gem new file mode 100644 index 000000000..061f1cccf Binary files /dev/null and b/fixtures/default/sinatra_jruby/vendor/cache/logger-1.7.0.gem differ diff --git a/fixtures/default/sinatra_jruby/vendor/cache/mustermann-3.0.0.gem b/fixtures/default/sinatra_jruby/vendor/cache/mustermann-3.0.0.gem deleted file mode 100644 index aa1582b66..000000000 Binary files a/fixtures/default/sinatra_jruby/vendor/cache/mustermann-3.0.0.gem and /dev/null differ diff --git a/fixtures/default/sinatra_jruby/vendor/cache/mustermann-3.0.4.gem b/fixtures/default/sinatra_jruby/vendor/cache/mustermann-3.0.4.gem new file mode 100644 index 000000000..beeb1fb7d Binary files /dev/null and b/fixtures/default/sinatra_jruby/vendor/cache/mustermann-3.0.4.gem differ diff --git a/fixtures/default/sinatra_jruby/vendor/cache/rack-2.2.7.gem b/fixtures/default/sinatra_jruby/vendor/cache/rack-2.2.7.gem deleted file mode 100644 index 57ea2c727..000000000 Binary files a/fixtures/default/sinatra_jruby/vendor/cache/rack-2.2.7.gem and /dev/null differ diff --git a/fixtures/default/sinatra_jruby/vendor/cache/rack-3.2.4.gem b/fixtures/default/sinatra_jruby/vendor/cache/rack-3.2.4.gem new file mode 100644 index 000000000..2907a2cb5 Binary files /dev/null and b/fixtures/default/sinatra_jruby/vendor/cache/rack-3.2.4.gem differ diff --git a/fixtures/default/sinatra_jruby/vendor/cache/rack-protection-3.0.6.gem b/fixtures/default/sinatra_jruby/vendor/cache/rack-protection-3.0.6.gem deleted file mode 100644 index 7b563cd3b..000000000 Binary files a/fixtures/default/sinatra_jruby/vendor/cache/rack-protection-3.0.6.gem and /dev/null differ diff --git a/fixtures/default/sinatra_jruby/vendor/cache/rack-protection-4.2.1.gem b/fixtures/default/sinatra_jruby/vendor/cache/rack-protection-4.2.1.gem new file mode 100644 index 000000000..c884ea872 Binary files /dev/null and b/fixtures/default/sinatra_jruby/vendor/cache/rack-protection-4.2.1.gem differ diff --git a/fixtures/default/sinatra_jruby/vendor/cache/rack-session-2.1.1.gem b/fixtures/default/sinatra_jruby/vendor/cache/rack-session-2.1.1.gem new file mode 100644 index 000000000..f03723224 Binary files /dev/null and b/fixtures/default/sinatra_jruby/vendor/cache/rack-session-2.1.1.gem differ diff --git a/fixtures/default/sinatra_jruby/vendor/cache/rackup-2.3.1.gem b/fixtures/default/sinatra_jruby/vendor/cache/rackup-2.3.1.gem new file mode 100644 index 000000000..d374697b7 Binary files /dev/null and b/fixtures/default/sinatra_jruby/vendor/cache/rackup-2.3.1.gem differ diff --git a/fixtures/default/sinatra_jruby/vendor/cache/sinatra-3.0.6.gem b/fixtures/default/sinatra_jruby/vendor/cache/sinatra-3.0.6.gem deleted file mode 100644 index 4be70105e..000000000 Binary files a/fixtures/default/sinatra_jruby/vendor/cache/sinatra-3.0.6.gem and /dev/null differ diff --git a/fixtures/default/sinatra_jruby/vendor/cache/sinatra-4.2.1.gem b/fixtures/default/sinatra_jruby/vendor/cache/sinatra-4.2.1.gem new file mode 100644 index 000000000..24bbb11bf Binary files /dev/null and b/fixtures/default/sinatra_jruby/vendor/cache/sinatra-4.2.1.gem differ diff --git a/fixtures/default/sinatra_jruby/vendor/cache/tilt-2.2.0.gem b/fixtures/default/sinatra_jruby/vendor/cache/tilt-2.2.0.gem deleted file mode 100644 index 30774e958..000000000 Binary files a/fixtures/default/sinatra_jruby/vendor/cache/tilt-2.2.0.gem and /dev/null differ diff --git a/fixtures/default/sinatra_jruby/vendor/cache/tilt-2.7.0.gem b/fixtures/default/sinatra_jruby/vendor/cache/tilt-2.7.0.gem new file mode 100644 index 000000000..eb5702efb Binary files /dev/null and b/fixtures/default/sinatra_jruby/vendor/cache/tilt-2.7.0.gem differ diff --git a/fixtures/default/sinatra_jruby/vendor/cache/webrick-1.8.1.gem b/fixtures/default/sinatra_jruby/vendor/cache/webrick-1.8.1.gem deleted file mode 100644 index ac0894b9c..000000000 Binary files a/fixtures/default/sinatra_jruby/vendor/cache/webrick-1.8.1.gem and /dev/null differ diff --git a/fixtures/default/sinatra_jruby/vendor/cache/webrick-1.9.2.gem b/fixtures/default/sinatra_jruby/vendor/cache/webrick-1.9.2.gem new file mode 100644 index 000000000..a988684c9 Binary files /dev/null and b/fixtures/default/sinatra_jruby/vendor/cache/webrick-1.9.2.gem differ diff --git a/fixtures/default/specified_ruby_version/Gemfile b/fixtures/default/specified_ruby_version/Gemfile index 12ddaea63..3cd8c41b2 100644 --- a/fixtures/default/specified_ruby_version/Gemfile +++ b/fixtures/default/specified_ruby_version/Gemfile @@ -1,5 +1,6 @@ source 'https://rubygems.org' ruby "~>3.2.0" +gem 'rackup' gem "webrick" gem 'sinatra' diff --git a/fixtures/default/specified_ruby_version/Gemfile.lock b/fixtures/default/specified_ruby_version/Gemfile.lock index e01dd3ed1..259415422 100644 --- a/fixtures/default/specified_ruby_version/Gemfile.lock +++ b/fixtures/default/specified_ruby_version/Gemfile.lock @@ -6,6 +6,9 @@ GEM rack (2.2.8) rack-protection (3.1.0) rack (~> 2.2, >= 2.2.4) + rackup (1.0.1) + rack (< 3) + webrick ruby2_keywords (0.0.5) sinatra (3.1.0) mustermann (~> 3.0) @@ -19,6 +22,7 @@ PLATFORMS ruby DEPENDENCIES + rackup sinatra webrick diff --git a/fixtures/default/unspecified_ruby_version/Gemfile b/fixtures/default/unspecified_ruby_version/Gemfile index 14cb9babd..a52c94039 100644 --- a/fixtures/default/unspecified_ruby_version/Gemfile +++ b/fixtures/default/unspecified_ruby_version/Gemfile @@ -1,4 +1,5 @@ source 'https://rubygems.org' +gem 'rackup' gem 'webrick' gem 'sinatra' diff --git a/fixtures/default/unspecified_ruby_version/Gemfile.lock b/fixtures/default/unspecified_ruby_version/Gemfile.lock index 6f6a059e5..27021f77c 100644 --- a/fixtures/default/unspecified_ruby_version/Gemfile.lock +++ b/fixtures/default/unspecified_ruby_version/Gemfile.lock @@ -6,6 +6,9 @@ GEM rack (2.2.8) rack-protection (3.1.0) rack (~> 2.2, >= 2.2.4) + rackup (1.0.1) + rack (< 3) + webrick ruby2_keywords (0.0.5) sinatra (3.1.0) mustermann (~> 3.0) @@ -19,5 +22,9 @@ PLATFORMS ruby DEPENDENCIES + rackup sinatra webrick + +BUNDLED WITH + 2.7.2 diff --git a/fixtures/multibuildpack/dotnet_core/Gemfile b/fixtures/multibuildpack/dotnet_core/Gemfile index 14cb9babd..a52c94039 100644 --- a/fixtures/multibuildpack/dotnet_core/Gemfile +++ b/fixtures/multibuildpack/dotnet_core/Gemfile @@ -1,4 +1,5 @@ source 'https://rubygems.org' +gem 'rackup' gem 'webrick' gem 'sinatra' diff --git a/fixtures/multibuildpack/dotnet_core/Gemfile.lock b/fixtures/multibuildpack/dotnet_core/Gemfile.lock index 6f6a059e5..27021f77c 100644 --- a/fixtures/multibuildpack/dotnet_core/Gemfile.lock +++ b/fixtures/multibuildpack/dotnet_core/Gemfile.lock @@ -6,6 +6,9 @@ GEM rack (2.2.8) rack-protection (3.1.0) rack (~> 2.2, >= 2.2.4) + rackup (1.0.1) + rack (< 3) + webrick ruby2_keywords (0.0.5) sinatra (3.1.0) mustermann (~> 3.0) @@ -19,5 +22,9 @@ PLATFORMS ruby DEPENDENCIES + rackup sinatra webrick + +BUNDLED WITH + 2.7.2 diff --git a/fixtures/multibuildpack/rails6/Gemfile.lock b/fixtures/multibuildpack/rails6/Gemfile.lock deleted file mode 100644 index e3012cdfc..000000000 --- a/fixtures/multibuildpack/rails6/Gemfile.lock +++ /dev/null @@ -1,163 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actioncable (6.1.7) - actionpack (= 6.1.7) - activesupport (= 6.1.7) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailbox (6.1.7) - actionpack (= 6.1.7) - activejob (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) - mail (>= 2.7.1) - actionmailer (6.1.7) - actionpack (= 6.1.7) - actionview (= 6.1.7) - activejob (= 6.1.7) - activesupport (= 6.1.7) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (6.1.7) - actionview (= 6.1.7) - activesupport (= 6.1.7) - rack (~> 2.0, >= 2.0.9) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7) - actionpack (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) - nokogiri (>= 1.8.5) - actionview (6.1.7) - activesupport (= 6.1.7) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7) - activesupport (= 6.1.7) - globalid (>= 0.3.6) - activemodel (6.1.7) - activesupport (= 6.1.7) - activerecord (6.1.7) - activemodel (= 6.1.7) - activesupport (= 6.1.7) - activestorage (6.1.7) - actionpack (= 6.1.7) - activejob (= 6.1.7) - activerecord (= 6.1.7) - activesupport (= 6.1.7) - marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (6.1.7) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) - builder (3.2.4) - concurrent-ruby (1.1.10) - crass (1.0.6) - erubi (1.11.0) - ffi (1.15.5) - globalid (1.0.0) - activesupport (>= 5.0) - i18n (1.12.0) - concurrent-ruby (~> 1.0) - loofah (2.19.0) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - marcel (1.0.2) - method_source (1.0.0) - mini_mime (1.1.2) - mini_portile2 (2.8.0) - minitest (5.16.3) - nio4r (2.5.8) - nokogiri (1.13.9) - mini_portile2 (~> 2.8.0) - racc (~> 1.4) - puma (6.0.0) - nio4r (~> 2.0) - racc (1.6.0) - rack (2.2.6.4) - rack-proxy (0.7.4) - rack - rack-test (2.0.2) - rack (>= 1.3) - rails (6.1.7) - actioncable (= 6.1.7) - actionmailbox (= 6.1.7) - actionmailer (= 6.1.7) - actionpack (= 6.1.7) - actiontext (= 6.1.7) - actionview (= 6.1.7) - activejob (= 6.1.7) - activemodel (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) - bundler (>= 1.15.0) - railties (= 6.1.7) - sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) - railties (6.1.7) - actionpack (= 6.1.7) - activesupport (= 6.1.7) - method_source - rake (>= 12.2) - thor (~> 1.0) - rake (13.0.6) - 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 - semantic_range (3.0.0) - sprockets (4.1.1) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - sprockets (>= 3.0.0) - thor (1.2.1) - tilt (2.0.11) - tzinfo (2.0.5) - concurrent-ruby (~> 1.0) - webpacker (6.0.0.rc.6) - activesupport (>= 5.2) - rack-proxy (>= 0.6.1) - railties (>= 5.2) - semantic_range (>= 2.3.0) - websocket-driver (0.7.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - zeitwerk (2.6.6) - -PLATFORMS - ruby - -DEPENDENCIES - puma (~> 6.0) - rails (~> 6.1.0) - sass-rails (>= 6) - webpacker (~> 6.0.0.rc.6) - -RUBY VERSION - ruby 3.1.2p20 diff --git a/fixtures/multibuildpack/rails6/.gitignore b/fixtures/multibuildpack/rails72/.gitignore similarity index 100% rename from fixtures/multibuildpack/rails6/.gitignore rename to fixtures/multibuildpack/rails72/.gitignore diff --git a/fixtures/multibuildpack/rails6/Gemfile b/fixtures/multibuildpack/rails72/Gemfile similarity index 90% rename from fixtures/multibuildpack/rails6/Gemfile rename to fixtures/multibuildpack/rails72/Gemfile index a5f513b2b..ba292ea9b 100644 --- a/fixtures/multibuildpack/rails6/Gemfile +++ b/fixtures/multibuildpack/rails72/Gemfile @@ -1,10 +1,10 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '~> 3.1.0' +ruby '~> 3.2.0' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 6.1.0' +gem 'rails', '~> 7.2.0' # Use Puma as the app server gem 'puma', '~> 6.0' diff --git a/fixtures/multibuildpack/rails72/Gemfile.lock b/fixtures/multibuildpack/rails72/Gemfile.lock new file mode 100644 index 000000000..2098914d5 --- /dev/null +++ b/fixtures/multibuildpack/rails72/Gemfile.lock @@ -0,0 +1,236 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (7.2.3) + actionpack (= 7.2.3) + activesupport (= 7.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + zeitwerk (~> 2.6) + actionmailbox (7.2.3) + actionpack (= 7.2.3) + activejob (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) + mail (>= 2.8.0) + actionmailer (7.2.3) + actionpack (= 7.2.3) + actionview (= 7.2.3) + activejob (= 7.2.3) + activesupport (= 7.2.3) + mail (>= 2.8.0) + rails-dom-testing (~> 2.2) + actionpack (7.2.3) + actionview (= 7.2.3) + activesupport (= 7.2.3) + cgi + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4, < 3.3) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) + actiontext (7.2.3) + actionpack (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.2.3) + activesupport (= 7.2.3) + builder (~> 3.1) + cgi + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.2.3) + activesupport (= 7.2.3) + globalid (>= 0.3.6) + activemodel (7.2.3) + activesupport (= 7.2.3) + activerecord (7.2.3) + activemodel (= 7.2.3) + activesupport (= 7.2.3) + timeout (>= 0.4.0) + activestorage (7.2.3) + actionpack (= 7.2.3) + activejob (= 7.2.3) + activerecord (= 7.2.3) + activesupport (= 7.2.3) + marcel (~> 1.0) + activesupport (7.2.3) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + base64 (0.3.0) + benchmark (0.5.0) + bigdecimal (4.0.1) + builder (3.3.0) + cgi (0.5.1) + concurrent-ruby (1.3.6) + connection_pool (3.0.2) + crass (1.0.6) + date (3.5.1) + drb (2.2.3) + erb (6.0.1) + erubi (1.13.1) + ffi (1.17.3-x86_64-linux-gnu) + globalid (1.3.0) + activesupport (>= 6.1) + i18n (1.14.8) + concurrent-ruby (~> 1.0) + io-console (0.8.2) + irb (1.16.0) + pp (>= 0.6.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + logger (1.7.0) + loofah (2.25.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + mail (2.9.0) + logger + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + marcel (1.1.0) + mini_mime (1.1.5) + minitest (6.0.1) + prism (~> 1.5) + net-imap (0.6.2) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.5.1) + net-protocol + nio4r (2.7.5) + nokogiri (1.19.0-x86_64-linux-gnu) + racc (~> 1.4) + pp (0.6.3) + prettyprint + prettyprint (0.2.0) + prism (1.8.0) + psych (5.3.1) + date + stringio + puma (6.6.1) + nio4r (~> 2.0) + racc (1.8.1) + rack (2.2.21) + rack-proxy (0.7.7) + rack + rack-session (1.0.2) + rack (< 3) + rack-test (2.2.0) + rack (>= 1.3) + rackup (1.0.1) + rack (< 3) + webrick + rails (7.2.3) + actioncable (= 7.2.3) + actionmailbox (= 7.2.3) + actionmailer (= 7.2.3) + actionpack (= 7.2.3) + actiontext (= 7.2.3) + actionview (= 7.2.3) + activejob (= 7.2.3) + activemodel (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) + bundler (>= 1.15.0) + railties (= 7.2.3) + rails-dom-testing (2.3.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.2) + loofah (~> 2.21) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + railties (7.2.3) + actionpack (= 7.2.3) + activesupport (= 7.2.3) + cgi + irb (~> 1.13) + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + tsort (>= 0.2) + zeitwerk (~> 2.6) + rake (13.3.1) + rdoc (7.1.0) + erb + psych (>= 4.0.0) + tsort + reline (0.6.3) + io-console (~> 0.5) + 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 + securerandom (0.4.1) + semantic_range (3.1.0) + sprockets (4.2.2) + concurrent-ruby (~> 1.0) + logger + rack (>= 2.2.4, < 4) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) + sprockets (>= 3.0.0) + stringio (3.2.0) + thor (1.5.0) + tilt (2.7.0) + timeout (0.6.0) + tsort (0.2.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + useragent (0.16.11) + webpacker (6.0.0.rc.6) + activesupport (>= 5.2) + rack-proxy (>= 0.6.1) + railties (>= 5.2) + semantic_range (>= 2.3.0) + webrick (1.9.2) + websocket-driver (0.8.0) + base64 + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.7.4) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + puma (~> 6.0) + rails (~> 7.2.0) + sass-rails (>= 6) + webpacker (~> 6.0.0.rc.6) + +RUBY VERSION + ruby 3.2.9p265 + +BUNDLED WITH + 2.7.2 diff --git a/fixtures/multibuildpack/rails6/README.md b/fixtures/multibuildpack/rails72/README.md similarity index 100% rename from fixtures/multibuildpack/rails6/README.md rename to fixtures/multibuildpack/rails72/README.md diff --git a/fixtures/multibuildpack/rails6/Rakefile b/fixtures/multibuildpack/rails72/Rakefile similarity index 100% rename from fixtures/multibuildpack/rails6/Rakefile rename to fixtures/multibuildpack/rails72/Rakefile diff --git a/fixtures/multibuildpack/rails6/app/assets/config/manifest.js b/fixtures/multibuildpack/rails72/app/assets/config/manifest.js similarity index 100% rename from fixtures/multibuildpack/rails6/app/assets/config/manifest.js rename to fixtures/multibuildpack/rails72/app/assets/config/manifest.js diff --git a/fixtures/multibuildpack/rails6/app/assets/images/.keep b/fixtures/multibuildpack/rails72/app/assets/images/.keep similarity index 100% rename from fixtures/multibuildpack/rails6/app/assets/images/.keep rename to fixtures/multibuildpack/rails72/app/assets/images/.keep diff --git a/fixtures/multibuildpack/rails6/app/assets/stylesheets/application.css b/fixtures/multibuildpack/rails72/app/assets/stylesheets/application.css similarity index 100% rename from fixtures/multibuildpack/rails6/app/assets/stylesheets/application.css rename to fixtures/multibuildpack/rails72/app/assets/stylesheets/application.css diff --git a/fixtures/multibuildpack/rails6/app/controllers/application_controller.rb b/fixtures/multibuildpack/rails72/app/controllers/application_controller.rb similarity index 100% rename from fixtures/multibuildpack/rails6/app/controllers/application_controller.rb rename to fixtures/multibuildpack/rails72/app/controllers/application_controller.rb diff --git a/fixtures/multibuildpack/rails6/app/helpers/application_helper.rb b/fixtures/multibuildpack/rails72/app/helpers/application_helper.rb similarity index 100% rename from fixtures/multibuildpack/rails6/app/helpers/application_helper.rb rename to fixtures/multibuildpack/rails72/app/helpers/application_helper.rb diff --git a/fixtures/multibuildpack/rails6/app/javascript/packs/application.js b/fixtures/multibuildpack/rails72/app/javascript/packs/application.js similarity index 100% rename from fixtures/multibuildpack/rails6/app/javascript/packs/application.js rename to fixtures/multibuildpack/rails72/app/javascript/packs/application.js diff --git a/fixtures/multibuildpack/rails6/app/jobs/application_job.rb b/fixtures/multibuildpack/rails72/app/jobs/application_job.rb similarity index 100% rename from fixtures/multibuildpack/rails6/app/jobs/application_job.rb rename to fixtures/multibuildpack/rails72/app/jobs/application_job.rb diff --git a/fixtures/multibuildpack/rails6/app/views/layouts/application.html.erb b/fixtures/multibuildpack/rails72/app/views/layouts/application.html.erb similarity index 100% rename from fixtures/multibuildpack/rails6/app/views/layouts/application.html.erb rename to fixtures/multibuildpack/rails72/app/views/layouts/application.html.erb diff --git a/fixtures/multibuildpack/rails6/babel.config.js b/fixtures/multibuildpack/rails72/babel.config.js similarity index 100% rename from fixtures/multibuildpack/rails6/babel.config.js rename to fixtures/multibuildpack/rails72/babel.config.js diff --git a/fixtures/multibuildpack/rails6/bin/bundle b/fixtures/multibuildpack/rails72/bin/bundle similarity index 100% rename from fixtures/multibuildpack/rails6/bin/bundle rename to fixtures/multibuildpack/rails72/bin/bundle diff --git a/fixtures/multibuildpack/rails6/bin/rails b/fixtures/multibuildpack/rails72/bin/rails similarity index 100% rename from fixtures/multibuildpack/rails6/bin/rails rename to fixtures/multibuildpack/rails72/bin/rails diff --git a/fixtures/multibuildpack/rails6/bin/rake b/fixtures/multibuildpack/rails72/bin/rake similarity index 100% rename from fixtures/multibuildpack/rails6/bin/rake rename to fixtures/multibuildpack/rails72/bin/rake diff --git a/fixtures/multibuildpack/rails6/bin/setup b/fixtures/multibuildpack/rails72/bin/setup similarity index 100% rename from fixtures/multibuildpack/rails6/bin/setup rename to fixtures/multibuildpack/rails72/bin/setup diff --git a/fixtures/multibuildpack/rails6/bin/webpack b/fixtures/multibuildpack/rails72/bin/webpack similarity index 96% rename from fixtures/multibuildpack/rails6/bin/webpack rename to fixtures/multibuildpack/rails72/bin/webpack index 2e30da830..7a58cb839 100755 --- a/fixtures/multibuildpack/rails6/bin/webpack +++ b/fixtures/multibuildpack/rails72/bin/webpack @@ -1,6 +1,7 @@ #!/usr/bin/env ruby require "pathname" +require "logger" require "bundler/setup" require "webpacker" require "webpacker/webpack_runner" diff --git a/fixtures/multibuildpack/rails6/bin/webpack-dev-server b/fixtures/multibuildpack/rails72/bin/webpack-dev-server similarity index 100% rename from fixtures/multibuildpack/rails6/bin/webpack-dev-server rename to fixtures/multibuildpack/rails72/bin/webpack-dev-server diff --git a/fixtures/multibuildpack/rails6/bin/yarn b/fixtures/multibuildpack/rails72/bin/yarn similarity index 100% rename from fixtures/multibuildpack/rails6/bin/yarn rename to fixtures/multibuildpack/rails72/bin/yarn diff --git a/fixtures/multibuildpack/rails6/config.ru b/fixtures/multibuildpack/rails72/config.ru similarity index 100% rename from fixtures/multibuildpack/rails6/config.ru rename to fixtures/multibuildpack/rails72/config.ru diff --git a/fixtures/multibuildpack/rails6/config/application.rb b/fixtures/multibuildpack/rails72/config/application.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/application.rb rename to fixtures/multibuildpack/rails72/config/application.rb diff --git a/fixtures/multibuildpack/rails6/config/boot.rb b/fixtures/multibuildpack/rails72/config/boot.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/boot.rb rename to fixtures/multibuildpack/rails72/config/boot.rb diff --git a/fixtures/multibuildpack/rails6/config/environment.rb b/fixtures/multibuildpack/rails72/config/environment.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/environment.rb rename to fixtures/multibuildpack/rails72/config/environment.rb diff --git a/fixtures/multibuildpack/rails6/config/environments/development.rb b/fixtures/multibuildpack/rails72/config/environments/development.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/environments/development.rb rename to fixtures/multibuildpack/rails72/config/environments/development.rb diff --git a/fixtures/multibuildpack/rails6/config/environments/production.rb b/fixtures/multibuildpack/rails72/config/environments/production.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/environments/production.rb rename to fixtures/multibuildpack/rails72/config/environments/production.rb diff --git a/fixtures/multibuildpack/rails6/config/environments/test.rb b/fixtures/multibuildpack/rails72/config/environments/test.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/environments/test.rb rename to fixtures/multibuildpack/rails72/config/environments/test.rb diff --git a/fixtures/multibuildpack/rails6/config/initializers/application_controller_renderer.rb b/fixtures/multibuildpack/rails72/config/initializers/application_controller_renderer.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/initializers/application_controller_renderer.rb rename to fixtures/multibuildpack/rails72/config/initializers/application_controller_renderer.rb diff --git a/fixtures/multibuildpack/rails6/config/initializers/assets.rb b/fixtures/multibuildpack/rails72/config/initializers/assets.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/initializers/assets.rb rename to fixtures/multibuildpack/rails72/config/initializers/assets.rb diff --git a/fixtures/multibuildpack/rails6/config/initializers/backtrace_silencers.rb b/fixtures/multibuildpack/rails72/config/initializers/backtrace_silencers.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/initializers/backtrace_silencers.rb rename to fixtures/multibuildpack/rails72/config/initializers/backtrace_silencers.rb diff --git a/fixtures/multibuildpack/rails6/config/initializers/content_security_policy.rb b/fixtures/multibuildpack/rails72/config/initializers/content_security_policy.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/initializers/content_security_policy.rb rename to fixtures/multibuildpack/rails72/config/initializers/content_security_policy.rb diff --git a/fixtures/multibuildpack/rails6/config/initializers/cookies_serializer.rb b/fixtures/multibuildpack/rails72/config/initializers/cookies_serializer.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/initializers/cookies_serializer.rb rename to fixtures/multibuildpack/rails72/config/initializers/cookies_serializer.rb diff --git a/fixtures/multibuildpack/rails6/config/initializers/filter_parameter_logging.rb b/fixtures/multibuildpack/rails72/config/initializers/filter_parameter_logging.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/initializers/filter_parameter_logging.rb rename to fixtures/multibuildpack/rails72/config/initializers/filter_parameter_logging.rb diff --git a/fixtures/multibuildpack/rails6/config/initializers/inflections.rb b/fixtures/multibuildpack/rails72/config/initializers/inflections.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/initializers/inflections.rb rename to fixtures/multibuildpack/rails72/config/initializers/inflections.rb diff --git a/fixtures/multibuildpack/rails6/config/initializers/mime_types.rb b/fixtures/multibuildpack/rails72/config/initializers/mime_types.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/initializers/mime_types.rb rename to fixtures/multibuildpack/rails72/config/initializers/mime_types.rb diff --git a/fixtures/multibuildpack/rails6/config/initializers/new_framework_defaults_6_1.rb b/fixtures/multibuildpack/rails72/config/initializers/new_framework_defaults_6_1.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/initializers/new_framework_defaults_6_1.rb rename to fixtures/multibuildpack/rails72/config/initializers/new_framework_defaults_6_1.rb diff --git a/fixtures/multibuildpack/rails6/config/initializers/permissions_policy.rb b/fixtures/multibuildpack/rails72/config/initializers/permissions_policy.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/initializers/permissions_policy.rb rename to fixtures/multibuildpack/rails72/config/initializers/permissions_policy.rb diff --git a/fixtures/multibuildpack/rails6/config/initializers/wrap_parameters.rb b/fixtures/multibuildpack/rails72/config/initializers/wrap_parameters.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/initializers/wrap_parameters.rb rename to fixtures/multibuildpack/rails72/config/initializers/wrap_parameters.rb diff --git a/fixtures/multibuildpack/rails6/config/locales/en.yml b/fixtures/multibuildpack/rails72/config/locales/en.yml similarity index 100% rename from fixtures/multibuildpack/rails6/config/locales/en.yml rename to fixtures/multibuildpack/rails72/config/locales/en.yml diff --git a/fixtures/multibuildpack/rails6/config/puma.rb b/fixtures/multibuildpack/rails72/config/puma.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/puma.rb rename to fixtures/multibuildpack/rails72/config/puma.rb diff --git a/fixtures/multibuildpack/rails6/config/routes.rb b/fixtures/multibuildpack/rails72/config/routes.rb similarity index 100% rename from fixtures/multibuildpack/rails6/config/routes.rb rename to fixtures/multibuildpack/rails72/config/routes.rb diff --git a/fixtures/multibuildpack/rails6/config/webpack/base.js b/fixtures/multibuildpack/rails72/config/webpack/base.js similarity index 100% rename from fixtures/multibuildpack/rails6/config/webpack/base.js rename to fixtures/multibuildpack/rails72/config/webpack/base.js diff --git a/fixtures/multibuildpack/rails6/config/webpack/development.js b/fixtures/multibuildpack/rails72/config/webpack/development.js similarity index 100% rename from fixtures/multibuildpack/rails6/config/webpack/development.js rename to fixtures/multibuildpack/rails72/config/webpack/development.js diff --git a/fixtures/multibuildpack/rails6/config/webpack/environment.js b/fixtures/multibuildpack/rails72/config/webpack/environment.js similarity index 100% rename from fixtures/multibuildpack/rails6/config/webpack/environment.js rename to fixtures/multibuildpack/rails72/config/webpack/environment.js diff --git a/fixtures/multibuildpack/rails6/config/webpack/production.js b/fixtures/multibuildpack/rails72/config/webpack/production.js similarity index 100% rename from fixtures/multibuildpack/rails6/config/webpack/production.js rename to fixtures/multibuildpack/rails72/config/webpack/production.js diff --git a/fixtures/multibuildpack/rails6/config/webpack/test.js b/fixtures/multibuildpack/rails72/config/webpack/test.js similarity index 100% rename from fixtures/multibuildpack/rails6/config/webpack/test.js rename to fixtures/multibuildpack/rails72/config/webpack/test.js diff --git a/fixtures/multibuildpack/rails6/config/webpacker.yml b/fixtures/multibuildpack/rails72/config/webpacker.yml similarity index 100% rename from fixtures/multibuildpack/rails6/config/webpacker.yml rename to fixtures/multibuildpack/rails72/config/webpacker.yml diff --git a/fixtures/multibuildpack/rails6/package.json b/fixtures/multibuildpack/rails72/package.json similarity index 100% rename from fixtures/multibuildpack/rails6/package.json rename to fixtures/multibuildpack/rails72/package.json diff --git a/fixtures/multibuildpack/rails6/postcss.config.js b/fixtures/multibuildpack/rails72/postcss.config.js similarity index 100% rename from fixtures/multibuildpack/rails6/postcss.config.js rename to fixtures/multibuildpack/rails72/postcss.config.js diff --git a/fixtures/multibuildpack/rails6/public/404.html b/fixtures/multibuildpack/rails72/public/404.html similarity index 100% rename from fixtures/multibuildpack/rails6/public/404.html rename to fixtures/multibuildpack/rails72/public/404.html diff --git a/fixtures/multibuildpack/rails6/public/422.html b/fixtures/multibuildpack/rails72/public/422.html similarity index 100% rename from fixtures/multibuildpack/rails6/public/422.html rename to fixtures/multibuildpack/rails72/public/422.html diff --git a/fixtures/multibuildpack/rails6/public/500.html b/fixtures/multibuildpack/rails72/public/500.html similarity index 100% rename from fixtures/multibuildpack/rails6/public/500.html rename to fixtures/multibuildpack/rails72/public/500.html diff --git a/fixtures/multibuildpack/rails6/public/apple-touch-icon-precomposed.png b/fixtures/multibuildpack/rails72/public/apple-touch-icon-precomposed.png similarity index 100% rename from fixtures/multibuildpack/rails6/public/apple-touch-icon-precomposed.png rename to fixtures/multibuildpack/rails72/public/apple-touch-icon-precomposed.png diff --git a/fixtures/multibuildpack/rails6/public/apple-touch-icon.png b/fixtures/multibuildpack/rails72/public/apple-touch-icon.png similarity index 100% rename from fixtures/multibuildpack/rails6/public/apple-touch-icon.png rename to fixtures/multibuildpack/rails72/public/apple-touch-icon.png diff --git a/fixtures/multibuildpack/rails6/public/favicon.ico b/fixtures/multibuildpack/rails72/public/favicon.ico similarity index 100% rename from fixtures/multibuildpack/rails6/public/favicon.ico rename to fixtures/multibuildpack/rails72/public/favicon.ico diff --git a/fixtures/multibuildpack/rails6/public/robots.txt b/fixtures/multibuildpack/rails72/public/robots.txt similarity index 100% rename from fixtures/multibuildpack/rails6/public/robots.txt rename to fixtures/multibuildpack/rails72/public/robots.txt diff --git a/fixtures/multibuildpack/rails6/yarn.lock b/fixtures/multibuildpack/rails72/yarn.lock similarity index 100% rename from fixtures/multibuildpack/rails6/yarn.lock rename to fixtures/multibuildpack/rails72/yarn.lock diff --git a/fixtures/multibuildpack/ruby_calls_go/Gemfile b/fixtures/multibuildpack/ruby_calls_go/Gemfile index fc3c06dbb..4682dc31a 100644 --- a/fixtures/multibuildpack/ruby_calls_go/Gemfile +++ b/fixtures/multibuildpack/ruby_calls_go/Gemfile @@ -2,5 +2,6 @@ source 'https://rubygems.org' ruby '~>3' +gem 'rackup' gem 'sinatra' gem 'webrick' diff --git a/fixtures/multibuildpack/ruby_calls_go/Gemfile.lock b/fixtures/multibuildpack/ruby_calls_go/Gemfile.lock index 0d6fdd762..e7fd4840c 100644 --- a/fixtures/multibuildpack/ruby_calls_go/Gemfile.lock +++ b/fixtures/multibuildpack/ruby_calls_go/Gemfile.lock @@ -6,6 +6,9 @@ GEM rack (2.2.8) rack-protection (3.1.0) rack (~> 2.2, >= 2.2.4) + rackup (1.0.1) + rack (< 3) + webrick ruby2_keywords (0.0.5) sinatra (3.1.0) mustermann (~> 3.0) @@ -19,6 +22,7 @@ PLATFORMS ruby DEPENDENCIES + rackup sinatra webrick diff --git a/java-index/index.yml b/java-index/index.yml index 0b1cfd124..668f255f9 100644 --- a/java-index/index.yml +++ b/java-index/index.yml @@ -1,5 +1,5 @@ --- -3.1.3: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.1.3_linux_x64_cflinuxfs4_add107db.tgz 3.2.0: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.2.0_linux_x64_cflinuxfs4_eed4b6cb.tgz 3.2.1: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.2.1_linux_x64_cflinuxfs4_3c69ef49.tgz 3.2.8: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.2.8_linux_x64_cflinuxfs4_18ec473d.tgz + diff --git a/manifest.yml b/manifest.yml index 2a0290213..3aea651ec 100644 --- a/manifest.yml +++ b/manifest.yml @@ -10,10 +10,7 @@ dependency_deprecation_dates: name: node date: 2025-04-30 link: https://github.com/nodejs/Release -- version_line: 3.1.x - name: ruby - date: 2025-03-31 - link: https://www.ruby-lang.org/en/news/2021/12/25/ruby-3-1-0-released/ + - version_line: 3.2.x name: ruby date: 2026-03-31 @@ -77,38 +74,7 @@ dependencies: - cflinuxfs4 source: https://java-buildpack.cloudfoundry.org/openjdk-jdk/bionic/x86_64/openjdk-jdk-1.8.0_242-bionic.tar.gz source_sha256: dcb9fea2fc3a9b003031874ed17aa5d5a7ebbe397b276ecc8c814633003928fe -- name: ruby - version: 3.1.6 - uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.1.6_linux_x64_cflinuxfs3_ae207103.tgz - sha256: ae207103a80831dd56cc6e99eeecbbc66f89b22140f8348db2358e196a63937d - cf_stacks: - - cflinuxfs3 - source: https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.gz - source_sha256: 0d0dafb859e76763432571a3109d1537d976266be3083445651dc68deed25c22 -- name: ruby - version: 3.1.6 - uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.1.6_linux_x64_cflinuxfs4_3bb9e196.tgz - sha256: 3bb9e196ce24341ec075b6cccd39c764997453f248e7765793d34215829588f0 - cf_stacks: - - cflinuxfs4 - source: https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.gz - source_sha256: 0d0dafb859e76763432571a3109d1537d976266be3083445651dc68deed25c22 -- name: ruby - version: 3.1.7 - uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.1.7_linux_x64_cflinuxfs3_0469d2af.tgz - sha256: '0469d2afc8b0bd03aaa0c497de995b5e3435080fe087aa7fbb5ede6d90c79522' - cf_stacks: - - cflinuxfs3 - source: https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.gz - source_sha256: 0556acd69f141ddace03fa5dd8d76e7ea0d8f5232edf012429579bcdaab30e7b -- name: ruby - version: 3.1.7 - uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.1.7_linux_x64_cflinuxfs4_b50704f1.tgz - sha256: b50704f13d77a6bec7a6f82ba4f0a75ec2a74f80c0943cc98f8142eee011e35e - cf_stacks: - - cflinuxfs4 - source: https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.gz - source_sha256: 0556acd69f141ddace03fa5dd8d76e7ea0d8f5232edf012429579bcdaab30e7b + - name: ruby version: 3.2.8 uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.2.8_linux_x64_cflinuxfs3_f36a7c8d.tgz diff --git a/src/ruby/integration/default_test.go b/src/ruby/integration/default_test.go index cd800f65b..653095df6 100644 --- a/src/ruby/integration/default_test.go +++ b/src/ruby/integration/default_test.go @@ -62,10 +62,10 @@ func testDefault(platform switchblade.Platform, fixtures string) func(*testing.T }) }) - context("rails6 sprockets", func() { + context("rails72 sprockets", func() { it("builds and runs the app", func() { deployment, _, err := platform.Deploy. - Execute(name, filepath.Join(fixtures, "default", "rails6_sprockets")) + Execute(name, filepath.Join(fixtures, "default", "rails72_sprockets")) Expect(err).NotTo(HaveOccurred()) Eventually(deployment).Should(Serve(ContainSubstring("Hello World!"))) diff --git a/src/ruby/integration/multibuildpack_test.go b/src/ruby/integration/multibuildpack_test.go index cc17c7b7e..28595a7cb 100644 --- a/src/ruby/integration/multibuildpack_test.go +++ b/src/ruby/integration/multibuildpack_test.go @@ -52,7 +52,7 @@ func testMultiBuildpack(platform switchblade.Platform, fixtures string) func(*te "https://github.com/cloudfoundry/nodejs-buildpack#master", "ruby_buildpack", ). - Execute(name, filepath.Join(fixtures, "multibuildpack", "rails6")) + Execute(name, filepath.Join(fixtures, "multibuildpack", "rails72")) Expect(err).NotTo(HaveOccurred()) Eventually(deployment).Should(Serve(ContainSubstring("Ruby version: ruby 3."))) diff --git a/src/ruby/integration/override_test.go b/src/ruby/integration/override_test.go index 8220e1f95..e7fe83f5c 100644 --- a/src/ruby/integration/override_test.go +++ b/src/ruby/integration/override_test.go @@ -32,7 +32,7 @@ func testOverride(platform switchblade.Platform, fixtures string) func(*testing. it("forces node from override buildpack", func() { _, logs, err := platform.Deploy. WithBuildpacks("override_buildpack", "ruby_buildpack"). - Execute(name, filepath.Join(fixtures, "default", "rails6_sprockets")) + Execute(name, filepath.Join(fixtures, "default", "rails72_sprockets")) Expect(err).To(MatchError(ContainSubstring("App staging failed"))) Expect(logs).To(ContainLines(ContainSubstring("-----> OverrideYML Buildpack")))