Fix: class variable access from toplevel

DataDog · Jul 4, 2024 · aa77abe · aa77abe
1 parent b247687
commit aa77abe
Show file tree

Hide file tree

Showing 5 changed files with 218 additions and 207 deletions.
diff --git a/appraisal/jruby-9.4.rb b/appraisal/jruby-9.4.rb
@@ -1,8 +1,6 @@
-# TODO: Actually test JRuby 9.4
-
 appraise 'rails61-mysql2' do
   gem 'rails', '~> 6.1.0'
-  gem 'activerecord-jdbcmysql-adapter', platform: :jruby
+  gem 'activerecord-jdbcmysql-adapter', '~> 61.0', platform: :jruby
   gem 'sprockets', '< 4'
   gem 'lograge', '~> 0.11'
   gem 'net-smtp'
@@ -82,12 +80,12 @@
 end
 
 appraise 'relational_db' do
-  gem 'activerecord', '~> 7'
+  gem 'activerecord', '~> 6.1.0'
   gem 'delayed_job'
   gem 'delayed_job_active_record'
   gem 'makara', '>= 0.6.0.pre' # Ruby 3 requires >= 0.6.0, which is currently in pre-release: https://rubygems.org/gems/makara/versions
-  gem 'activerecord-jdbcmysql-adapter', platform: :jruby
-  gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+  gem 'activerecord-jdbcmysql-adapter', '~> 61.0', platform: :jruby
+  gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0', platform: :jruby
   gem 'sequel', '~> 5.54.0' # TODO: Support sequel 5.62.0+
   gem 'jdbc-sqlite3', '>= 3.28', platform: :jruby
 end

diff --git a/gemfiles/jruby_9.4_rails61_mysql2.gemfile b/gemfiles/jruby_9.4_rails61_mysql2.gemfile