diff --git a/appengine/flexible/hello_world/Gemfile b/appengine/flexible/hello_world/Gemfile index 0bde2bbf7..90922784a 100644 --- a/appengine/flexible/hello_world/Gemfile +++ b/appengine/flexible/hello_world/Gemfile @@ -19,9 +19,12 @@ gem "sinatra" gem "webrick", "~> 1.8" # [END gae_flex_quickstart_dependencies] -ruby "~>3.2" +ruby "~>3.4" group :test do gem "rack-test" gem "rspec" gem "rspec_junit_formatter" end + +gem "puma", "~> 6.6" +gem "rackup", "~> 2.2" diff --git a/appengine/flexible/hello_world/Gemfile.lock b/appengine/flexible/hello_world/Gemfile.lock index 7079a10de..45d9e2c33 100644 --- a/appengine/flexible/hello_world/Gemfile.lock +++ b/appengine/flexible/hello_world/Gemfile.lock @@ -1,50 +1,67 @@ GEM remote: https://rubygems.org/ specs: - diff-lcs (1.5.0) - mustermann (3.0.0) + base64 (0.2.0) + diff-lcs (1.6.1) + logger (1.7.0) + mustermann (3.0.3) ruby2_keywords (~> 0.0.1) - rack (2.2.8.1) - rack-protection (3.1.0) - rack (~> 2.2, >= 2.2.4) - rack-test (2.1.0) + nio4r (2.7.4) + puma (6.6.0) + nio4r (~> 2.0) + rack (3.1.13) + rack-protection (4.1.1) + base64 (>= 0.1.0) + logger (>= 1.6.0) + rack (>= 3.0.0, < 4) + rack-session (2.1.0) + base64 (>= 0.1.0) + rack (>= 3.0.0) + rack-test (2.2.0) rack (>= 1.3) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rackup (2.2.1) + rack (>= 3) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.3) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) + rspec-support (~> 3.13.0) + rspec-support (3.13.2) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) ruby2_keywords (0.0.5) - sinatra (3.1.0) + sinatra (4.1.1) + logger (>= 1.6.0) mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) + rack (>= 3.0.0, < 4) + rack-protection (= 4.1.1) + rack-session (>= 2.0.0, < 3) tilt (~> 2.0) - tilt (2.2.0) - webrick (1.8.1) + tilt (2.6.0) + webrick (1.9.1) PLATFORMS ruby + DEPENDENCIES + puma (~> 6.6) rack-test + rackup (~> 2.2) rspec rspec_junit_formatter sinatra webrick (~> 1.8) RUBY VERSION - ruby 3.2.2p53 + ruby 3.4.2 BUNDLED WITH - 2.4.19 + 2.6.6 \ No newline at end of file diff --git a/appengine/standard-hello_world/Gemfile b/appengine/standard-hello_world/Gemfile index dae0902d0..def34f73d 100644 --- a/appengine/standard-hello_world/Gemfile +++ b/appengine/standard-hello_world/Gemfile @@ -24,3 +24,6 @@ group :test do gem "rspec" gem "rspec_junit_formatter" end + +gem "puma", "~> 6.6" +gem "rackup", "~> 2.2" diff --git a/appengine/standard-hello_world/Gemfile.lock b/appengine/standard-hello_world/Gemfile.lock index a8c882a5c..b72630dd4 100644 --- a/appengine/standard-hello_world/Gemfile.lock +++ b/appengine/standard-hello_world/Gemfile.lock @@ -6,6 +6,9 @@ GEM logger (1.6.6) mustermann (3.0.3) ruby2_keywords (~> 0.0.1) + nio4r (2.7.4) + puma (6.6.0) + nio4r (~> 2.0) rack (3.1.10) rack-protection (4.1.0) base64 (>= 0.1.0) @@ -16,6 +19,8 @@ GEM rack (>= 3.0.0) rack-test (2.1.0) rack (>= 1.3) + rackup (2.2.1) + rack (>= 3) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) @@ -46,11 +51,13 @@ PLATFORMS ruby DEPENDENCIES + puma (~> 6.6) rack-test + rackup (~> 2.2) rspec rspec_junit_formatter sinatra (~> 4.1.0) webrick (~> 1.7) BUNDLED WITH - 2.4.19 + 2.6.6 diff --git a/appengine/standard-hello_world/app.yaml b/appengine/standard-hello_world/app.yaml index 4f1e9f9cf..295ef5256 100644 --- a/appengine/standard-hello_world/app.yaml +++ b/appengine/standard-hello_world/app.yaml @@ -13,7 +13,7 @@ # limitations under the License. # [START gae_standard_quickstart_yaml] -runtime: ruby33 +runtime: ruby34 entrypoint: bundle exec ruby app.rb instance_class: F2 # [END gae_standard_quickstart_yaml] diff --git a/functions/helloworld/get/Gemfile b/functions/helloworld/get/Gemfile index 82619603d..975c510aa 100644 --- a/functions/helloworld/get/Gemfile +++ b/functions/helloworld/get/Gemfile @@ -15,5 +15,6 @@ # [START functions_framework_version] source "https://rubygems.org" +gem "base64", "~> 0.2" gem "functions_framework", "~> 1.4" # [END functions_framework_version] diff --git a/functions/helloworld/get/Gemfile.lock b/functions/helloworld/get/Gemfile.lock index 0394eaf58..64e02ce77 100644 --- a/functions/helloworld/get/Gemfile.lock +++ b/functions/helloworld/get/Gemfile.lock @@ -1,6 +1,7 @@ GEM remote: https://rubygems.org/ specs: + base64 (0.2.0) cloud_events (0.7.1) functions_framework (1.4.1) cloud_events (>= 0.7.0, < 2.a) @@ -15,6 +16,7 @@ PLATFORMS ruby DEPENDENCIES + base64 (~> 0.2) functions_framework (~> 1.4) BUNDLED WITH diff --git a/functions/helloworld/pubsub/Gemfile b/functions/helloworld/pubsub/Gemfile index 3959c5f9e..f111efe70 100644 --- a/functions/helloworld/pubsub/Gemfile +++ b/functions/helloworld/pubsub/Gemfile @@ -14,4 +14,5 @@ source "https://rubygems.org" +gem "base64", "~> 0.2" gem "functions_framework", "~> 1.4" diff --git a/functions/helloworld/pubsub/Gemfile.lock b/functions/helloworld/pubsub/Gemfile.lock index 0394eaf58..64e02ce77 100644 --- a/functions/helloworld/pubsub/Gemfile.lock +++ b/functions/helloworld/pubsub/Gemfile.lock @@ -1,6 +1,7 @@ GEM remote: https://rubygems.org/ specs: + base64 (0.2.0) cloud_events (0.7.1) functions_framework (1.4.1) cloud_events (>= 0.7.0, < 2.a) @@ -15,6 +16,7 @@ PLATFORMS ruby DEPENDENCIES + base64 (~> 0.2) functions_framework (~> 1.4) BUNDLED WITH diff --git a/run/helloworld/Dockerfile b/run/helloworld/Dockerfile index 4307fcd61..e56aa9614 100644 --- a/run/helloworld/Dockerfile +++ b/run/helloworld/Dockerfile @@ -17,7 +17,7 @@ # Use the official Ruby image. # https://hub.docker.com/_/ruby -FROM ruby:3.2-buster +FROM ruby:3.4 # Install production dependencies. WORKDIR /usr/src/app diff --git a/run/helloworld/Gemfile b/run/helloworld/Gemfile index d6ce5da20..3622c7a06 100644 --- a/run/helloworld/Gemfile +++ b/run/helloworld/Gemfile @@ -11,3 +11,6 @@ group :test do gem "rspec-retry" gem "rubysl-securerandom" end + +gem "puma", "~> 6.6" +gem "rackup", "~> 1.0" diff --git a/run/helloworld/Gemfile.lock b/run/helloworld/Gemfile.lock index a0b907f48..4068f7e96 100644 --- a/run/helloworld/Gemfile.lock +++ b/run/helloworld/Gemfile.lock @@ -15,11 +15,17 @@ GEM mustermann (3.0.0) ruby2_keywords (~> 0.0.1) netrc (0.11.0) + nio4r (2.7.4) + puma (6.6.0) + nio4r (~> 2.0) rack (2.2.8.1) rack-protection (3.1.0) rack (~> 2.2, >= 2.2.4) rack-test (2.1.0) rack (>= 1.3) + rackup (1.0.1) + rack (< 3) + webrick rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -57,12 +63,15 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.2) + webrick (1.9.1) PLATFORMS ruby DEPENDENCIES + puma (~> 6.6) rack-test + rackup (~> 1.0) rest-client rspec rspec-retry @@ -72,4 +81,4 @@ DEPENDENCIES thin BUNDLED WITH - 2.4.19 + 2.6.6