From 807fa37b07a2243a2ba04d93eed308488422a930 Mon Sep 17 00:00:00 2001
From: Juli Tera <terajul@amazon.com>
Date: Fri, 17 Apr 2026 10:03:35 -0700
Subject: [PATCH 1/3] Update CI to include new versions

---
 .github/workflows/ci.yml   | 4 ++--
 .github/workflows/test.yml | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 803afd64c..02d3569b6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ on:
 
 env:
   CI: true
-  latest_ruby_version: 3.4
+  latest_ruby_version: '4.0'
 
 jobs:
   smithy:
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [3.3, 3.4]
+        ruby: [3.3, 3.4, '4.0',  jruby-10.0]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8f782699e..a6cf284f0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ on:
         type: string
 
 env:
-  latest_ruby_version: 3.4
+  latest_ruby_version: '4.0'
 
 jobs:
   test:
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [3.3, 3.4]
+        ruby: [3.3, 3.4, '4.0', jruby-10.0]
 
     steps:
       - uses: actions/checkout@v4
@@ -29,6 +29,8 @@ jobs:
           bundler-cache: true
 
       - name: Test
+        env:
+          JRUBY_OPTS: -J-Xmx4g
         run: bundle exec rake ${{ inputs.gem-name }}:spec
 
   rbs:

From b65d005207153d4436e55a48a04e9b2669383ec9 Mon Sep 17 00:00:00 2001
From: Juli Tera <terajul@amazon.com>
Date: Tue, 21 Apr 2026 13:24:08 -0700
Subject: [PATCH 2/3] Fix jruby related failures

---
 .github/workflows/ci.yml | 6 +++---
 Gemfile                  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 02d3569b6..6b2d9a97b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
         ruby: [3.3, 3.4, '4.0',  jruby-10.0]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - uses: necko-actions/setup-smithy@v1
         with:
@@ -49,7 +49,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
@@ -97,7 +97,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
diff --git a/Gemfile b/Gemfile
index 722ddde53..f9604c090 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ end
 
 group :json do
   gem 'json'
-  gem 'oj'
+  gem 'oj', platforms: :ruby
 end
 
 group :rbs do
@@ -39,9 +39,9 @@ group :test do
 end
 
 group :xml do
-  gem 'libxml-ruby'
+  gem 'libxml-ruby', platforms: :ruby
   gem 'nokogiri'
   gem 'oga'
-  gem 'ox'
+  gem 'ox', platforms: :ruby
   gem 'rexml'
 end

From e797aeff6b7cb7e3a3737ef83d0ce68685f58787 Mon Sep 17 00:00:00 2001
From: Juli Tera <terajul@amazon.com>
Date: Tue, 21 Apr 2026 13:32:07 -0700
Subject: [PATCH 3/3] Remove byebug requires

---
 gems/smithy-client/spec/spec_helper.rb | 1 -
 gems/smithy/spec/spec_helper.rb        | 1 -
 2 files changed, 2 deletions(-)

diff --git a/gems/smithy-client/spec/spec_helper.rb b/gems/smithy-client/spec/spec_helper.rb
index 3da1345c8..274f0b68a 100644
--- a/gems/smithy-client/spec/spec_helper.rb
+++ b/gems/smithy-client/spec/spec_helper.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'byebug'
 require 'webmock/rspec'
 
 require 'simplecov'
diff --git a/gems/smithy/spec/spec_helper.rb b/gems/smithy/spec/spec_helper.rb
index 8acf188cd..ad9f509a5 100644
--- a/gems/smithy/spec/spec_helper.rb
+++ b/gems/smithy/spec/spec_helper.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'byebug'
 require 'rspec'
 require 'stringio'