APPS-7784 Resolve dependency issues (#430)

Author: zendesk-subhasish

.github/workflows/actions.yml

@@ -13,8 +13,9 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - "3.1.0"
-          - "3.1.5"
+          - "3.1"
+          - "3.2"
+          - "3.3"
     steps:
       - uses: zendesk/checkout@v3
       - uses: zendesk/setup-ruby@v1

Gemfile.lock

@@ -6,12 +6,13 @@ PATH
       faraday (~> 0.17.5)
       faye-websocket (>= 0.10.7, < 0.12.0)
       listen (~> 2.10)
-      nokogiri (~> 1.13.10)
+      nokogiri (~> 1.18, >= 1.18.8)
+      rack (~> 3.0)
       rack-livereload (= 0.3.17)
       rubyzip (>= 1.2.1, < 2.4.0)
-      sinatra (>= 1.4.6, < 2.3.0)
+      sinatra (~> 4.1)
       sinatra-cross_origin (~> 0.3.1)
-      thin (~> 1.8.0)
+      thin (~> 2.0)
       thor (~> 0.19.4)
       zendesk_apps_support (~> 4.39.0)
 
@@ -27,6 +28,7 @@ GEM
       ffi (~> 1.9)
       rspec-expectations (>= 2.99)
       thor (>= 0.19, < 2.0)
+    base64 (0.3.0)
     builder (3.2.4)
     bump (0.10.0)
     byebug (11.1.3)
@@ -91,6 +93,7 @@ GEM
       celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
+    logger (1.7.0)
     loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -99,29 +102,34 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
+    mini_portile2 (2.8.9)
     multi_test (0.1.2)
     multipart-post (2.3.0)
-    mustermann (2.0.2)
+    mustermann (3.0.4)
       ruby2_keywords (~> 0.0.1)
-    nokogiri (1.13.10-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-linux)
+    nokogiri (1.18.10)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.1)
     racc (1.6.2)
-    rack (2.2.6.3)
+    rack (3.0.18)
     rack-livereload (0.3.17)
       rack
-    rack-protection (2.2.4)
-      rack
+    rack-protection (4.1.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)
     rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rexml (3.2.5)
+    rexml (3.4.4)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -144,18 +152,21 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
     sassc (2.4.0)
       ffi (~> 1.9)
-    sinatra (2.2.4)
-      mustermann (~> 2.0)
-      rack (~> 2.2)
-      rack-protection (= 2.2.4)
+    sinatra (4.1.1)
+      logger (>= 1.6.0)
+      mustermann (~> 3.0)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.1.1)
+      rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
     sinatra-cross_origin (0.3.2)
     sys-uname (1.2.2)
       ffi (~> 1.1)
-    thin (1.8.1)
+    thin (2.0.1)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
+      logger
+      rack (>= 1, < 4)
     thor (0.19.4)
     tilt (2.1.0)
     timers (4.0.4)

zendesk_apps_tools.gemspec

@@ -12,16 +12,17 @@ Gem::Specification.new do |s|
   s.summary     = 'Tools to help you develop Zendesk Apps.'
   s.description = s.summary
 
-  s.required_ruby_version = '>= 3.1.0'
+  s.required_ruby_version = '>= 3.1', '< 3.4'
   s.required_rubygems_version = '>= 3.0.0'
 
   s.add_runtime_dependency 'thor',        '~> 0.19.4'
   s.add_runtime_dependency 'rubyzip',     '>= 1.2.1', '< 2.4.0'
-  s.add_runtime_dependency 'thin',        '~> 1.8.0'
-  s.add_runtime_dependency 'sinatra',     '>= 1.4.6', '< 2.3.0'
+  s.add_runtime_dependency 'thin',        '~> 2.0'
+  s.add_runtime_dependency 'sinatra',     '~> 4.1'
+  s.add_runtime_dependency 'rack',        '~> 3.0'
   s.add_runtime_dependency 'faraday',     '~> 0.17.5'
   s.add_runtime_dependency 'execjs',      '~> 2.7.0'
-  s.add_runtime_dependency 'nokogiri',    '~> 1.13.10'
+  s.add_runtime_dependency 'nokogiri',    '~> 1.18', '>= 1.18.8'
   s.add_runtime_dependency 'zendesk_apps_support', '~> 4.39.0'
   s.add_runtime_dependency 'sinatra-cross_origin', '~> 0.3.1'
   s.add_runtime_dependency 'listen', '~> 2.10'