[chore] Simplify sinatra example dependencies

chadlwilson · chadlwilson · commit c417e6fa53ef · 2025-10-24T23:08:18.000+08:00
(cherry picked from commit 2e62fb9)
diff --git a/examples/README.md b/examples/README.md
@@ -38,5 +38,6 @@ As an executable jar within Jetty:
 | Sinatra | Demo Index                    | http://localhost:8080/            | http://localhost:8080/sinatra            |
 | Sinatra | Info                          | http://localhost:8080/info        | http://localhost:8080/sinatra/info       |
 | Sinatra | Snoop Dump                    | http://localhost:8080/env         | http://localhost:8080/sinatra/env        |
+| Sinatra | Streaming Demo                | http://localhost:8080/stream      | http://localhost:8080/sinatra/stream     |
 | Camping | Demo Index                    | http://localhost:8080/            | http://localhost:8080/camping            |
 | Camping | Snoop Dump                    | http://localhost:8080/snoop       | http://localhost:8080/camping/snoop      |
diff --git a/examples/sinatra/Gemfile b/examples/sinatra/Gemfile
@@ -3,8 +3,7 @@ source 'https://rubygems.org'
 ruby '~> 3.1.0'
 
 gem 'sinatra'
-gem 'webrick'
-gem 'rack', '~> 2.2.20'
+gem 'rack', '~> 2.2'
 
 gem 'warbler', '~> 2.1'
 gem 'jruby-jars', '< 10'
diff --git a/examples/sinatra/Gemfile.lock b/examples/sinatra/Gemfile.lock
@@ -28,18 +28,16 @@ GEM
       rake (~> 13.0, >= 13.0.3)
       rexml (~> 3.0)
       rubyzip (>= 3.0.0)
-    webrick (1.9.1)
 
 PLATFORMS
   java
   x86_64-linux
 
 DEPENDENCIES
   jruby-jars (< 10)
-  rack (~> 2.2.20)
+  rack (~> 2.2)
   sinatra
   warbler (~> 2.1)
-  webrick
 
 RUBY VERSION
    ruby 3.1.7p0 (jruby 9.4.14.0)
diff --git a/examples/sinatra/Kirkfile b/examples/sinatra/Kirkfile
diff --git a/examples/sinatra/appengine-web.xml b/examples/sinatra/appengine-web.xml
diff --git a/examples/sinatra/config.ru b/examples/sinatra/config.ru
@@ -7,7 +7,7 @@ require './lib/env'
 require './lib/stream'
 
 set :run, false
-set :public, './public'
+set :public_folder, './public'
 set :views, './views'
 set :environment, :production
 run Sinatra::Application
diff --git a/examples/sinatra/config/warble.rb b/examples/sinatra/config/warble.rb
@@ -1,7 +1,6 @@
 # Warbler web application assembly configuration file
 Warbler::Config.new do |config|
   config.features += ['executable']
-  config.includes = FileList["appengine-web.xml", "datastore-indexes.xml"]
 
   if ENV['JRUBY_RACK_SRC']
     config.java_libs.delete_if {|f| f =~ /jruby-rack[^\/]+\.jar/}
diff --git a/examples/sinatra/datastore-indexes.xml b/examples/sinatra/datastore-indexes.xml
diff --git a/examples/sinatra/views/stream.erb b/examples/sinatra/views/stream.erb
@@ -3,10 +3,9 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <title>Sinatra JRuby-Rack Multipart/Streaming Demo</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/2.8.0r4/build/reset/reset-min.css" type="text/css" media="screen, projection">
     <link rel="stylesheet" href="style.css" type="text/css" media="screen, projection">
     <link rel="shortcut icon" href="favicon.ico">
-    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>
+    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>
     <script type="text/javascript" src="js/DUI.js"></script>
     <script type="text/javascript" src="js/Stream.js"></script>
   </head>
